重构盘点单表结构，修复部分盘点逻辑

kazelee

8 天以前 b183905d45e279eca8a845f532fc2d2edd540edb

重构盘点单表结构，修复部分盘点逻辑

 HH.WCS.Mobox3.AnGang.csproj

@@ -267,6 +267,13 @@
    <Compile Include="App_Start\SwaggerControllerDescProvider.cs" />
    <Compile Include="device\SnapDevice.cs" />
    <Compile Include="device\SnapManager.cs" />
    <Compile Include="models\TN_AG_Count_Diff.cs" />
    <Compile Include="models\TN_AG_Count_Order.cs" />
    <Compile Include="models\TN_AG_Count_Plan.cs" />
    <Compile Include="models\TN_Count_CG_Detail.cs" />
    <Compile Include="models\TN_Count_Diff.cs" />
    <Compile Include="models\TN_Count_Order.cs" />
    <Compile Include="models\TN_Count_Plan.cs" />
    <Compile Include="models\TN_Inbound_DataRecord.cs" />
    <Compile Include="models\TN_Outbound_DataRecord.cs" />
    <Compile Include="core\WMSCore.cs" />

 api/ApiHelper.cs

@@ -1097,5 +1097,330 @@
                return BuildErpResult(1, $"发生了异常：{ex.Message}");
            }
        }

        // 盘点功能（新）



        // 备用：盘点相关功能（恢复）------------------------------

        /// <summary>
        /// 盘点理货出库(WMS)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        internal static SimpleResult CheckOutbound(CheckOutboundInfo model) {
            var taskName = TaskName.盘点理货出库;
            var db = new SqlHelper<object>().GetInstance();

            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" && Settings.Areas[AreaIndex.H货架区].Contains(a.S_AREA_CODE));
                if (startLoc == null) {
                    return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不符合出库条件");
                }

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

                // 终点位置：货架（没有货物，没有锁）
                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");
                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>
        /// 盘点理货回库(WMS)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        internal static SimpleResult CheckInbound(CheckInboundInfo model) {
            var taskName = TaskName.盘点理货回库;
            var db = new SqlHelper<object>().GetInstance();

            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" && Settings.Areas[AreaIndex.X卸货区].Contains(a.S_AREA_CODE));
                if (startLoc == null) {
                    return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不符合回库条件");
                }

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

                // 终点位置：货架（没有货物，没有锁）
                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" && Settings.Areas[AreaIndex.H货架区].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}");
            }
        }

        //public static SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
        //    var db = new SqlHelper<object>().GetInstance();
        //    try {

        //        var countPlan = new TN_Count_Plan() {
        //            S_CP_NO = GenerateNo("盘点计划", "PDJH"), // CP =》PDJH
        //            S_TYPE = model.countType,
        //        };

        //        if (model.countType == "货位") {
        //            countPlan.S_LOC_CODE = model.targetId;
        //        }
        //        else if (model.countType == "物料") {
        //            countPlan.S_ITEM_CODE = model.targetId;
        //        }
        //        else {
        //            return BuildSimpleResult(2, $"创建盘点计划失败：不合法的盘点类型 '{model.countType}'");
        //        }

        //        if (db.Insertable<TN_Count_Plan>(countPlan).ExecuteCommand() <= 0) {
        //            return BuildSimpleResult(2, "创建盘点计划失败");
        //        }

        //        return BuildSimpleResult(0, "创建盘点计划成功");

        //    }
        //    catch (Exception ex) {

        //        return BuildSimpleResult(1, ex.Message);
        //    }
        //}

        //public static SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
        //    var db = new SqlHelper<object>().GetInstance();
        //    var info = "";
        //    try {
        //        var countPlan = db.Queryable<TN_Count_Plan>()
        //            .Where(a => a.S_CP_NO == model.planId).First();

        //        if (countPlan == null) {
        //            return BuildSimpleResult(2, $"盘点计划单号 '{model.planId}' 不存在");
        //        }

        //        var countOrder = new TN_Count_Order() {
        //            S_CP_NO = model.planId,
        //            S_COUNT_NO = GenerateNo("盘点单", "PDD"), // CN =》PDD
        //        };

        //        var countDetailList = new List<TN_Count_CG_Detail>();
        //        if (countPlan.S_TYPE == "货位") {
        //            var cgDetail = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail>
        //                ((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE)
        //                .Where(l => l.S_CODE == countPlan.S_LOC_CODE)
        //                .Select((l, c, d) => d).First();

        //            if (cgDetail == null) {
        //                return BuildSimpleResult(3, $"未找到指定货位{countPlan.S_LOC_CODE}上的物料");
        //            }

        //            var countDetail = new TN_Count_CG_Detail {
        //                S_COUNT_NO = countOrder.S_COUNT_NO,
        //                S_CNTR_CODE = cgDetail.S_CNTR_CODE,
        //                S_ITEM_CODE = cgDetail.S_ITEM_CODE,
        //            };

        //            countDetailList.Add(countDetail);
        //        }
        //        else if (countPlan.S_TYPE == "物料") {
        //            var cgDetail = db.Queryable<TN_CG_Detail>()
        //                .Where(d => d.S_ITEM_CODE == countPlan.S_ITEM_CODE).First(); // ToList -> First

        //            if (cgDetail == null) {
        //                return BuildSimpleResult(3, $"未找到指定的物料{countPlan.S_ITEM_CODE}");
        //            }

        //            //foreach (var cgDetail in cgDetailList) {
        //            //    var countDetail = new TN_Count_CG_Detail {
        //            //        S_COUNT_NO = countOrder.S_COUNT_NO,
        //            //        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
        //            //        S_ITEM_CODE = cgDetail.S_ITEM_CODE,
        //            //    };

        //            //    countDetailList.Add(countDetail);
        //            //}

        //            var countDetail = new TN_Count_CG_Detail {
        //                S_COUNT_NO = countOrder.S_COUNT_NO,
        //                S_CNTR_CODE = cgDetail.S_CNTR_CODE,
        //                S_ITEM_CODE = cgDetail.S_ITEM_CODE,
        //            };

        //            countDetailList.Add(countDetail);
        //        }
        //        else {
        //            return BuildSimpleResult(3, $"计划单'{model.planId}'的类型{countPlan.S_TYPE}不合法");
        //        }

        //        using (var tran = db.Ado.UseTran()) {
        //            if (db.Insertable<TN_Count_Order>(countOrder).ExecuteCommand() <= 0) {
        //                tran.RollbackTran();
        //                info = "创建盘点单失败";
        //                return BuildSimpleResult(2, info);
        //            }

        //            if (db.Insertable<TN_Count_CG_Detail>(countDetailList).ExecuteCommand() <= 0) {
        //                tran.RollbackTran();
        //                info = "创建盘点单明细失败";
        //                return BuildSimpleResult(3, info);
        //            }

        //            tran.CommitTran();
        //        }

        //        return BuildSimpleResult(0, "创建盘点单成功");
        //    }
        //    catch (Exception ex) {

        //        return BuildSimpleResult(1, $"发生了异常：{ex.Message}");
        //    }
        //}

        public static SimpleResult CountProduct(CountProductInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            try {
                //var cgDetail = db.Queryable<TN_CG_Detail>()
                //    .Where(d => d.S_CNTR_CODE == model.cntrCode).First();

                //if (cgDetail == null) {
                //    return BuildSimpleResult(2, $"找不到容器号'{model.cntrCode}'对应的物料");
                //}

                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    //.LeftJoin<TN_CG_Detail>((c, d) => c.S_CNTR_CODE == d.S_CNTR_CODE)
                    .Where(c => c.S_LOC_CODE == model.locCode).First();
                if (locCntrRel == null) {
                    return BuildSimpleResult(2, $"当前货位{model.locCode}没有容器！");
                }

                var cgDetail = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                if (cgDetail == null) {
                    return BuildSimpleResult(3, $"当前货位{model.locCode}上的容器{locCntrRel.S_CNTR_CODE}没有物品！");
                }

                //var countDiff = new TN_Count_Diff {
                //    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                //    F_QTY = cgDetail.F_QTY,
                //    F_ACTUAL_QTY = model.qty
                //};

                var countDiff = db.Queryable<TN_AG_Count_Diff>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                if (countDiff == null) {
                    return BuildSimpleResult(4, $"当前物料所在容器{locCntrRel.S_CNTR_CODE}物料信息没有生成对应的盘点差异表！");
                }

                countDiff.F_QTY = cgDetail.F_QTY;
                countDiff.F_ACTUAL_QTY = model.qty;
                //countDiff.S_ITEM_CODE = cgDetail.S_ITEM_CODE;

                //if (db.Insertable<TN_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
                //    return BuildSimpleResult(3, $"插入盘点差异表失败");
                //}

                if (db.Updateable<TN_AG_Count_Diff>(countDiff).ExecuteCommand() <= 0) {
                    return BuildSimpleResult(5, $"插入盘点差异表失败");
                }

                return BuildSimpleResult(0, "盘点差异完成");

            }
            catch (Exception ex) {
                return BuildSimpleResult(1, $"发生了异常：{ex.Message}");
            }
        }


    }
}

 api/ApiModel.cs

