增加空托堆叠和空托入货架的新逻辑，增加拆盘入库和回炉胶和废料的逻辑

杨张扬

4 天以前 2d2342157638cab98a4c59b0c687808cc2f98ea1

 api/ApiHelper.cs

@@ -202,10 +202,10 @@
                            && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位
                }
                else if (model.cgState == 6)//一级料二级料回库
                else if (model.cgState == 6)//E级料二级料回库
                {
                    cG_Detail.N_ITEM_STATE = 6;
                    cG_Detail.S_ITEM_STATE = "一级料";
                    cG_Detail.S_ITEM_STATE = "E级料";
                    endLoc = db.Queryable<TN_Location>().
                            Where(o => o.S_AREA_CODE == Settings.Areas[2] 
                            && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
@@ -213,7 +213,7 @@
                            && o.C_ENABLE == "Y" && o.N_CURRENT_NUM == 0).
                            OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位
                }
                else if (model.cgState == 7)//一级料二级料回库
                else if (model.cgState == 7)//E级料二级料回库
                {
                    cG_Detail.N_ITEM_STATE = 7;
                    cG_Detail.S_ITEM_STATE = "二级料";
@@ -227,7 +227,7 @@
                else
                {
                    result.resultCode = 6;
                    result.resultMsg = $"物料状态只能为0合格1待检2不合格，下线即待检，3过期，4技术判定，5混合，6一级料、7二级料，如果为其他值，则不处理";
                    result.resultMsg = $"物料状态只能为0合格1待检2不合格，下线即待检，3过期，4技术判定，5混合，6E级料、7二级料，如果为其他值，则不处理";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -387,17 +387,21 @@
                    endLoc.N_LOCK_STATE = 1;
                    endLoc.S_LOCK_STATE = "入库锁";

                    var locCntList = new List<TN_Loc_Container>();
                    string cntStr = "";
                    for (int i = 0; i < model.cntCount; i++)
                    {
                         cntStr += Guid.NewGuid().ToString("D")+",";
                        var locCnt = new TN_Loc_Container()
                        {
                            S_LOC_CODE = startLoc.S_CODE,
                            S_CNTR_CODE = Guid.NewGuid().ToString("D"),
                        };
                        cntStr += locCnt.S_CNTR_CODE + ",";

                        locCntList.Add(locCnt);
                    }
                    cntStr.Trim(','); 
                    var locCnt = new TN_Loc_Container()
                    {
                        S_LOC_CODE = startLoc.S_CODE,
                        S_CNTR_CODE = cntStr,
                    };
                    cntStr= cntStr.Trim(','); 
                   

                    var task = new TN_Task()
                    {
@@ -411,19 +415,19 @@
                        N_SCHEDULE_TYPE = 1,
                        N_B_STATE = 0,
                        S_B_STATE = "等待",
                        S_CNTR_CODE = locCnt.S_CNTR_CODE,
                        S_CNTR_CODE = cntStr,
                    };

                    if (
                        db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_CURRENT_NUM, it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand() == 1 &&
                        db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE }).ExecuteCommand() == 1 &&
                        db.Insertable<TN_Loc_Container>(locCnt).ExecuteCommand() == 1 &&
                        db.Insertable<TN_Loc_Container>(locCntList).ExecuteCommand() == locCntList.Count &&
                        db.Insertable<TN_Task>(task).ExecuteCommand() == 1
                        )
                    {
                        Task task1 = Task.Run(() =>
                        {
                            WMSHelper.InsertOpInfo(model.staff, "点对点", locCnt.S_CNTR_CODE);
                            WMSHelper.InsertOpInfo(model.staff, "点对点", cntStr);
                        });

                        trans.CommitTran();
@@ -1824,7 +1828,7 @@
                if (model.new_IsOK == model.old_IsOK)
                {
                    result.resultCode = 19;
                    result.resultMsg = $"人工拆盘入库，物料需要一个待检一个不合格";
                    result.resultMsg = $"人工拆盘入库，物料需要一个合格 和 一个不合格（回炉胶或废料）";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -1853,6 +1857,8 @@
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                cG_old_Detail.S_ITEM_SPEC = model.old_Spec;
                cG_old_Detail.S_SPE = model.old_Spec;

                var startLoc_Old = db.Queryable<TN_Location>().
                    First(o => o.S_CODE == model.old_StartLoc && o.N_CURRENT_NUM == 0 && o.S_AREA_CODE == Settings.Areas[5] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无");
@@ -1916,13 +1922,12 @@
                {
                    S_CNTR_CODE = model.new_CntIds,
                    S_BATCH_NO = cG_old_Detail.S_BATCH_NO,
                    S_ITEM_SPEC = cG_old_Detail.S_ITEM_SPEC,
                    S_SPE = cG_old_Detail.S_SPE,
                    S_ITEM_SPEC = model.new_Spec,
                    S_SPE = model.new_Spec,
                    S_ITEM_STATE = LocationHelper.GetStrByOk(model.new_IsOK),
                    N_ITEM_STATE = model.new_IsOK,
                    S_CAR_CODE = cG_old_Detail.S_CAR_CODE,
                    T_MODIFY = System.DateTime.Now,
                    //C_ITEM_MERGE = model.new_CntIds,
                    S_ITEM_CODE = cG_old_Detail.S_ITEM_CODE,
                    S_Separate_ID = cG_old_Detail.S_Separate_ID
                };
@@ -1932,7 +1937,7 @@
                if (db.Queryable<TN_Task>().Count(a => a.N_B_STATE < 3 && a.S_END_LOC == weightPoint) > 2)
                {
                    result.resultCode = 11;
                    result.resultMsg = $"终点称重货位{weightPoint}的正在执行的任务数量大于2";
                    result.resultMsg = $"终点称重货位{weightPoint}的正在执行的任务数量大于2，繁忙，请等待";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -1941,11 +1946,6 @@
                          First(o => o.S_AREA_CODE == Settings.Areas[9]
                          && o.S_CODE == weightPoint);//查询合适的终点货位，去称重

                var endLoc_NG = db.Queryable<TN_Location>().
                          Where(o => o.S_AREA_CODE == Settings.Areas[8] 
                          && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                          && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()//不能有货
                          && o.N_CURRENT_NUM == 0).First();//查询合适的终点货位

                if (endLoc_Ok == null)
                {
@@ -1955,53 +1955,48 @@
                    return result;
                }

                if (endLoc_NG == null)
                {
                    result.resultCode = 16;
                    result.resultMsg = $"不合格的物料未找到合适的拆盘不合格区终点货位{Settings.Areas[8]}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }

                var taskLog1_Old = $"旧容器号{model.old_CntId}，旧容器号的起点{startLoc_Old.S_CODE}，终点{endLoc_Ok.S_CODE}";

                var taskLog_New = $"新容器号{model.new_CntIds}，新容器号的起点{model.new_StartLoc}，终点{endLoc_NG.S_CODE}";
                var taskLog_New = $"新容器号{model.new_CntIds}，新容器号的起点{model.new_StartLoc}";

                List<CreateTasks> modesCreateTask = new List<CreateTasks>();

                var newTaskCreate = new CreateTasks()
                if (model.new_IsOK == 0)
                {
                    taskNo = WCSHelper.GenerateTaskNo(),
                    from = model.new_StartLoc,
                    fromArea = startLoc_New.S_AREA_CODE,
                    to = (model.new_IsOK == 2) ? endLoc_NG.S_CODE : endLoc_Ok.S_CODE,
                    toArea = (model.new_IsOK == 2) ? endLoc_NG.S_AREA_CODE : endLoc_Ok.S_AREA_CODE,
                    taskType = (model.new_IsOK == 2) ? "人工拆盘回不合格区" : "人工拆盘回库",
                    pri = 3,
                    cntrInfo = model.new_CntIds,
                    spec = cG_new_Detail_Ins.S_SPE,
                };

                modesCreateTask.Add(newTaskCreate);

                var oldTaskCreate = new CreateTasks()
                    var newTaskCreate = new CreateTasks()
                    {
                        taskNo = WCSHelper.GenerateTaskNo(),
                        from = model.new_StartLoc,
                        fromArea = startLoc_New.S_AREA_CODE,
                        to =  endLoc_Ok.S_CODE,
                        toArea = endLoc_Ok.S_AREA_CODE,
                        taskType = "人工拆盘合格回库",
                        pri = 3,
                        cntrInfo = model.new_CntIds,
                        spec = cG_new_Detail_Ins.S_SPE,
                    };
                    modesCreateTask.Add(newTaskCreate);
                }
                else if (model.old_IsOK == 1)
                {
                    taskNo = WCSHelper.GenerateTaskNo(),
                    from = startLoc_Old.S_CODE,
                    fromArea = startLoc_Old.S_AREA_CODE,
                    to = (model.old_IsOK == 2) ? endLoc_NG.S_CODE : endLoc_Ok.S_CODE,
                    toArea = (model.old_IsOK == 2) ? endLoc_NG.S_AREA_CODE : endLoc_Ok.S_AREA_CODE,
                    taskType = (model.old_IsOK == 2) ? "人工拆盘回不合格区" : "人工拆盘回库",
                    pri = 3,
                    cntrInfo = model.old_CntId,
                    spec = cG_old_Detail.S_SPE,
                };
                modesCreateTask.Add(oldTaskCreate);
                    var newTaskCreate = new CreateTasks()
                    {
                        taskNo = WCSHelper.GenerateTaskNo(),
                        from = model.old_StartLoc,
                        fromArea = startLoc_Old.S_AREA_CODE,
                        to = endLoc_Ok.S_CODE,
                        toArea = endLoc_Ok.S_AREA_CODE,
                        taskType = "人工拆盘合格回库",
                        pri = 3,
                        cntrInfo = model.old_CntId,
                        spec = cG_old_Detail.S_SPE,
                    };
                    modesCreateTask.Add(newTaskCreate);
                }

                startLoc_Old.N_LOCK_STATE = 2;
                startLoc_Old.S_LOCK_STATE = "出库锁";
                startLoc_Old.N_CURRENT_NUM = 1;


                startLoc_New.N_LOCK_STATE = 2;
                startLoc_New.S_LOCK_STATE = "出库锁";
@@ -2037,49 +2032,11 @@
                        if (WCSHelper.CreateTask(modesCreateTask))//创建搬送任务，起点终点容器
                        {
                            tran.CommitTran();
                            LogHelper.Info($"生成人工拆盘入库任务成功，" + taskLog_New + taskLog1_Old);
                            LogHelper.Info($"生成人工拆盘合格回库任务成功，" + taskLog_New + taskLog1_Old);

                            Task task1 = Task.Run(() =>
                            {
                                WMSHelper.InsertOpInfo(model.staff, "人工拆盘入库", model.new_CntIds + "," + model.old_CntId);
                            });

                            Task task2 = Task.Run(() =>
                            {
                                if (model.old_IsOK == 1)
                                {
                                    var target = new TN_RemeltDetail()
                                    {
                                        TASKNO = oldTaskCreate.taskNo,
                                        CNTCODE = cG_old_Detail.S_CNTR_CODE,
                                        STARTLOC = startLoc_Old.S_CODE,
                                        LOGINNAME = model.staff,
                                        ITEMCODE = cG_old_Detail.S_ITEM_CODE,
                                        SPEC = cG_old_Detail.S_SPE,
                                        CARCODE = cG_old_Detail.S_CAR_CODE,
                                        WEIGHT = cG_old_Detail.F_QTY,
                                        REMELTTIME = DateTime.Now,
                                        SHIFT = model.shift,
                                    };
                                    SpecHelper.InsertRemeltDetail(target);
                                }
                                if (model.new_IsOK == 1)
                                {
                                    var target = new TN_RemeltDetail()
                                    {
                                        TASKNO = newTaskCreate.taskNo,
                                        CNTCODE = cG_new_Detail_Ins.S_CNTR_CODE,
                                        STARTLOC = startLoc_New.S_CODE,
                                        LOGINNAME = model.staff,
                                        ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,
                                        SPEC = cG_new_Detail_Ins.S_SPE,
                                        CARCODE = cG_new_Detail_Ins.S_CAR_CODE,
                                        WEIGHT = cG_new_Detail_Ins.F_QTY,
                                        REMELTTIME = DateTime.Now,
                                        SHIFT = model.shift,
                                    };
                                    SpecHelper.InsertRemeltDetail(target);
                                }
                                WMSHelper.InsertOpInfo(model.staff, "人工拆盘合格回库", model.new_CntIds + "," + model.old_CntId);
                            });

                            Task task27 = Task.Run(() =>
@@ -2122,7 +2079,7 @@
                        {
                            tran.RollbackTran();
                            result.resultCode = 17;
                            result.resultMsg = $"生成人工拆盘入库任务失败，" + taskLog_New + taskLog1_Old;
                            result.resultMsg = $"生成人工拆盘合格回库任务失败，" + taskLog_New + taskLog1_Old;
                            LogHelper.Info(result.resultMsg);
                            return result;
                        }
@@ -2131,7 +2088,7 @@
                    {
                        tran.RollbackTran();
                        result.resultCode = 18;
                        result.resultMsg = $"生成人工拆盘入库任务失败，" + taskLog_New + taskLog1_Old;
                        result.resultMsg = $"生成人工拆盘合格回库任务失败，" + taskLog_New + taskLog1_Old;
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }