kazelee
4 天以前 656f90b301ba307c909de4ee94b88af817adf0d8
添加CgDetail信息同步字段和锁状态字段,修改相关逻辑
5个文件已修改
4个文件已删除
496 ■■■■ 已修改文件
HH.WCS.Mobox3.AnGang.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApiHelper.cs 134 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/MoboxController.cs 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
core/Monitor.cs 149 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/TN_CG_Detail.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/TN_Count_CG_Detail.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/TN_Count_Diff.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/TN_Count_Order.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
models/TN_Count_Plan.cs 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.AnGang.csproj
@@ -270,10 +270,6 @@
    <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
@@ -191,6 +191,7 @@
                    S_CNTR_CODE = cntId,
                    //S_ITEM_NAME = model.ItemName,
                    S_LOC_CODE = startLoc.S_CODE, // ADD:补充针对PDA分拣
                    N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
                };
                startLoc.N_CURRENT_NUM = 1;
@@ -926,7 +927,7 @@
                foreach (var transaction in model.stockTransactions) {
                    var recordOld = db.Queryable<TN_Inbound_DataRecord>()
                        .Where(r => r.S_LOCATION_CODE == "HJQ-" + transaction.locationCode.Trim()).First();
                        .Where(r => r.S_LOCATION_CODE == transaction.locationCode.Trim()).First();
                    if (recordOld != null) {
                        deleteRecordOldList.Add(recordOld);
                        //errList.Add(recordOld);
@@ -935,7 +936,7 @@
                    // 写入记录表
                    var record = new TN_Inbound_DataRecord {
                        S_LOCATION_CODE = "HJQ-" + transaction.locationCode.Trim(),
                        S_LOCATION_CODE = transaction.locationCode.Trim(),
                        S_STOCK_TRANS = transaction.stockTransactionId,
                        S_ITEM_CODE = transaction.itemCode,
                        S_ITEM_NAME = transaction.itemName,
@@ -1024,7 +1025,7 @@
                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 == "HJQ-" + issue.locationCode.Trim()).First();
                        .Where(r => r.S_LOCATION_CODE == issue.locationCode.Trim()).First();
                    if (recordOld != null) {
                        deleteRecordOldList.Add(recordOld);
                        //errList.Add(recordOld);
@@ -1033,7 +1034,7 @@
                    // 写入记录表
                    var record = new TN_Outbound_DataRecord {
                        S_LOCATION_CODE = "HJQ-" + issue.locationCode.Trim(),
                        S_LOCATION_CODE = issue.locationCode.Trim(),
                        S_ORDER_NO = issue.withdrawalOrderNo,
                        S_ITEM_CODE = issue.itemCode,
                        S_ITEM_NAME = issue.itemName,
@@ -1098,7 +1099,7 @@
            }
        }
        // 盘点功能(新)
        // 盘点功能(新)------------------------------------
        internal static SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) {
            var taskName = TaskName.盘点理货出库;
@@ -1185,8 +1186,6 @@
                return BuildSimpleResult(1, $"发生了异常:{ex.Message}");
            }
        }
        // 备用:盘点相关功能(恢复)------------------------------
        /// <summary>
        /// 盘点理货出库(WMS)
@@ -1329,127 +1328,6 @@
                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();
api/MoboxController.cs
@@ -86,80 +86,54 @@
            return ApiHelper.CancelTask(model);
        }
        // 盘点功能(新)
        // 盘点功能(新)------------------------------------
        /// <summary>
        /// 盘点理货出库(WMS)
        /// 盘点理货出库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("CheckOutboundOnce")]
        public SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) {
            LogHelper.Info("触发API:盘点理货出库(WMS)" + JsonConvert.SerializeObject(model), "API");
            LogHelper.Info("触发API:盘点理货出库" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.CheckOutboundOnce(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");
            LogHelper.Info("触发API:盘点理货" + 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");
            LogHelper.Info("触发API:盘点理货出库" + 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");
            LogHelper.Info("触发API:盘点理货回库" + JsonConvert.SerializeObject(model), "API");
            return ApiHelper.CheckInbound(model);
        }
    }
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);
@@ -91,7 +103,7 @@
                    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>();
@@ -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);
        //    }
        //}
    }
}
models/TN_CG_Detail.cs
@@ -42,5 +42,59 @@
        public string S_LOC_CODE { get; set; }
        public int N_LOCK_STATE { get; set; } = 0;
        // ------- ERP --------
        /// <summary>
        /// 物料短描述
        /// </summary>
        public string S_ITEM_SHORT_DESC { get; set; }
        /// <summary>
        /// 库存数量
        /// </summary>
        public string S_STOCK_QUANTITY { get; set; }
        /// <summary>
        /// 入库数量
        /// </summary>
        public string S_IN_QUANTITY { get; set; }
        /// <summary>
        /// 库存总价
        /// </summary>
        public string S_TOTAL_PRICE { get; set; }
        ///// <summary>
        ///// 入库时间
        ///// </summary>
        //public string S_STOCK_IN_TIME { get; set; }
        /// <summary>
        /// 保管员
        /// </summary>
        public string S_STORE_KEEPER { get; set; }
        /// <summary>
        /// 产线部门代码
        /// </summary>
        public string S_LINE_CODE { get; set; }
        ///// <summary>
        ///// 送货单行号
        ///// </summary>
        //public string S_DELIVERY_ITEM_NO { get; set; }
        ///// <summary>
        ///// 供应商名称
        ///// </summary>
        //public string S_SUPPLIER_NAME { get; set; }
        ///// <summary>
        ///// 库存责任人姓名
        ///// </summary>
        //public string S_INVENTORY_MAN { get; set; }
    }
}
models/TN_Count_CG_Detail.cs
File was deleted
models/TN_Count_Diff.cs
File was deleted
models/TN_Count_Order.cs
File was deleted
models/TN_Count_Plan.cs
File was deleted