@@ -228,7 +228,8 @@
        }

        public class CountProductInfo {
            public string cntrCode { get; set; }
            //public string cntrCode { get; set; }
            public string locCode { get; set; }
            public float qty { get; set; }
        }


 api/MoboxController.cs

@@ -84,5 +84,71 @@
            LogHelper.Info("触发API：取消任务" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.CancelTask(model);
        }

        // 盘点功能（新）



        // 备用：盘点相关功能（恢复）------------------------------------

        ///// <summary>
        ///// 创建盘点计划单(WMS)
        ///// </summary>
        ///// <param name="model"></param>
        ///// <returns></returns>
        //[HttpPost]
        //[Route("CreateCountPlan")]
        //public SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
        //    LogHelper.Info("触发API：创建盘点计划单(WMS)" + JsonConvert.SerializeObject(model), "API");
        //    return ApiHelper.CreateCountPlan(model);
        //}

        ///// <summary>
        ///// 创建盘点单(PDA)
        ///// </summary>
        ///// <param name="model"></param>
        ///// <returns></returns>
        //[HttpPost]
        //[Route("CreateCountOrder")]
        //public SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
        //    LogHelper.Info("触发API：创建盘点单(PDA)" + JsonConvert.SerializeObject(model), "API");
        //    return ApiHelper.CreateCountOrder(model);
        //}

        /// <summary>
        /// 盘点理货(PDA)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("CountProduct")]
        public SimpleResult CountProduct(CountProductInfo model) {
            LogHelper.Info("触发API：盘点理货(PDA)" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.CountProduct(model);
        }

        /// <summary>
        /// 盘点理货出库(WMS)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("CheckOutbound")]
        public SimpleResult CheckOutbound(CheckOutboundInfo model) {
            LogHelper.Info("触发API：盘点理货出库(WMS)" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.CheckOutbound(model);
        }

        /// <summary>
        /// 盘点理货回库(WMS)
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("CheckInbound")]
        public SimpleResult CheckInbound(CheckInboundInfo model) {
            LogHelper.Info("触发API：盘点理货回库(WMS)" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.CheckInbound(model);
        }
    }
}

 core/Monitor.cs

