增加无称重的指定货位入库流程，添加指定卸货位解绑接口备用

kazelee

2 天以前 d93440432c13c75f798427be327cde02cfe7f301

增加无称重的指定货位入库流程，添加指定卸货位解绑接口备用

 api/ApiHelper.cs

@@ -39,7 +39,7 @@
                    .First();

                if (startLoc == null) {
                    return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求：(1)没有锁状态 (2)属于取放货区");
                    return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求：(1)没有锁状态 (2)属于取货区");
                }

                //var locCntrRelOld = db.Queryable<TN_Loc_Container>()
@@ -612,7 +612,7 @@

            try {
                // 起点位置：取放货区（有货物、没有锁、已启用）
                var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && startAreas.Contains(a.S_AREA_CODE));
                var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && startAreas.Contains(a.S_AREA_CODE));
                if (startLoc == null) {
                    return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不符合回库条件");
                }
@@ -665,6 +665,154 @@
        }

        /// <summary>
        /// 指定货位入库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        internal static SimpleResult InboundLoc(InboundLocInfo model) {
            var taskName = TaskName.指定货位入库;
            var db = new SqlHelper<object>().GetInstance();

            var startAreas = Settings.Areas[AreaIndex.Q取货区];
            var endAreas = Settings.Areas[AreaIndex.H货架区];

            try {
                // 起点位置：取放货区（有货物、没有锁、已启用）
                var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && startAreas.Contains(a.S_AREA_CODE));
                if (startLoc == null) {
                    return BuildSimpleResult(1, $"起点位置{model.startLoc}不存在或不满足要求：(1)没有锁状态 (2)属于取放货区");
                }

                //var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
                //if (locCntrRel == null) {
                //    return BuildSimpleResult(3, $"起点位置 {model.startLoc} 没有绑定容器，无可回库的物料");
                //}

                var cntId = GenerateNo("容器号", "CN");
                //var cgId = GenerateNo("物料号", "CG");
                var cgId = string.IsNullOrEmpty(model.ItemCode) ? GenerateNo("物料号", "CG") : model.ItemCode;

                // 首次入库：绑定信息，先将起点位置与容器绑定，容器与物料绑定
                var locCntrRel = new TN_Loc_Container() {
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cntId,
                    N_LOCK_STATE = string.IsNullOrEmpty(model.ItemCode) ? 0 : 1,
                };

                var cgDetail = new TN_CG_Detail() {
                    S_ITEM_CODE = cgId,
                    S_CNTR_CODE = cntId,
                    //S_ITEM_NAME = model.ItemName,
                    S_LOC_CODE = startLoc.S_CODE, // ADD：补充针对PDA分拣
                    N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
                };

                startLoc.N_CURRENT_NUM = 1;

                // 终点位置：货架（没有货物，没有锁）
                var endLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.endLoc && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && endAreas.Contains(a.S_AREA_CODE));
                if (endLoc == null) {
                    return BuildSimpleResult(4, $"终点位置 {model.endLoc} 不具备放货条件");
                }

                //var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}");
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
                        it.S_LOCK_OP,
                        it.T_MODIFY
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}");
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}");
                    }

                    tran.CommitTran();
                    return BuildSimpleResult(0,
                        $"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}");
                }
            }
            catch (Exception ex) {
                return BuildSimpleResult(1, $"发生了异常：{ex.Message}");
            }
        }

        /// <summary>
        /// 指定货位入库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        internal static SimpleResult UnbindLoc(UnbindLocInfo model) {
            var db = new SqlHelper<object>().GetInstance();

            var startAreas = Settings.Areas[AreaIndex.X卸货区];
            //var endAreas = Settings.Areas[AreaIndex.H货架区];

            try {
                // 起点位置：取放货区（有货物、没有锁、已启用）
                var startLoc = db.Queryable<TN_Location>().First(a => a.S_CODE == model.startLoc && a.N_CURRENT_NUM == 1 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y" && startAreas.Contains(a.S_AREA_CODE));
                if (startLoc == null) {
                    return BuildSimpleResult(1, $"起点位置{model.startLoc}不存在或不满足要求：(1)没有锁状态 (2)属于取货区");
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);
                if (locCntrRel == null) {
                    return BuildSimpleResult(2, $"当前货位{model.startLoc}没有货位容器绑定关系，无需解绑！");
                }

                var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrRel.S_CNTR_CODE);
                if (cgDetail != null) {
                    return BuildSimpleResult(3, $"当前货位{model.startLoc}容器存放的物料数量不为0，无法解绑！");
                }

                startLoc.N_CURRENT_NUM = 0;
                startLoc.T_MODIFY = DateTime.Now;

                using (var tran = db.Ado.UseTran()) {
                    if (db.Deleteable(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"删除货位容器绑定关系失败!" + JsonConvert.SerializeObject(locCntrRel));
                    }

                    if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_CURRENT_NUM, it.T_MODIFY }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"删除货位容器绑定关系失败!" + JsonConvert.SerializeObject(locCntrRel));
                    }

                    tran.CommitTran();
                    return BuildSimpleResult(0, "解绑容器货品关系成功");
                }
            }
            catch (Exception ex) {
                return BuildSimpleResult(1, $"发生了异常：{ex.Message}");
            }
        }

        /// <summary>
        /// 产品部分回库（不指定终点，备用）
        /// </summary>
        /// <param name="model"></param>

 api/ApiModel.cs

