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

pulg

8 天以前 91fc6f65c712505f0b13e45d66e917e2645ae1c3

 HH.WCS.QingXiNongfu/process/TaskProcess.cs

@@ -81,7 +81,7 @@
                bbbbbbb = false;
                //UpdateElevatorTask(mst);
                //todo： 如果是电梯卸货任务电梯任务中间表状态，如
                //bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
                bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
                if (BeenOver || (mst.S_TYPE.Contains("成品满框") && bbbbbbb))
                {
                    //if (mst.S_TYPE.Trim().Contains("翻斗机叫满"))
@@ -1478,7 +1478,7 @@
                            "start DD ",
                            start.ToString(),
                            "-",
                            TRow
                            FRow
                            }), "");
                        }
                        else
@@ -1493,7 +1493,7 @@
                            "start agv点",
                            start.ToString(),
                            "-",
                            TRow
                            FRow
                            }), "");
                        }
                    }