1

pulg

5 天以前 dc600c6298a3231e05875813ec0fa2fa18151d84

 HH.WCS.QingXiNongfu/process/TaskProcess.cs

@@ -78,9 +78,10 @@

            if (bbbbbbb)
            {
                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("翻斗机叫满"))
@@ -400,7 +401,6 @@
            //new List<string> { "成品满框-入库", "" }
            if (state == 6 || state == 5)
            {

                LogHelper.Info($"任务类型：{mst.S_TYPE}- 动作：{state}. 是否5算6？{mst.S_TYPE.Contains("成品满框") || mst.S_TYPE.Contains("备货")} ");
                if (mst.S_TYPE.Contains("备货"))
                {
@@ -417,16 +417,14 @@
                    goto vvv;
                }

                if (mst.S_TYPE.Trim() == "J空瓶坯-出库")
                {
                    mst.S_CNTRS = "J" + Settings.GetTimeStamp();
                }

                if (mst.S_TYPE.Trim() == "F空瓶坯-出库")
                {
                    mst.S_CNTRS = "F" + Settings.GetTimeStamp();
                }

                //if (mst.S_TYPE.Trim() == "J空瓶坯-出库")
                //{
                //    mst.S_CNTRS = "J" + Settings.GetTimeStamp();
                //}
                //if (mst.S_TYPE.Trim() == "F空瓶坯-出库")
                //{
                //    mst.S_CNTRS = "F" + Settings.GetTimeStamp();
                //}
                //成品空框 不需要绑筐
                if (!mst.S_TYPE.Trim().Contains("成品-空托上线")
                    && mst.S_TYPE.Trim() != "满瓶坯-入库"
@@ -846,7 +844,6 @@
                            return true;
                        });
                    }

                }
                else if (mst.S_TYPE.Trim() == "空瓶坯-出库" || mst.S_TYPE.Trim().Contains("瓶盖-空上机") || mst.S_TYPE.Trim().Contains("翻斗机叫满"))
                {
@@ -1309,7 +1306,7 @@
                                "start DD ",
                                start.ToString(),
                                "-",
                                TRow
                                FRow
                                }), "");
                        }
                        else
@@ -1355,6 +1352,19 @@
                            TRow = item_.trayHeight + "";
                        else return false;
                    }
                }
                else if (taskType.Contains("瓶坯翻斗机空托") && mst.S_END_LAREA == "QXPPXXQ")
                {
                    start = LocationHelper.GetAgvSite(mst.S_START_LOC);
                    end = LocationHelper.GetAgvSite(mst.S_END_LOC, "2");
                    LogHelper.Info($"瓶坯机任务 起点终点对应的agv站点 start {start} end {end}  任务:" + mst.S_TASK_NO);

                }
                else if (taskType.Contains("瓶坯翻斗机满托") && mst.S_START_LAREA == "QXPPXXQ")
                {
                    start = LocationHelper.GetAgvSite(mst.S_START_LOC, "2");
                    end = LocationHelper.GetAgvSite(mst.S_END_LOC);
                    LogHelper.Info($"瓶坯机任务 起点终点对应的agv站点 start {start} end {end}  任务:" + mst.S_TASK_NO);
                }
                //else if (taskType.Contains("收缩膜叉运-入库") || taskType.Contains("收缩膜叉运-入库") || taskType.Contains("收缩膜叉运-货架出提升机"))
                //{
@@ -1481,7 +1491,7 @@
                            "start DD ",
                            start.ToString(),
                            "-",
                            TRow
                            FRow
                            }), "");
                        }
                        else
@@ -1496,7 +1506,7 @@
                            "start agv点",
                            start.ToString(),
                            "-",
                            TRow
                            FRow
                            }), "");
                        }
                    }
@@ -1584,6 +1594,7 @@
                LogHelper.Info("SendTask " + mst.S_TASK_NO);
                Console.WriteLine("start=" + start.ToString());
                Console.WriteLine("end= " + end.ToString());

                NDC.AGVResult res = NDC.AddNewOrder(TSNo, new Dictionary<string, string>
                {
                    {