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

kazelee

4 天以前 656f90b301ba307c909de4ee94b88af817adf0d8

 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();