后端实现添加物料绑定货位, 优化货位容器绑定时容器表插入, 多个物料信息记录的功能

kazelee

4 天以前 abf782e4e9d505184652635aa0912781f572f843

后端实现添加物料绑定货位, 优化货位容器绑定时容器表插入, 多个物料信息记录的功能

 api/ApiHelper.cs

@@ -57,6 +57,11 @@
                    F_QTY = model.ItemCount, // 0f by default
                };

                var cntr = new TN_Container() {
                    S_CODE = cntId,
                    N_DETAIL_COUNT = 1
                };

                startLoc.N_CURRENT_NUM = 1;

                var endLocCode = "0"; // 假的默认终点地址
@@ -78,6 +83,11 @@

                // 无论是否选择终点货架，都等到称重之后再计算终点货位
                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入容器表关系失败: 容器{cntr.S_CODE}, 明细条数={cntr.N_DETAIL_COUNT}");
                    }

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
@@ -125,9 +135,132 @@
            return $"{prefix}{date}-{id.ToString().PadLeft(5, '0')}"; // 形如：CN250525-00011
        }

        public static SimpleResult AddCgDetail(AddCgDetailInfo model) {
        /// <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,
                    S_ITEM_SHORT_DESC = string.IsNullOrEmpty(model.ItemShortDesc) ? "" : model.ItemShortDesc,
                    S_ITEM_NAME = string.IsNullOrEmpty(model.ItemName) ? "" : model.ItemName,
                    F_QTY = model.ItemCount, // 0f by default
                };

                var cntr = new TN_Container() {
                    S_CODE = cntId,
                    N_DETAIL_COUNT = 1
                };

                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.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入容器表关系失败: 容器{cntr.S_CODE}, 明细条数={cntr.N_DETAIL_COUNT}");
                    }

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入货位容器关系表失败：货位{locCntrRel.S_LOC_CODE}，容器{locCntrRel.S_CNTR_CODE}");
                    }

                    if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入容器货品明细表失败：容器{cgDetail.S_CNTR_CODE}，物料{cgDetail.S_ITEM_CODE}");
                    }

                    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 async Task<SimpleResult> AddCgDetail(AddCgDetailInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            try {
                await Task.Delay(500); // 等待 Mobox 添加主表完成

                var startLoc = db.Queryable<TN_Location>()
                    .Where(a => a.S_CODE == model.LocCode)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y")
@@ -142,23 +275,42 @@

                startLoc.N_CURRENT_NUM = 1;

                var cntId = GenerateNo("容器号", "CN");

                var locCntrRel = new TN_Loc_Container() {
                    S_LOC_CODE = model.LocCode,
                    S_CNTR_CODE = model.CntrCode,
                    S_CNTR_CODE = cntId,
                    N_LOCK_STATE = string.IsNullOrEmpty(model.ItemCode) ? 0 : 1,
                };

                var cgDetail = new TN_CG_Detail() {
                    S_ITEM_CODE = model.ItemCode,
                    S_CNTR_CODE = model.CntrCode,
                    S_LOC_CODE = model.LocCode, // ADD：补充针对PDA分拣
                    N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
                    S_ITEM_SHORT_DESC = string.IsNullOrEmpty(model.ItemShortDesc) ? "" : model.ItemShortDesc,
                    S_ITEM_NAME = string.IsNullOrEmpty(model.ItemName) ? "" : model.ItemName,
                    F_QTY = model.ItemCount, // 0f by default
                //var cgDetail = new TN_CG_Detail() {
                //    S_ITEM_CODE = model.ItemCode,
                //    S_CNTR_CODE = model.CntrCode,
                //    S_LOC_CODE = model.LocCode, // ADD：补充针对PDA分拣
                //    N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
                //    S_ITEM_SHORT_DESC = string.IsNullOrEmpty(model.ItemShortDesc) ? "" : model.ItemShortDesc,
                //    S_ITEM_NAME = string.IsNullOrEmpty(model.ItemName) ? "" : model.ItemName,
                //    F_QTY = model.ItemCount, // 0f by default
                //};

                var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_LOC_CODE == model.LocCode && d.S_CNTR_CODE == "自动生成").First();
                if (cgDetail == null) {
                    return BuildSimpleResult(3, $"Mobox 容器货品明细表未创建成功!");
                }
                cgDetail.S_CNTR_CODE = cntId;

                var cntr = new TN_Container() {
                    S_CODE = cntId,
                    N_DETAIL_COUNT = 1
                };

                using (var tran = db.Ado.UseTran()) {

                    if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入容器表关系失败: 容器{cntr.S_CODE}, 明细条数={cntr.N_DETAIL_COUNT}");
                    }

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
@@ -166,10 +318,10 @@
                            $"插入货位容器关系表失败：货位{locCntrRel.S_LOC_CODE}，容器{locCntrRel.S_CNTR_CODE}");
                    }

                    if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(d => new { d.S_CNTR_CODE }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入容器货品明细表失败：容器{cgDetail.S_CNTR_CODE}，物料{cgDetail.S_ITEM_CODE}");
                            $"更新容器货品明细表失败：容器{cgDetail.S_CNTR_CODE}，物料{cgDetail.S_ITEM_CODE}");
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -468,115 +620,7 @@
            }
        }

        /// <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,
                    S_ITEM_SHORT_DESC = string.IsNullOrEmpty(model.ItemShortDesc) ? "" : model.ItemShortDesc,
                    S_ITEM_NAME = string.IsNullOrEmpty(model.ItemName) ? "" : model.ItemName,
                    F_QTY = model.ItemCount, // 0f by default
                };

                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.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入货位容器关系表失败：货位{locCntrRel.S_LOC_CODE}，容器{locCntrRel.S_CNTR_CODE}");
                    }

                    if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"插入容器货品明细表失败：容器{cgDetail.S_CNTR_CODE}，物料{cgDetail.S_ITEM_CODE}");
                    }

                    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>
        /// 货位容器解绑
