退库修改

海波 张

7 天以前 2cb1fca5b2d7bcd9e7b7536b06cf4200bd0cb94c

 dispatch/WcsTask.cs

@@ -194,10 +194,10 @@
                stnNo = aloneWcsTask.S_START_LOC,//接驳位
                reqTime = DateTime.Now.ToString()//操作时间
            };
            LogHelper.Info("Wcs立库输送线是否有货 地址信息:" + baseUrl + "CV-state", "立库");
            LogHelper.Info("Wcs立库输送线是否有货 参数信息:" + JsonConvert.SerializeObject(interact), "立库");
            LogHelper.Info("Wcs立库输送线是否有货 地址信息:" + baseUrl + "CV-state", "是否有货");
            LogHelper.Info("Wcs立库输送线是否有货 参数信息:" + JsonConvert.SerializeObject(interact), "是否有货");
            var result = apiHelper.Post(baseUrl + "CV-state", JsonConvert.SerializeObject(interact));
            LogHelper.Info("Wcs立库输送线是否有货 返回信息:" + JsonConvert.SerializeObject(result), "立库");
            LogHelper.Info("Wcs立库输送线是否有货 返回信息:" + JsonConvert.SerializeObject(result), "是否有货");
            if (!string.IsNullOrEmpty(result))
            {
                var res = JsonConvert.DeserializeObject<WcsTaskReturn>(result);
@@ -212,7 +212,7 @@
            }
            else
            {
                LogHelper.Info("Wcs立库输送线是否有货 返回信息为空", "立库");
                LogHelper.Info("Wcs立库输送线是否有货 返回信息为空", "是否有货");
                return false;
            }
        }
@@ -693,6 +693,14 @@
                                        LogHelper.Info($"RFID校验失败，没找到对应{transportTask.S_OP_CODE}的agv任务", "Wcs任务执行通知");
                                        throw new Exception($"RFID校验失败,没找到对应{transportTask.S_OP_CODE}的agv任务");
                                    }

                                    WmsTaskAction ac7 = TaskHelper.GetActionRecord(agvTask.S_CODE, "7");
                                    if (ac7!=null)
                                    {
                                        LogHelper.Info($"RFID校验失败，agv任务{agvTask.S_CODE},已经取消，请人工处理", "Wcs任务执行通知");
                                        throw new Exception($"RFID校验失败，agv任务{agvTask.S_CODE},已经取消，请人工处理");
                                    }

                                    var workFlow = TaskHelper.selectWorkFlowByType(agvTask.N_TYPE.ToString(), agvTask.TOOLSTYPE);

                                    if (workFlow == null)
@@ -740,6 +748,12 @@
                                    throw new Exception($"RFID校验失败，通知Wcs取消任务失败");
                                }
                            }

                            if (model.code == "2") { 
                                
                            }


                            newDb.BeginTran();
                            var R = newDb.Insertable(RfidChek).ExecuteCommand();
                            if (R == 0)
@@ -1381,6 +1395,47 @@
                result.msg = "成功";
                result.requestPk = model.requestPk;
                LogHelper.Info("Wcs通知确认返回" + JsonConvert.SerializeObject(result), "通知确认");

                //查找立库通知确认表
                var mst = TaskHelper.GetTask(model.requestPk);
                if (mst==null)
                {
                    throw new Exception($"为查询到任务{model.requestPk}");
                }
                
                if (mst.S_TYPE.Contains("出库"))
                {
                    var ac1102 = TaskHelper.GetWcsSafety(mst.S_CODE, "1102");
                    if (ac1102 == null) {
                        if (model.trkType == "1" && model.isAllow == "1")
                        {
                            //立库通知成功修改参数
                            LogHelper.Info($"立库通知确认，取货交管成功，修改参数", "安全交互");
                            NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
                        }
                        else
                        {
                            LogHelper.Info($"立库通知确认，任务号={mst.S_CODE}，取货交管不允许，不修改参数", "安全交互");
                        }
                    }   
                }
                else {
                    var ac1104 = TaskHelper.GetWcsSafety(mst.S_CODE, "1104");
                    if (ac1104==null)
                    {
                        if (model.trkType == "2" && model.isAllow == "1")
                        {
                            //立库通知成功修改参数
                            LogHelper.Info($"立库通知确认，任务号={mst.S_CODE}，卸货交管成功，修改参数", "安全交互");
                            NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
                        }
                        else
                        {
                            LogHelper.Info($"立库通知确认，任务号={mst.S_CODE}，卸货交管不允许，不修改参数", "安全交互");
                        }
                    }
                }

                return result;
            }
            catch (Exception ex)