Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheSh...

huangxiaoqiang

2026-03-30 7db419acdd2c02950b67c081dd2d7f61fdb2cb89

 ÏîÄ¿´úÂë/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJobTZ/CommonConveyorLineTZJob.cs

@@ -165,7 +165,7 @@
                            }
                        }

                        if (station.stationType == 1)  //入库口
                        if (station.stationType == 1 )  //入库口
                        {
                            var requestInbound = conveyorLine.GetValue<ConveyorLineDBName, bool>(ConveyorLineDBName.EntApply, station.stationChildCode);
                            if (requestInbound)
@@ -193,7 +193,7 @@
                            }
                        }

                        if (station.stationType == 3)
                        if (station.stationType == 3)  //RB043精排点
                        {
                            var requestFolw = conveyorLine.GetValue<ConveyorLineDBName, bool>(ConveyorLineDBName.EntApply, station.stationChildCode);
                            if (requestFolw)
@@ -242,11 +242,24 @@
                                //var pvi = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.PVI, station.stationChildCode);

                                WebResponseContent response = _taskService.RequestRoadWayTask(palletcode.ToString(), palletcode.ToString(), station).Result;
                                if (!response.Status)
                                if (response.Status)
                                {
                                    var task = _taskService.QueryBarCodeConveyorLineTask(palletcode.ToString(), station.stationChildCode);
                                    if (task != null)
                                    {
                                        var stationInfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.NextAddress);
                                        conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.Spare6, Convert.ToInt16(stationInfo.stationTCLocation), station.stationChildCode);
                                        Thread.Sleep(200);
                                        //conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.Spare5, 3, station.stationChildCode);
                                        conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);

                                        _taskService.UpdateTaskStatusToNext(task);
                                    }
                                }
                                conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
                                //else
                                //{
                                //    conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
                                //}
                            }
                        }

@@ -269,6 +282,35 @@
                            }
                        }


                        if (station.stationType == 6)  //空滑橇入库口
                        {
                            var requestInbound = conveyorLine.GetValue<ConveyorLineDBName, bool>(ConveyorLineDBName.EntApply, station.stationChildCode);
                            if (requestInbound)
                            {
                                var palletcode = conveyorLine.GetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.SkidNo, station.stationChildCode);
                                //var pvi = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.PVI, station.stationChildCode);

                                //_taskService.QueryBarCodeConveyorLineTask();
                                var task = _taskService.QueryExecutingTaskByBarcode(palletcode.ToString(), station.stationChildCode);
                                if (task != null)
                                {
                                    _taskService.UpdateTaskStatusToNext(task);
                                    conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
                                }
                                else
                                {
                                    continue;
                                    //如找不到对应入库任务，则根据托盘 PVI申请入库
                                    //WebResponseContent response = _taskService.RequestTask(palletcode.ToString(), pvi, station).Result;
                                    //if (!response.Status)
                                    //{
                                    //    continue;
                                    //}
                                }
                            }
                        }

                        #region æ ¹æ®åè®®è¯»å–方案
                        //DeviceProtocolDetailDTO? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == station.stationChildCode && x.ProtocalDetailValue == request.ToString());