@@ -146,6 +146,138 @@
                LogHelper.Info($"发生了异常：{ex.Message}");
            }
        }

        // 盘点功能（新）-----------------------------------------



        // 备用：盘点相关功能（恢复）------------------------------------

        //public static void CheckCountOrder() {
        //    var taskName = TaskName.盘点理货出库;
        //    var db = new SqlHelper<object>().GetInstance();
        //    var info = "";

        //    try {
        //        var orderList = db.Queryable<TN_Count_Order>()
        //            .Where(c => c.N_B_STATE == 1)
        //            .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc)
        //            .ToList();

        //        if (orderList.Count == 0) {
        //            LogHelper.Info($"轮询--{taskName}--暂无待执行的{taskName}单");
        //            return;
        //        }

        //        var detailList = new List<TN_Count_CG_Detail>();
        //        foreach (var order in orderList) {
        //            var doingCount = db.Queryable<TN_Count_CG_Detail>()
        //                .Count(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE >= 2); // 执行中
        //            var allCount = db.Queryable<TN_Count_CG_Detail>()
        //                .Count(d => d.S_COUNT_NO == order.S_COUNT_NO);
        //            LogHelper.Info($"轮询--{taskName}--统计{taskName}单'{order.S_COUNT_NO}'任务已下发：{doingCount}/{allCount}");

        //            if (doingCount == allCount) {
        //                order.N_B_STATE = 2; // 所有任务都已执行
        //                db.Updateable<TN_Count_Order>(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
        //                continue;
        //            }

        //            var countCgDetailList = db.Queryable<TN_Count_CG_Detail>()
        //                .Where(a => a.S_COUNT_NO == order.S_COUNT_NO && a.N_B_STATE == 1) // 已下发
        //                .ToList();

        //            if (countCgDetailList.Count == 0) {
        //                LogHelper.Info($"轮询--{taskName}--{taskName}单明细状态异常");
        //                continue;
        //            }

        //            detailList.AddRange(countCgDetailList);
        //        }

        //        if (detailList.Count == 0) {
        //            return;
        //        }

        //        foreach (var detail in detailList) {
        //            var startLoc = db.Queryable<TN_Location>()
        //                .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
        //                .Where((l, c) => c.S_CNTR_CODE == detail.S_CNTR_CODE)
        //                .First();

        //            if (startLoc == null) {
        //                LogHelper.Info($"轮询--{taskName}：没有找到合适的起点货位！");
        //                continue;
        //            }

        //            var endLoc = db.Queryable<TN_Location>()
        //                .Where(a => Settings.Areas[0].Contains(a.S_AREA_CODE))
        //                .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y")
        //                .Where(a => a.N_CURRENT_NUM == 0).First();

        //            if (endLoc == null) {
        //                LogHelper.Info($"轮询--{taskName}：没有找到合适的终点货位！单号为 '{detail.S_COUNT_NO}'");
        //                continue;
        //            }

        //            detail.N_B_STATE = 2;

        //            var cntId = detail.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_Count_CG_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
        //                    tran.RollbackTran();
        //                    LogHelper.Info($"轮询--{taskName}--修改明细表状态为完成失败！");
        //                }

        //                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();
        //                    info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货位{endLoc.S_CODE}";
        //                    LogHelper.Info(info);
        //                    continue;
        //                }

        //                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();
        //                    info = $"生成'{taskName}'失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
        //                    LogHelper.Info(info);
        //                    continue;
        //                }

        //                if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
        //                    tran.RollbackTran();
        //                    info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
        //                    LogHelper.Info(info);
        //                    continue;
        //                }

        //                tran.CommitTran();
        //                info = $"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
        //                LogHelper.Info(info);
        //                //continue;
        //            }
        //        }
        //    }
        //    catch (Exception ex) {
        //        info = $"发生了异常：{ex.Message}";
        //        LogHelper.Info(info);
        //    }
        //}
    }

}

 models/TN_AG_Count_Diff.cs

