添加CgDetail信息同步字段和锁状态字段，修改相关逻辑

kazelee

4 天以前 656f90b301ba307c909de4ee94b88af817adf0d8

 core/Monitor.cs

@@ -38,9 +38,21 @@
                            LogHelper.Info($"轮询：入库信息同步：货位容器表中，包含货位={locCntrRel.S_LOC_CODE}, 容器={locCntrRel.S_CNTR_CODE}；但容器对应的物料表，没有找到物料！");
                            continue;
                        }
                        // ERP 数据 -> CG_Detail
                        cgDetail.S_ITEM_CODE = inboundData.S_ITEM_CODE;

                        cgDetail.S_ITEM_SHORT_DESC = inboundData.S_ITEM_SHORT_DESC; // 物料短描述
                        //cgDetail.S_INVENTORY_MAN = inboundData.S_INVENTORY_MAN; // 库存责任人姓名
                        cgDetail.S_IN_QUANTITY = inboundData.S_IN_QUANTITY; // 入库数量
                        cgDetail.S_STOCK_QUANTITY = inboundData.S_STOCK_QUANTITY; // 库存数量
                        cgDetail.S_TOTAL_PRICE = inboundData.S_TOTAL_PRICE; // 库存总价
                        cgDetail.S_STORE_KEEPER = inboundData.S_STORE_KEEPER;
                        cgDetail.S_LINE_CODE = inboundData.S_LINE_CODE;

                        cgDetail.T_MODIFY = DateTime.Now;

                        locCntrRel.N_LOCK_STATE = 1;
                        cgDetail.N_LOCK_STATE = 1;
                        locCntrRel.T_MODIFY = DateTime.Now;
                        needUpdateLocCntrRelList.Add(locCntrRel);
                        needUpdateCgDetailList.Add(cgDetail);
@@ -105,8 +117,11 @@
                            continue;
                        }
                        cgDetail.S_ITEM_CODE = outboundData.S_ITEM_CODE;
                        cgDetail.S_STORE_KEEPER = outboundData.S_STORE_KEEPER;

                        cgDetail.T_MODIFY = DateTime.Now;
                        locCntrRel.N_LOCK_STATE = 1;
                        cgDetail.N_LOCK_STATE = 1;
                        locCntrRel.T_MODIFY = DateTime.Now;
                        needUpdateLocCntrRelList.Add(locCntrRel);
                        needUpdateCgDetailList.Add(cgDetail);
@@ -147,137 +162,7 @@
            }
        }

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



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

        //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);
        //    }
        //}
    }

}