Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-001...

pulg

2025-07-05 db825ff9bb1352e79c3e018a647b3c88713d6f69

Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi

 HH.WCS.QingXiNongfu/process/TaskProcess.cs

@@ -78,9 +78,11 @@

            if (bbbbbbb)
            {
                bbbbbbb = false;
                //UpdateElevatorTask(mst);
                //todo： 如果是电梯卸货任务电梯任务中间表状态，如
                if (BeenOver)
                //bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
                if (BeenOver || (mst.S_TYPE.Contains("成品满框") && bbbbbbb))
                {
                    //if (mst.S_TYPE.Trim().Contains("翻斗机叫满"))
                    //{

 HH.WCS.QingXiNongfu/wms/LocationHelper.cs

@@ -1132,7 +1132,7 @@
                #endregion
                else if (plc.deviceType == 6 || plc.deviceType == 10 || plc.deviceType == 4)
                {
                    LogHelper.Info("plc.deviceType == 6.10.4" + workOrder.SQL_UsingNow);
                    LogHelper.Info("plc.deviceType == 6.10.4  即产?：" + workOrder.SQL_UsingNow);
                    //var LineTo = workOrder.SQL_LinkLineNO;
                    var ba = Settings.GetBolAreaList().Find(x => x.DeviceName == plc.deviceName && x.deviceType == plc.deviceType);
                    if (ba == null)
@@ -1400,7 +1400,7 @@
                    }
                    else
                    {
                        LogHelper.Info($"4610,没有可用满框");
                        LogHelper.Info($"翻斗级{plc.deviceName},没有可用满框");
                    }
                }
                else