New file
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace HH.WCS.Mobox3.AnGang.models {
    public class TN_AG_Count_Diff {
        public string S_COUNT_NO { get; set; }
        public string S_CNTR_CODE { get; set; }
        public float F_QTY { get; set; } = 0f;
        public float F_ACTUAL_QTY { get; set; } = 0f;
        public string S_ITEM_CODE { get; set; }
    }
}

 models/TN_AG_Count_Order.cs

New file
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using SqlSugar;

namespace HH.WCS.Mobox3.AnGang.models {
    [SugarTable("TN_AG_Count_Order")]
    public class TN_AG_Count_Order {
        public string S_COUNT_NO { get; set; }
        public string S_CP_NO { get; set; }

        //public string S_LOC_CODE { get; set; }
        public string S_CNTR_CODE { get; set; }

        public string S_ITEM_CODE { get; set; }

        /// <summary>
        /// 0 待盘点；1 盘点执行中；2 盘点完成待回库；3 回库完成（只有回库完成时可以执行下一个任务）
        /// </summary>
        public int N_B_STATE { get; set; }
    }
}

 models/TN_AG_Count_Plan.cs

New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using SqlSugar;

namespace HH.WCS.Mobox3.AnGang.models {
    [SugarTable("TN_AG_Count_Plan")]
    public class TN_AG_Count_Plan {
        public string S_CP_NO { get; set; }

