完善单容器多物料场景的优化重构, 优化ERP回报信息的处理

kazelee

4 天以前 fbb7c2253c86d58583d7e3b0a8a44d0342c43c73

 core/Monitor.cs

@@ -28,28 +28,73 @@

                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) {
                            LogHelper.Info($"轮询：入库信息同步：货位容器表中，包含货位={locCntrRel.S_LOC_CODE}, 容器={locCntrRel.S_CNTR_CODE}；但容器对应的物料表，没有找到物料！");
                            continue;
                        }
                        cgDetail.S_ITEM_CODE = inboundData.S_ITEM_CODE;
                        cgDetail.T_MODIFY = DateTime.Now;
                        locCntrRel.N_LOCK_STATE = 1;
                        locCntrRel.T_MODIFY = DateTime.Now;
                        needUpdateLocCntrRelList.Add(locCntrRel);
                        needUpdateCgDetailList.Add(cgDetail);
                        needDeleteDataList.Add(inboundData);
                    if (locCntrRel == null) {
                        LogHelper.Info($"轮询：入库信息同步：货位容器绑定表中暂无货位={inboundData.S_LOCATION_CODE}");
                        continue;
                    }

                    // 存在货位容器表但没找到物料表 ( 通常情况下不会发生 )
                    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 (var cgDetal in cgDetailList) {
                        if (!needDeleteCgDetailList.Contains(cgDetal)) {
                            needDeleteCgDetailList.Add(cgDetal);
                        }
                    }

                    // 更新容器表的货品明细数量 , 第一次设置为 1 , 之后每次 + 1
                    var cntr = needUpdateCntrList.Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).FirstOrDefault();
                    if (cntr != null) {
                        cntr.N_DETAIL_COUNT += 1;
                        cntr.T_MODIFY = DateTime.Now;
                    }
                    else {
                        needUpdateCntrList.Add(new TN_Container { S_CODE = locCntrRel.S_CNTR_CODE, N_DETAIL_COUNT = 1 });
                    }

                    // ERP 数据 -> CG_Detail
                    // 货品列表中随便找一个 cgDetail 赋值 , 只需要确保 F_WEIGHT 和 S_EXT_ATTR5 ( IMG_URL ) 不变即可
                    var cgDetail = cgDetailList.FirstOrDefault();

                    cgDetail.S_ITEM_CODE = inboundData.S_ITEM_CODE;
                    cgDetail.S_ITEM_SHORT_DESC = inboundData.S_ITEM_SHORT_DESC; // 物料短描述
                    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; // 库存责任人姓名

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

                    needUpdateLocCntrRelList.Add(locCntrRel);
                    //needUpdateCgDetailList.Add(cgDetailList);

                    // 最后 , 将处理完的入库记录加入删除队列
                    needDeleteDataList.Add(inboundData);
                }

                if (needDeleteDataList.Count == 0) {
                    LogHelper.Info($"轮询：入库信息同步：待更新的ERP物料信息，暂无物料可以覆盖，目前待更新数量：{inboundDataList.Count}");
                    return;
                }

                using (var tran = db.Ado.UseTran()) {
@@ -59,15 +104,33 @@
                        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();
                        LogHelper.Info($"轮询：入库信息同步：根据ERP信息，更新货位容器关系表失败！" + JsonConvert.SerializeObject(needUpdateLocCntrRelList));
                        return;
                    }

                    if (needDeleteCgDetailList.Count > 0 && db.Deleteable(needDeleteCgDetailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        LogHelper.Info($"轮询: 入库信息同步: 根据ERP信息, 删除旧物料明细表失败! " + JsonConvert.SerializeObject(needDeleteCgDetailList));
                        return;
                    }

                    if (needInsertCgDetailList.Count > 0 && db.Insertable(needInsertCgDetailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        LogHelper.Info($"轮询: 入库信息同步: 根据ERP信息, 插入新物料明细表失败! " + JsonConvert.SerializeObject(needInsertCgDetailList));
                        return;
                    }

                    if (needUpdateCntrList.Count > 0 && db.Updateable(needUpdateCntrList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        LogHelper.Info($"轮询: 入库信息同步: 根据ERP信息, 更新容器表失败! " + JsonConvert.SerializeObject(needUpdateCntrList));
                        return;
                    }

@@ -91,25 +154,78 @@
                    LogHelper.Info($"轮询：出库信息同步：当前没有待同步的ERP物料信息");
                    return;
                }

                
                var needDeleteDataList = new List<TN_Outbound_DataRecord>();
                var needUpdateLocCntrRelList = new List<TN_Loc_Container>();

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

                foreach (var outboundData in outboundDataList) {
                    var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_LOC_CODE == outboundData.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();
                        // 出库不像入库那样直接覆盖 , 而是查找具体的物料编码 , 对每个进行修改
                        var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == locCntrRel.S_CNTR_CODE && d.S_ITEM_CODE == outboundData.S_ITEM_CODE).First();
                        if (cgDetail == null) {
                            LogHelper.Info($"轮询：出库信息同步：货位容器表中，包含货位={locCntrRel.S_LOC_CODE}, 容器={locCntrRel.S_CNTR_CODE}；但容器对应的物料表，没有找到物料！");
                            LogHelper.Info($"轮询：出库信息同步：货位容器表中，包含货位={locCntrRel.S_LOC_CODE}, 容器={locCntrRel.S_CNTR_CODE}；但容器对应的物料表，没有找到物料{outboundData.S_ITEM_CODE}！");
                            continue;
                        }
                        cgDetail.S_ITEM_CODE = outboundData.S_ITEM_CODE;
                        cgDetail.T_MODIFY = DateTime.Now;
                        locCntrRel.N_LOCK_STATE = 1;
                        locCntrRel.T_MODIFY = DateTime.Now;

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

                        var currentQty = cgDetail.F_QTY - actualQty;
                        if (currentQty <= 0) {
                            needDeleteCgDetailList.Add(cgDetail);

                            // 更新容器表的货品明细数量 , 第一次查找并 - 1 , 之后每次 - 1
                            var cntr = needUpdateCntrList.Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).FirstOrDefault();
                            if (cntr != null) {
                                if (cntr.N_DETAIL_COUNT == 0) {
                                    LogHelper.Info($"容器明细数量为0, 无法再减少!", "Error");
                                }
                                else {
                                    cntr.N_DETAIL_COUNT -= 1;
                                    cntr.T_MODIFY = DateTime.Now;
                                }
                            }
                            else {
                                var actualCntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
                                if (actualCntr == null) {
                                    LogHelper.Info($"容器表中没有容器{actualCntr.S_CODE}!", "Error");
                                }
                                else {
                                    if (actualCntr.N_DETAIL_COUNT == 0) {
                                        LogHelper.Info($"容器明细数量为0, 无法再减少!", "Error");
                                    }
                                    else {
                                        actualCntr.N_DETAIL_COUNT -= 1;
                                        actualCntr.T_MODIFY = DateTime.Now;
                                        needUpdateCntrList.Add(actualCntr);
                                    }
                                }
                            }

                        }
                        else {
                            cgDetail.S_ITEM_CODE = outboundData.S_ITEM_CODE;
                            cgDetail.S_STORE_KEEPER = outboundData.S_STORE_KEEPER;
                            cgDetail.F_QTY = currentQty;
                            cgDetail.T_MODIFY = DateTime.Now;
                            locCntrRel.N_LOCK_STATE = 1;
                            cgDetail.N_LOCK_STATE = 1;
                            cgDetail.S_STOCK_QUANTITY = currentQty.ToString();
                            locCntrRel.T_MODIFY = DateTime.Now;

                            needUpdateCgDetailList.Add(cgDetail);
                        }

                        // 就算cgDetail都删完了, 也还是会保留货位容器信息, 不会自动删除 ( 不过理论上只有回库之后才会更新物料的 , 所以物料不可能为空 )
                        needUpdateLocCntrRelList.Add(locCntrRel);
                        needUpdateCgDetailList.Add(cgDetail);
                        needDeleteDataList.Add(outboundData);
                    }
                }
@@ -131,6 +247,18 @@
                        return;
                    }

                    if (needDeleteCgDetailList.Count > 0 && db.Deleteable(needDeleteCgDetailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        LogHelper.Info($"轮询：出库信息同步：根据ERP信息, 删除旧物料明细表失败! " + JsonConvert.SerializeObject(needDeleteCgDetailList));
                        return;
                    }

                    if (needUpdateCntrList.Count > 0 && db.Updateable(needUpdateCntrList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        LogHelper.Info($"轮询：出库信息同步：根据ERP信息, 更新容器表失败! " + JsonConvert.SerializeObject(needUpdateCntrList));
                        return;
                    }

                    if (needUpdateLocCntrRelList.Count > 0 && db.Updateable<TN_Loc_Container>(needUpdateLocCntrRelList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        LogHelper.Info($"轮询：出库信息同步：根据ERP信息，更新货位容器关系表失败！" + JsonConvert.SerializeObject(needUpdateLocCntrRelList));
@@ -147,137 +275,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);
        //    }
        //}
        
    }

}