@@ -223,6 +223,16 @@
            public string endLoc { get; set; }
        }

        public class InboundLocInfo {
            public string startLoc { get; set; }
            public string endLoc { get; set; }
            public string ItemCode { get; set; }
        }

        public class UnbindLocInfo {
            public string startLoc { get; set; }
        }

        public class CancelTaskInfo {
            public string TaskNo { get; set; }
        }

 api/MoboxController.cs

@@ -75,6 +75,30 @@
        }

        /// <summary>
        /// 指定货位入库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("InboundLoc")]
        public SimpleResult InboundLoc(InboundLocInfo model) {
            LogHelper.Info("触发API：InboundLoc：指定货位入库" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.InboundLoc(model);
        }

        /// <summary>
        /// 货位容器解绑
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("UnbindLoc")]
        public SimpleResult UnbindLoc(UnbindLocInfo model) {
            LogHelper.Info("触发API：UnbindLoc：货位容器解绑" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.UnbindLoc(model);
        }

        /// <summary>
        /// 取消任务
        /// </summary>
        /// <param name="model"></param>

 core/WCSCore.cs

@@ -71,7 +71,7 @@
                case 4: // 取货完成
                    WCSHelper.UpdateStatus(TN_Task, "取货完成"); // 任务状态改成取货完成

                    if (TN_Task.S_TYPE == TaskName.产品入库 || TN_Task.S_TYPE == TaskName.产品部分回库) {
                    if (TN_Task.S_TYPE == TaskName.产品入库 || TN_Task.S_TYPE == TaskName.产品部分回库 || TN_Task.S_TYPE == TaskName.指定货位入库 || TN_Task.S_TYPE == TaskName.盘点理货回库) {
                        var captureTask = Task.Run(() => {
                            CapturePic(TN_Task);
                            LogHelper.Info($"{TN_Task}：拍照Task结束");
@@ -86,7 +86,7 @@
                        });
                    }

                    if (TN_Task.S_TYPE == TaskName.产品部分回库) {
                    if (TN_Task.S_TYPE == TaskName.产品部分回库 || TN_Task.S_TYPE == TaskName.指定货位入库 || TN_Task.S_TYPE == TaskName.盘点理货回库) {
                        var weightTask = Task.Run(() => {
                            UpdateWeight(TN_Task);
                            LogHelper.Info("称重Task结束");

 util/Settings.cs

@@ -110,6 +110,7 @@
        public const string 产品入库 = "产品入库";
        public const string 产品部分出库 = "产品出库";
        public const string 产品部分回库 = "产品回库";
        public const string 指定货位入库 = "指定货位入库";

        // 备用：盘点理货出库（恢复）
        public const string 盘点理货出库 = "盘点理货出库";