1

pulg

16 小时以前 8741f7e84dc7c0a1150c92758ebb2cf4b7d18c73

 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("翻斗机叫满"))
                    //{
@@ -415,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() != "满瓶坯-入库"
@@ -433,9 +433,11 @@
                    && mst.S_TYPE.Trim() != "青溪纸箱搬运物料"
                    && !mst.S_TYPE.Trim().Contains("自由点对点"))
                {
                    CacheBitUpdate(mst, load: false, mst.S_NOTE);
                    if (mst.S_END_LOC != "YWLT1TSJ")
                    {
                        CacheBitUpdate(mst, load: false, mst.S_NOTE);
                    }
                }


                if (mst.S_TYPE.Trim().Contains("成品-空托上线"))
                {
@@ -479,7 +481,8 @@
                    {
                        // to.AlQty += mst.S_CNTRS.Split(',').Length;// mst.S_CNTRS.Substring(1).Split('v').Length;
                        to.OutNum -= mst.S_CNTRS.Split(',').Length;
                        db.Updateable(to).UpdateColumns(it => new { it.OutNum }).ExecuteCommand();
                        var ggi = db.Updateable(to).UpdateColumns(it => new { it.OutNum }).ExecuteCommand();
                        LogHelper.Info($"更新 提升机上料工单表数量为 {to.OutNum} 影响行数为:{ggi}");
                    }
                }

@@ -844,7 +847,6 @@
                            return true;
                        });
                    }

                }
                else if (mst.S_TYPE.Trim() == "空瓶坯-出库" || mst.S_TYPE.Trim().Contains("瓶盖-空上机") || mst.S_TYPE.Trim().Contains("翻斗机叫满"))
                {
@@ -1307,7 +1309,7 @@
                                "start DD ",
                                start.ToString(),
                                "-",
                                TRow
                                FRow
                                }), "");
                        }
                        else
@@ -1353,6 +1355,19 @@
                            TRow = item_.trayHeight + "";
                        else return false;
                    }
                }
                else if (taskType.Contains("瓶坯翻斗机空托"))
                {
                    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("瓶坯翻斗机满托"))
                {
                    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("收缩膜叉运-货架出提升机"))
                //{
@@ -1479,7 +1494,7 @@
                            "start DD ",
                            start.ToString(),
                            "-",
                            TRow
                            FRow
                            }), "");
                        }
                        else
@@ -1494,7 +1509,7 @@
                            "start agv点",
                            start.ToString(),
                            "-",
                            TRow
                            FRow
                            }), "");
                        }
                    }
@@ -1582,6 +1597,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>
                {
                    {