        public int N_B_STATE { get; set; }
    }
}

 models/TN_Count_CG_Detail.cs

New file
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using SqlSugar;

namespace HH.WCS.Mobox3.AnGang.models {
    /// <summary>
    /// 【旧】盘点单明细表
    /// </summary>
    [SugarTable("TN_Count_CG_Detail")]
    public class TN_Count_CG_Detail : BaseModel {
        public string S_COUNT_NO { get; set; }
        public string S_ITEM_CODE { get; set; }
        public string S_CNTR_CODE { get; set; }

        public int N_B_STATE { get; set; }

    }
}

 models/TN_Count_Diff.cs

New file
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using SqlSugar;

namespace HH.WCS.Mobox3.AnGang.models {
    /// <summary>
    /// 【旧】盘点差异表
    /// </summary>
    [SugarTable("TN_Count_Diff")]
    public class TN_Count_Diff : BaseModel {
        public string S_COUNT_NO { get; set; }
        public string S_CNTR_CODE { get; set; }
        public float F_QTY { get; set; }
        public float F_ACTUAL_QTY { get; set; }
        public string S_ITEM_CODE { get; set; }
    }
}

 models/TN_Count_Order.cs

New file
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using SqlSugar;

namespace HH.WCS.Mobox3.AnGang.models {
    /// <summary>
    /// 【旧】盘点单表
    /// </summary>
    [SugarTable("TN_Count_Order")]
    public class TN_Count_Order : BaseModel {
        public string S_CP_NO { get; set; }

        /// <summary>
        /// 盘点单号
        /// </summary>
        public string S_COUNT_NO { get; set; }

        /// <summary>
        /// 业务状态：0等待执行 1已执行待生成任务 2任务执行中 3任务完成
        /// </summary>
        public int N_B_STATE { get; set; }
    }
}

 models/TN_Count_Plan.cs

New file
@@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using SqlSugar;

namespace HH.WCS.Mobox3.AnGang.models {
    /// <summary>
    /// 【旧】盘点计划表
    /// </summary>
    [SugarTable("TN_Count_Plan")]
    public class TN_Count_Plan : BaseModel {
        /// <summary>
        /// 盘点计划号
        /// </summary>
        public string S_CP_NO { get; set; }

        /// <summary>
        /// 盘点类型：货物盘点/货位盘点
        /// </summary>
        public string S_TYPE { get; set; }

        /// <summary>
        /// 盘点状态：0 – 未执行 1 – 启动中 2 – 执行中 3 – 完成 4 – 出错
        /// </summary>
        public int N_B_STATE { get; set; } = 0;

        ///// <summary>
        ///// 计划盘点物料数量
        ///// </summary>
        //public int N_PLAN_TOTAL { get; set; }

        // ------

        public string S_LOC_CODE { get; set; } = "";

        public string S_ITEM_CODE { get; set; } = "";
    }
}

 util/Settings.cs

@@ -110,6 +110,10 @@
        public const string 产品入库 = "产品入库";
        public const string 产品部分出库 = "产品部分出库";
        public const string 产品部分回库 = "产品部分回库";

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

    public class AreaIndex {