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

kazelee

5 天以前 abf782e4e9d505184652635aa0912781f572f843

 core/Monitor.cs

@@ -28,34 +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;
                        }
                        // ERP 数据 -> CG_Detail
                        cgDetail.S_ITEM_CODE = inboundData.S_ITEM_CODE;

                        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);
                    }
                }
@@ -71,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();
@@ -116,9 +136,15 @@
                            LogHelper.Info($"轮询：出库信息同步：货位容器表中，包含货位={locCntrRel.S_LOC_CODE}, 容器={locCntrRel.S_CNTR_CODE}；但容器对应的物料表，没有找到物料！");
                            continue;
                        }
                        var actualQty = float.Parse(outboundData.S_ACTUAL_QTY);
                        if (actualQty > cgDetail.F_QTY) {
                            LogHelper.Info($"实发数量超过物料数量! 物料编码={cgDetail.S_ITEM_CODE}, 当前数量={cgDetail.F_QTY}, 实发数量='{outboundData.S_ACTUAL_QTY}'", "Error");
                            actualQty = 0f;
                        }

                        cgDetail.S_ITEM_CODE = outboundData.S_ITEM_CODE;
                        cgDetail.S_STORE_KEEPER = outboundData.S_STORE_KEEPER;

                        cgDetail.F_QTY = actualQty;
                        cgDetail.T_MODIFY = DateTime.Now;
                        locCntrRel.N_LOCK_STATE = 1;
                        cgDetail.N_LOCK_STATE = 1;