杨张扬
昨天 c21c4880ccb8fd06c1647d3a84d330c42ebf9ee5
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;
                }
@@ -421,7 +421,7 @@
                    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>(locCntList).ExecuteCommand() == 1 &&
                        db.Insertable<TN_Loc_Container>(locCntList).ExecuteCommand() == locCntList.Count &&
                        db.Insertable<TN_Task>(task).ExecuteCommand() == 1
                        )
                    {
@@ -628,178 +628,6 @@
            {
                result.resultCode = -1;
                result.resultMsg = $"PDA满托复检判断,发生了异常:{ex.Message}";
                LogHelper.Info(result.resultMsg);
                return result;
            }
        }
        /// <summary>
        /// 人工次品回炉
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        internal static SimpleResult PDAReturnReset(PDAReturnResetInfo model)
        {
            LogHelper.Info("触发API:人工次品回炉" + JsonConvert.SerializeObject(model), "API");
            var result = new SimpleResult();//返回结果
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                var startLoc  =  db.Queryable<TN_Location>().First(o => o.S_CODE == model.startLoc && o.N_CURRENT_NUM ==0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE=="无" && o.S_AREA_CODE == Settings.Areas[4]);
                if (startLoc == null)
                {
                    result.resultCode = 1;
                    result.resultMsg = $"未找到合适的起点信息,要求:o.S_CODE == { model.startLoc} && o.N_CURRENT_NUM ==0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == 无 && o.S_AREA_CODE == {Settings.Areas[4]}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                var endLoc = db.Queryable<TN_Location>().
                    Where(o =>o.S_AREA_CODE == Settings.Areas[11]
                    && o.N_CURRENT_NUM == 0
                    && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无"
                    && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
                    ).First();
                if (endLoc == null)
                {
                    result.resultCode = 2;
                    result.resultMsg = $"未找到合适的终点信息,要求:o.S_AREA_CODE == {Settings.Areas[11]} && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == 无";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                var cgInfo = db.Queryable<TN_CG_Detail>().First(a=>a.S_CNTR_CODE == model.rfId);
                if (cgInfo == null)
                {
                    result.resultCode = 3;
                    result.resultMsg = $"未找到对应的物料信息,要求:a.S_CNTR_CODE == {model.rfId}";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
                var task1 = new TN_Task()
                {
                    S_CODE = WCSHelper.GenerateTaskNo(),
                    S_START_AREA = startLoc.S_AREA_CODE,
                    S_END_AREA = endLoc.S_AREA_CODE,
                    S_START_LOC = startLoc.S_CODE,
                    S_END_LOC = endLoc.S_CODE,
                    S_TYPE = "人工次品回炉",
                    N_B_STATE = 0,
                    S_B_STATE = "等待",
                    S_CNTR_CODE = model.rfId,
                    S_SPEC = cgInfo.S_ITEM_SPEC,
                };
                startLoc.N_LOCK_STATE = 2;
                startLoc.S_LOCK_STATE = "出库锁";
                startLoc.N_CURRENT_NUM = 1;
                startLoc.T_MODIFY = System.DateTime.Now;
                endLoc.N_LOCK_STATE = 1;
                endLoc.S_LOCK_STATE = "入库锁";
                endLoc.T_MODIFY = System.DateTime.Now;
                using (var tran = db.Ado.UseTran())
                {
                    var locCnt = db.Queryable<TN_Loc_Container>().First(o => o.S_CNTR_CODE == model.rfId && o.S_LOC_CODE != model.startLoc);
                    TN_Location locOld = null;
                    if (locCnt != null)
                    {
                        locOld = db.Queryable<TN_Location>().First(o => o.S_CODE == locCnt.S_LOC_CODE);
                        if (locOld != null)
                        {
                            locOld.N_CURRENT_NUM = 0;
                            if (db.Updateable<TN_Location>(locOld).UpdateColumns(it => new { it.N_CURRENT_NUM }).ExecuteCommand() <= 0)
                            {
                                tran.RollbackTran();
                                result.resultCode = 4;
                                result.resultMsg = $"更新旧货位失败,{locOld.S_CODE}";
                                LogHelper.Info(result.resultMsg);
                                return result;
                            }
                        }
                        locCnt.S_LOC_CODE = model.startLoc;
                        if (db.Updateable<TN_Loc_Container>(locCnt).UpdateColumns(it => new { it.S_LOC_CODE }).ExecuteCommand() <= 0)
                        {
                            tran.RollbackTran();
                            result.resultCode = 5;
                            result.resultMsg = $"更新货位容器关系表(换绑)失败,{model.startLoc}";
                            LogHelper.Info(result.resultMsg);
                            return result;
                        }
                    }
                    else
                    {
                        locCnt = new TN_Loc_Container()
                        {
                            S_LOC_CODE = model.startLoc,
                            S_CNTR_CODE = model.rfId,
                        };
                        if (db.Insertable<TN_Loc_Container>(locCnt).ExecuteCommand() <= 0)
                        {
                            tran.RollbackTran();
                            result.resultCode = 6;
                            result.resultMsg = $"插入货位容器关系表(绑定)失败,{model.startLoc}";
                            LogHelper.Info(result.resultMsg);
                            return result;
                        }
                    }
                    if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
                        db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
                        db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0)
                    {
                        Task task99 = Task.Run(() =>
                        {
                            WMSHelper.InsertOpInfo(model.staff, "人工次品回炉", locCnt.S_CNTR_CODE);
                        });
                        Task task2 = Task.Run(() =>
                        {
                            var target = new TN_RemeltDetail()
                            {
                                TASKNO = task1.S_CODE,
                                CNTCODE = model.rfId,
                                STARTLOC = model.startLoc,
                                LOGINNAME = model.staff,
                                ITEMCODE = cgInfo.S_ITEM_CODE,
                                SPEC = cgInfo.S_SPE,
                                CARCODE = cgInfo.S_CAR_CODE,
                                WEIGHT = cgInfo.F_QTY,
                                REMELTTIME = DateTime.Now,
                                SHIFT = model.shift,
                            };
                            SpecHelper.InsertRemeltDetail(target);
                        });
                        tran.CommitTran();
                        result.resultCode = 0;
                        result.resultMsg = "成功";
                        LogHelper.Info($"生成人工次品回炉任务成功,容器:{model.rfId},起点:{model.startLoc},终点:{endLoc.S_CODE}");
                        return result;
                    }
                    else
                    {
                        tran.RollbackTran();
                        result.resultCode = 7;
                        result.resultMsg = $"生成人工次品回炉任务失败,容器:{model.rfId},起点:{model.startLoc},终点:{endLoc.S_CODE}";
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }
                }
            }
            catch(Exception ex)
            {
                result.resultCode = -1;
                result.resultMsg = $"生成人工次品回炉任务失败,发生了异常:{ex.Message}";
                LogHelper.Info(result.resultMsg);
                return result;
            }
@@ -1828,7 +1656,7 @@
                if (model.new_IsOK == model.old_IsOK)
                {
                    result.resultCode = 19;
                    result.resultMsg = $"人工拆盘入库,物料需要一个待检一个不合格";
                    result.resultMsg = $"人工拆盘入库,物料需要一个合格 和 一个不合格(回炉胶或废料)";
                    LogHelper.Info(result.resultMsg);
                    return result;
                }
@@ -1857,6 +1685,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 == "无");
@@ -1920,13 +1750,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
                };
@@ -1936,7 +1765,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;
                }
@@ -1945,11 +1774,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)
                {
@@ -1959,53 +1783,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 = "出库锁";
@@ -2041,49 +1860,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(() =>
@@ -2126,7 +1907,7 @@
                        {
                            tran.RollbackTran();
                            result.resultCode = 17;
                            result.resultMsg = $"生成人工拆盘入库任务失败," + taskLog_New + taskLog1_Old;
                            result.resultMsg = $"生成人工拆盘合格回库任务失败," + taskLog_New + taskLog1_Old;
                            LogHelper.Info(result.resultMsg);
                            return result;
                        }
@@ -2135,7 +1916,7 @@
                    {
                        tran.RollbackTran();
                        result.resultCode = 18;
                        result.resultMsg = $"生成人工拆盘入库任务失败," + taskLog_New + taskLog1_Old;
                        result.resultMsg = $"生成人工拆盘合格回库任务失败," + taskLog_New + taskLog1_Old;
                        LogHelper.Info(result.resultMsg);
                        return result;
                    }