海波 张
昨天 f9ee14fbfe22a0a56350580838bb6e4b57f829dc
process/TaskProcess.cs
@@ -142,42 +142,42 @@
            else if (state == 1004) {
                LogHelper.Info($"等待交互,任务号={mst.S_CODE}", "安全交互");
                var wcsCode = "";
                //var wcsCode = "";
                if (mst.S_TYPE.Contains("入库")|| mst.S_TYPE.Contains("回库"))
                {
                    wcsCode = mst.S_CODE.Replace(@"_1", "_2");
                }
                //if (mst.S_TYPE.Contains("入库")|| mst.S_TYPE.Contains("回库"))
                //{
                //    wcsCode = mst.S_CODE.Replace(@"_1", "_2");
                //}
                if (mst.S_TYPE.Contains("出库"))
                {
                    wcsCode = mst.S_CODE.Replace(@"_2", "_1");
                }
                //if (mst.S_TYPE.Contains("出库"))
                //{
                //    wcsCode = mst.S_CODE.Replace(@"_2", "_1");
                //}
                LogHelper.Info($"等待交互,查询校验任务号={wcsCode}", "安全交互");
                //等待rfid校验
                var rfidFlag = TaskHelper.GetRfid(wcsCode);
                //LogHelper.Info($"等待交互,查询校验任务号={wcsCode}", "安全交互");
                ////等待rfid校验
                //var rfidFlag = TaskHelper.GetRfid(wcsCode);
                LogHelper.Info($"等待交互,任务号={mst.S_CODE},RFID校验信息"+JsonConvert.SerializeObject(rfidFlag), "安全交互");
                if (rfidFlag!=null)
                {
                    if (rfidFlag.S_RESULT.Contains("成功"))
                    {
                        LogHelper.Info($"任务号={mst.S_CODE},等待交管成功,修改参数6为1,4为0", "安全交互");
                        NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
                        NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
                    }
                    else {
                        var startSite = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
                        var endSite = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
                        LogHelper.Info($"任务{mst.S_CODE}RFID校验失败,改参数1为{startSite},改参数2为{endSite},参数4为0,6为1", "安全交互");
                        NDCApi.ChangeOrderParam(mst.S_CODE, 1, startSite);
                        NDCApi.ChangeOrderParam(mst.S_CODE, 2, endSite);
                        NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
                        Thread.Sleep(1000);
                        NDCApi.ChangeOrderParam(mst.S_CODE, 6, "2");
                    }
                }
                //LogHelper.Info($"等待交互,任务号={mst.S_CODE},RFID校验信息"+JsonConvert.SerializeObject(rfidFlag), "安全交互");
                //if (rfidFlag!=null)
                //{
                //    if (rfidFlag.S_RESULT.Contains("成功"))
                //    {
                //        LogHelper.Info($"任务号={mst.S_CODE},等待交管成功,修改参数6为1,4为0", "安全交互");
                //        NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
                //        NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
                //    }
                //    else {
                //        var startSite = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
                //        var endSite = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
                //        LogHelper.Info($"任务{mst.S_CODE}RFID校验失败,改参数1为{startSite},改参数2为{endSite},参数4为0,6为1", "安全交互");
                //        NDCApi.ChangeOrderParam(mst.S_CODE, 1, startSite);
                //        NDCApi.ChangeOrderParam(mst.S_CODE, 2, endSite);
                //        NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
                //        Thread.Sleep(1000);
                //        NDCApi.ChangeOrderParam(mst.S_CODE, 6, "2");
                //    }
                //}
            }
        }
@@ -2196,7 +2196,7 @@
                            LogHelper.Info($"{operation.S_CODE}锁货位", "上锁");
                            LocationHelper.LockLoc(operation.S_START_LOC, "出库锁", 2);
                            LocationHelper.LockLoc(operation.S_END_LOC, "入库锁", 1);
                            LocationHelper.LockLoc(operation.CONNECTION, "其他锁", 3);
                            LocationHelper.LockLoc(operation.CONNECTION, "其它锁", 3);
                        }