双钱-点对点、满托出库上线、暂时取消RFID读卡器校验 双钱：取消任务收到4取货完成后，不会再次解锁重置起点

杨张扬

2 天以前 38f7aa5340b760d639263959aa59f87c512e75fa

双钱-点对点、满托出库上线、暂时取消RFID读卡器校验
双钱：取消任务收到4取货完成后，不会再次解锁重置起点

 core/WCSCore.cs

@@ -69,7 +69,15 @@
                                    WCSHelper.Begin(tN_Task, model.forklift_no);//已推送的任务的状态改成执行
                                    Task task4 = Task.Run(() =>
                                    {
                                        OpenScanCode(model.task_no, model.forklift_no);//开启扫码
                                        if (tN_Task.S_TYPE.Contains("点对点") || tN_Task.S_TYPE.Contains("满托出库上线") || tN_Task.S_TYPE.Contains("满托出库复检"))
                                        {
                                            //不开启扫码
                                        }
                                        else
                                        {
                                            OpenScanCode(model.task_no, model.forklift_no);//开启扫码
                                        }
                                       
                                    });
                                    break;
                                case 3:

 process/TaskProcess.cs

@@ -68,7 +68,11 @@
                //必须删掉
                LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC, reqCode = 1 });
            }
            LocationHelper.UnLockLoc(mst.S_START_LOC);//解锁起点
            if (!WCSHelper.CheckActionRecordExist(mst.S_CODE, 4))
            {
                LocationHelper.UnLockLoc(mst.S_START_LOC);//解锁起点
            }
           
            LocationHelper.UnLockLoc(mst.S_END_LOC);//解锁终点
        }

@@ -155,13 +159,21 @@
                    var dic = new List<param>();
                    dic.Add(new param() { name = "IKey", value = "IKey" });
                    dic.Add(new param() { name = "From", value = start.ToString() });
                    dic.Add(new param() { name = "To", value = end.ToString() });
                    dic.Add(new param() { name = "FUNC", value = startLoc.N_LAYER.ToString() });

                    if (mst.S_TYPE.Contains("点对点") || mst.S_TYPE.Contains("满托出库上线") || mst.S_TYPE.Contains("满托出库复检"))
                    {
                        dic.Add(new param() { name = "FUNC", value = "0" });
                    }
                    else
                    {
                        dic.Add(new param() { name = "FUNC", value = startLoc.N_LAYER.ToString() });
                    }

                    dic.Add(new param() { name = "To", value = end.ToString() });
                    dic.Add(new param() { name = "Ctype", value = "0" });

                    
                    if (mst.S_TYPE == "余料下线入库" || mst.S_TYPE == "人工拆盘入库")
                    if (mst.S_TYPE.Contains("余料下线入库") || mst.S_TYPE.Contains("人工拆盘入库"))
                    {
                        dic.Add(new param() { name = "DATA", value = "1024" });
                    }
@@ -170,6 +182,8 @@
                        dic.Add(new param() { name = "DATA", value = "0" });
                    }

                    

                    var res = NDCApi.AddOrderNew(1, 1, mst.S_CODE, dic);//添加新命令
                    if (res != null && (res.err_code == 0 || res.err_code == 50009))
                    {

 wms/WCSHelper.cs

@@ -264,7 +264,11 @@
                    LogHelper.Info($"取消任务: {tN_Task.S_CODE} 取货完成，任务状态改成结束，绑定终点容器货位");
                }
                LocationHelper.UnLockLoc(tN_Task.S_END_LOC);
                LocationHelper.UnLockLoc(tN_Task.S_START_LOC);//解锁起点终点
                if (!WCSHelper.CheckActionRecordExist(tN_Task.S_CODE, 4))
                {
                    LocationHelper.UnLockLoc(tN_Task.S_START_LOC);//解锁起点终点
                }
               
            }
            else
            {
@@ -294,7 +298,10 @@
                    LogHelper.Info($"取消任务: {tN_Task.S_CODE} 未取货完成，任务状态改成结束，绑定终点容器货位");
                }
                LocationHelper.UnLockLoc(tN_Task.S_END_LOC);
                LocationHelper.UnLockLoc(tN_Task.S_START_LOC);//解锁起点终点
                if (!WCSHelper.CheckActionRecordExist(tN_Task.S_CODE, 4))
                {
                    LocationHelper.UnLockLoc(tN_Task.S_START_LOC);//解锁起点终点
                }
            }
        }
    }