@@ -812,15 +856,14 @@
                }

                var insetRecordList = new List<TN_Inbound_DataRecord>();
                var deleteRecordOldList = new List<TN_Inbound_DataRecord> ();
                //var deleteRecordOldList = new List<TN_Inbound_DataRecord> ();

                foreach (var transaction in model.stockTransactions) {
                    var recordOld = db.Queryable<TN_Inbound_DataRecord>()
                        .Where(r => r.S_LOCATION_CODE == transaction.locationCode.Trim()).First();
                    if (recordOld != null) {
                        deleteRecordOldList.Add(recordOld);

                    }
                    //var recordOld = db.Queryable<TN_Inbound_DataRecord>()
                    //    .Where(r => r.S_LOCATION_CODE == transaction.locationCode.Trim()).First();
                    //if (recordOld != null) {
                    //    deleteRecordOldList.Add(recordOld);
                    //}

                    if (!float.TryParse(transaction.inQuantity, out var _) || !float.TryParse(transaction.stockQuantity, out var _)) {
                        return BuildErpResult(400, $"入库数量或库存数量不合法! 请确保字符串的值可以解析为数值! 库存交易明细号='{transaction.stockTransactionId}', 入库数量='{transaction.inQuantity}', 库存数量='{transaction.stockQuantity}'");
@@ -848,10 +891,10 @@
                }
                
                using (var tran = db.Ado.UseTran()) {
                    if (deleteRecordOldList.Count != 0 && db.Deleteable<TN_Inbound_DataRecord>(deleteRecordOldList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildErpResult(500, $"删除旧入库记录数据失败：{JsonConvert.SerializeObject(deleteRecordOldList)}");
                    }
                    //if (deleteRecordOldList.Count != 0 && db.Deleteable<TN_Inbound_DataRecord>(deleteRecordOldList).ExecuteCommand() <= 0) {
                    //    tran.RollbackTran();
                    //    return BuildErpResult(500, $"删除旧入库记录数据失败：{JsonConvert.SerializeObject(deleteRecordOldList)}");
                    //}

                    if (db.Insertable<TN_Inbound_DataRecord>(insetRecordList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
@@ -877,13 +920,13 @@
                }

                var insetRecordList = new List<TN_Outbound_DataRecord>();
                var deleteRecordOldList = new List<TN_Outbound_DataRecord>();
                //var deleteRecordOldList = new List<TN_Outbound_DataRecord>();
                foreach (var issue in model.materialIssues) {
                    var recordOld = db.Queryable<TN_Outbound_DataRecord>()
                        .Where(r => r.S_LOCATION_CODE == issue.locationCode.Trim()).First();
                    if (recordOld != null) {
                        deleteRecordOldList.Add(recordOld);
                    }
                    //var recordOld = db.Queryable<TN_Outbound_DataRecord>()
                    //    .Where(r => r.S_LOCATION_CODE == issue.locationCode.Trim()).First();
                    //if (recordOld != null) {
                    //    deleteRecordOldList.Add(recordOld);
                    //}

                    if (!float.TryParse(issue.actualIssuedQty, out var _)) {
                        return BuildErpResult(400, $"实发数量不合法! 请确保字符串的值可以解析为数值! 领用单号='{issue.withdrawalOrderNo}', 实发数量='{issue.actualIssuedQty}'");
@@ -909,10 +952,10 @@
                }

                using (var tran = db.Ado.UseTran()) {
                    if (deleteRecordOldList.Count != 0 && db.Deleteable<TN_Outbound_DataRecord>(deleteRecordOldList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildErpResult(500, $"删除旧出库记录数据失败：{JsonConvert.SerializeObject(deleteRecordOldList)}");
                    }
                    //if (deleteRecordOldList.Count != 0 && db.Deleteable<TN_Outbound_DataRecord>(deleteRecordOldList).ExecuteCommand() <= 0) {
                    //    tran.RollbackTran();
                    //    return BuildErpResult(500, $"删除旧出库记录数据失败：{JsonConvert.SerializeObject(deleteRecordOldList)}");
                    //}

                    if (db.Insertable<TN_Outbound_DataRecord>(insetRecordList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();

 api/ApiModel.cs

@@ -182,7 +182,7 @@

        public class AddCgDetailInfo {
            public string LocCode { get; set; }
            public string CntrCode { get; set; }
            //public string CntrCode { get; set; }
            public string ItemCode { get; set; }
            public string ItemName { get; set; }
            public string ItemShortDesc { get; set; }

 api/MoboxController.cs

@@ -31,7 +31,7 @@
        [Route("AddCgDetail")]
        public SimpleResult AddCgDetail(AddCgDetailInfo model) {
            LogHelper.Info("触发API：AddCgDetail: 添加容器货品明细" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.AddCgDetail(model);
            return ApiHelper.AddCgDetail(model).Result;
        }

        /// <summary>

 core/Monitor.cs

@@ -28,35 +28,54 @@

                var needDeleteDataList = new List<TN_Inbound_DataRecord>();
                var needUpdateLocCntrRelList = new List<TN_Loc_Container>();
                var needUpdateCgDetailList = new List<TN_CG_Detail>();
                //var needUpdateCgDetailList = new List<TN_CG_Detail>();

                var needDeleteCgDetailList = new List<TN_CG_Detail>();
                var needInsertCgDetailList = new List<TN_CG_Detail>();
                var needUpdateCntrList = new List<TN_Container>();

                foreach (var inboundData in inboundDataList) {
                    var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == inboundData.S_LOCATION_CODE).First();
                    // 暂时不考虑如果当前关系表，锁状态为1（已经ERP覆盖过）的情况，默认有就覆盖
                    if (locCntrRel != null) {
                        var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                        if (cgDetail == null) {
                        var cgDetailList = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).ToList();
                        if (cgDetailList.Count == 0) {
                            LogHelper.Info($"轮询：入库信息同步：货位容器表中，包含货位={locCntrRel.S_LOC_CODE}, 容器={locCntrRel.S_CNTR_CODE}；但容器对应的物料表，没有找到物料！");
                            continue;
                        }

                        cgDetailList.ForEach(d => {
                            if (!needDeleteCgDetailList.Contains(d)) { 
                                needDeleteCgDetailList.Add(d);
                            }
                        });

                        // 问DS , 用linq优化
                        var cntr = needUpdateCntrList.Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).FirstOrDefault();
                        if (cntr != null) { 
                            
                        }

                        // ERP 数据 -> CG_Detail
                        var cgDetail = cgDetailList.FirstOrDefault();

                        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.F_QTY = float.Parse(inboundData.S_IN_QUANTITY);

                        cgDetail.T_MODIFY = DateTime.Now;
                        //cgDetail.S_INVENTORY_MAN = inboundData.S_INVENTORY_MAN; // 库存责任人姓名

                        locCntrRel.N_LOCK_STATE = 1;
                        cgDetail.N_LOCK_STATE = 1;

                        locCntrRel.T_MODIFY = DateTime.Now;
                        needUpdateLocCntrRelList.Add(locCntrRel);
                        needUpdateCgDetailList.Add(cgDetail);
                        //needUpdateCgDetailList.Add(cgDetailList);
                        needDeleteDataList.Add(inboundData);
                    }
                }
@@ -72,11 +91,11 @@
                        return;
                    }

                    if (needUpdateCgDetailList.Count > 0 && db.Updateable<TN_CG_Detail>(needUpdateCgDetailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        LogHelper.Info($"轮询：入库信息同步：根据ERP信息，更新物料信息表失败！" + JsonConvert.SerializeObject(needUpdateCgDetailList));
                        return;
                    }
                    //if (needUpdateCgDetailList.Count > 0 && db.Updateable<TN_CG_Detail>(needUpdateCgDetailList).ExecuteCommand() <= 0) {
                    //    tran.RollbackTran();
                    //    LogHelper.Info($"轮询：入库信息同步：根据ERP信息，更新物料信息表失败！" + JsonConvert.SerializeObject(needUpdateCgDetailList));
                    //    return;
                    //}

                    if (needUpdateLocCntrRelList.Count > 0 && db.Updateable<TN_Loc_Container>(needUpdateLocCntrRelList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();