优化轮询ERP信息流程、添加AGV接口报文打印、执行中任务强制取消的功能

kazelee

2025-07-07 24de88ebbbb3597bb2043840bc685e3d59363967

 api/ApiHelper.cs

@@ -9,6 +9,10 @@
using HH.WCS.Mobox3.AnGang.util;
using HH.WCS.Mobox3.AnGang.wms;

using Newtonsoft.Json;

using Swashbuckle.Swagger;

using static HH.WCS.Mobox3.AnGang.api.ApiModel;
using static HH.WCS.Mobox3.AnGang.api.OtherModel;

@@ -30,7 +34,7 @@
                var startLoc = db.Queryable<TN_Location>()
                    .Where(a => a.S_CODE == model.StartLoc)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y")
                    //.Where(a => a.N_CURRENT_NUM == 0)
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .Where(a => startAreas.Contains(a.S_AREA_CODE))
                    .First();

@@ -38,16 +42,16 @@
                    return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求：(1)没有锁状态 (2)属于取放货区");
                }

                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_LOC_CODE == model.StartLoc).First();
                //var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                //    .Where(c => c.S_LOC_CODE == model.StartLoc).First();

                // 产品入库：假定用户不会将新入库物料，放到已有物料的收发货区入库
                // 新产品入库时，如果存在旧的货位绑定数据（出库遗留项目）直接删除
                TN_CG_Detail cgDetailOld = null;
                if (locCntrRelOld != null) {
                    cgDetailOld = db.Queryable<TN_CG_Detail>()
                        .Where(d => d.S_CNTR_CODE == locCntrRelOld.S_CNTR_CODE).First();
                }
                //// 产品入库：假定用户不会将新入库物料，放到已有物料的收发货区入库
                //// 新产品入库时，如果存在旧的货位绑定数据（出库遗留项目）直接删除
                //TN_CG_Detail cgDetailOld = null;
                //if (locCntrRelOld != null) {
                //    cgDetailOld = db.Queryable<TN_CG_Detail>()
                //        .Where(d => d.S_CNTR_CODE == locCntrRelOld.S_CNTR_CODE).First();
                //}

                // 容器 ID 和 物料 ID 未指定，由系统直接生成
                //var cntId = Guid.NewGuid().ToString("D");
@@ -76,9 +80,9 @@
                    if (!int.TryParse(model.Row.Trim(), out int row)) {
                        return BuildSimpleResult(2, $"{model.Row} 不合法：无法转成整数类型");
                    }
                    // 货架排号只能是 0 - 8
                    if (row <= 0 || row > 8) {
                        return BuildSimpleResult(2, $"货架号 {model.Row} 必须是1-8之间的整数");
                    // 货架排号只能是 0 - 8（111-118）
                    if (row <= 110 || row > 118) {
                        return BuildSimpleResult(2, $"货架号 {model.Row} 必须是111-118之间的整数");
                    }
                }

@@ -87,20 +91,20 @@

                // 无论是否选择终点货架，都等到称重之后再计算终点货位
                using (var tran = db.Ado.UseTran()) {
                    if (locCntrRelOld != null) {
                        if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            return BuildSimpleResult(500,
                                $"删除货位容器关系表失败：货位{locCntrRelOld.S_LOC_CODE}，容器{locCntrRelOld.S_CNTR_CODE}");
                        }
                    }
                    if (cgDetailOld != null) {
                        if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            return BuildSimpleResult(500,
                                $"删除旧容器货品明细表失败：容器{cgDetailOld.S_CNTR_CODE}，物料{cgDetailOld.S_ITEM_CODE}");
                        }
                    }
                    //if (locCntrRelOld != null) {
                    //    if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        return BuildSimpleResult(500,
                    //            $"删除货位容器关系表失败：货位{locCntrRelOld.S_LOC_CODE}，容器{locCntrRelOld.S_CNTR_CODE}");
                    //    }
                    //}
                    //if (cgDetailOld != null) {
                    //    if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        return BuildSimpleResult(500,
                    //            $"删除旧容器货品明细表失败：容器{cgDetailOld.S_CNTR_CODE}，物料{cgDetailOld.S_ITEM_CODE}");
                    //    }
                    //}

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
@@ -116,6 +120,132 @@

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"更新起点货位锁状态失败：起点货位{startLoc.S_CODE}");
                    }

                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"生成任务 {taskName} 失败：容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLocCode} ，终点货位未指定");
                    }

                    tran.CommitTran();
                    return BuildSimpleResult(0,
                        $"生成任务 {taskName} 成功：容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLocCode} ，终点货位未指定");
                }
            }
            catch (Exception ex) {
                return BuildSimpleResult(1, $"发生了异常：{ex.Message}");
            }
        }
        
        public static SimpleResult InboundData(InboundDataInfo model) {
            var taskName = TaskName.产品入库;
            var db = new SqlHelper<object>().GetInstance();

            var startAreas = Settings.Areas[AreaIndex.Q取货区];

            try {
                // 起点位置必须：为空、无锁、启用、属于收发区域
                var startLoc = db.Queryable<TN_Location>()
                    .Where(a => a.S_CODE == model.StartLoc)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y")
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .Where(a => startAreas.Contains(a.S_AREA_CODE))
                    .First();

                if (startLoc == null) {
                    return BuildSimpleResult(1, $"起点位置{model.StartLoc}不存在或不满足要求：(1)没有锁状态 (2)属于取放货区");
                }

                //var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                //    .Where(c => c.S_LOC_CODE == model.StartLoc).First();

                //// 产品入库：假定用户不会将新入库物料，放到已有物料的收发货区入库
                //// 新产品入库时，如果存在旧的货位绑定数据（出库遗留项目）直接删除
                //TN_CG_Detail cgDetailOld = null;
                //if (locCntrRelOld != null) {
                //    cgDetailOld = db.Queryable<TN_CG_Detail>()
                //        .Where(d => d.S_CNTR_CODE == locCntrRelOld.S_CNTR_CODE).First();
                //}

                // 容器 ID 和 物料 ID 未指定，由系统直接生成
                //var cntId = Guid.NewGuid().ToString("D");
                //var CgId = Guid.NewGuid().ToString("D");
                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,
                };

                startLoc.N_CURRENT_NUM = 1;

                var endLocCode = "0"; // 假的默认终点地址

                // 指定货位排号（不能为空、空字符串或空格）
                if (model.Row != null && model.Row.Trim() != "") {
                    endLocCode = model.Row; // 用排号字符串当做假地址
                    if (!int.TryParse(model.Row.Trim(), out int row)) {
                        return BuildSimpleResult(2, $"{model.Row} 不合法：无法转成整数类型");
                    }
                    // 货架排号只能是 0 - 8（111-118）
                    if (row <= 110 || row > 118) {
                        return BuildSimpleResult(2, $"货架号 {model.Row} 必须是111-118之间的整数");
                    }
                }

                var task = WCSHelper.BuildInboundTask(startLoc, endLocCode, cntId);
                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁

                // 无论是否选择终点货架，都等到称重之后再计算终点货位
                using (var tran = db.Ado.UseTran()) {
                    //if (locCntrRelOld != null) {
                    //    if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        return BuildSimpleResult(500,
                    //            $"删除货位容器关系表失败：货位{locCntrRelOld.S_LOC_CODE}，容器{locCntrRelOld.S_CNTR_CODE}");
                    //    }
                    //}
                    //if (cgDetailOld != null) {
                    //    if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        return BuildSimpleResult(500,
                    //            $"删除旧容器货品明细表失败：容器{cgDetailOld.S_CNTR_CODE}，物料{cgDetailOld.S_ITEM_CODE}");
                    //    }
                    //}

                    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,
                        it.N_CURRENT_NUM
                    }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildSimpleResult(500,
                            $"更新起点货位锁状态失败：起点货位{startLoc.S_CODE}");
@@ -202,9 +332,9 @@
                    if (!int.TryParse(model.Row.Trim(), out int row)) {
                        return BuildSimpleResult(2, $"{model.Row} 不合法：无法转成整数类型");
                    }
                    // 货架排号只能是 0 - 8
                    if (row <= 0 || row > 8) {
                        return BuildSimpleResult(2, $"货架号 {model.Row} 必须是1-8之间的整数");
                    // 货架排号只能是 0 - 8（111-118）
                    if (row <= 110 || row > 118) {
                        return BuildSimpleResult(2, $"货架号 {model.Row} 必须是111-118之间的整数");
                    }
                }

@@ -350,7 +480,6 @@
                    LogHelper.Info($"国自AGV接受终点信息失败", "HosttoagvTask");
                }


                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Task>(task).UpdateColumns(a => a.S_END_LOC).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
@@ -394,13 +523,17 @@
                    .First();

                if (startLoc == null) {
                    return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不存在或不具备取货要求");
                    return BuildSimpleResult(2, $"起点位置 {model.startLoc} 不存在或不具备取货要求！");
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == model.startLoc);

                if (locCntrRel == null) {
                    return BuildSimpleResult(3, $"起点位置 {model.startLoc} 没有绑定容器，无可出库的物料");
                    return BuildSimpleResult(3, $"起点位置 {model.startLoc} 没有绑定容器，无可出库的物料！");
                }

                if (locCntrRel.N_LOCK_STATE == 0) {
                    return BuildSimpleResult(5, $"起点位置'{model.startLoc}'的货位，货位容器关系上锁，物料信息尚未传递，无法出库！");
                }

                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));
@@ -595,9 +728,9 @@

                }
                else {
                    return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消");
                    //return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消");

                    // return CancelTaskIfForced(model, task); // 备用函数，如果甲方要求任务执行中也取消，再调用
                    return CancelTaskIfForced(model, task); // 备用函数，如果甲方要求任务执行中也取消，再调用
                }

            }
@@ -606,25 +739,112 @@
            }
        }

        public static SimpleResult CancelTaskIfForced(CancleTaskInfo model, TN_Task task) {
            return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消");
        }
        public static SimpleResult CancelTaskIfForced(CancelTaskInfo model, TN_Task task) {

        
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                var startloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_START_LOC);
                var endloc = db.Queryable<TN_Location>().First(a => a.S_CODE == task.S_END_LOC);
                //var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == task.S_CNTR_CODE);
                //var cg = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == task.S_CNTR_CODE);

                if (startloc != null) {
                    startloc.N_LOCK_STATE = 0;
                    startloc.S_LOCK_STATE = "无";
                    //starloc.N_CURRENT_NUM = 0;
                    startloc.T_MODIFY = System.DateTime.Now;
                }

                if (endloc != null) {
                    endloc.N_LOCK_STATE = 0;
                    endloc.S_LOCK_STATE = "无";
                    //endloc.N_CURRENT_NUM = 0;
                    endloc.T_MODIFY = System.DateTime.Now;
                }

                if (task.N_B_STATE == 1) {
                    if (!int.TryParse(task.S_EQ_TASK_CODE, out var code)) {
                        LogHelper.Info($"当前任务{task.S_CODE}没有找到对应的国自AGV orderId！");
                    }
                    else {
                        var res = GZRobot.CancelGZOrder(code);
                        if (!res) {
                            LogHelper.Info($"国自AGV取消任务失败！", "HosttoagvTask");
                        }
                        else {
                            LogHelper.Info($"国自AGV取消任务成功！", "HosttoagvTask");
                        }
                    }
                }

                task.N_B_STATE = 4;
                task.S_B_STATE = "取消";

                // 前面锁状态的部分不需要修改：无论有没有恢复，都强制恢复，最终结果都是无锁状态

                // 已执行：需要添加的逻辑：针对解锁/绑定的货位容器表（好像不需要关心，先不做任何操作）

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startloc).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"任务{task.S_CODE}取消失败：修改起点货位锁状态失败";
                        return BuildSimpleResult(500, info);
                    }

                    if (endloc != null) {
                        if (db.Updateable<TN_Location>(endloc).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"任务{task.S_CODE}取消失败：修改终点货位锁状态失败";
                            return BuildSimpleResult(500, info);
                        }
                    }

                    if (db.Updateable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"任务{task.S_CODE}取消失败";
                        return BuildSimpleResult(500, info);
                    }

                    tran.CommitTran();
                    info = $"任务{task.S_CODE}取消成功";
                    return BuildSimpleResult(0, info);
                }
            }
            catch (Exception) {
                throw; // 外部catch
            }

            //return BuildSimpleResult(3, $"只有任务号状态为 等待 或 已推送 的任务才能取消");
        }

        public static ErpResult InboundDataSync(InboundDataSyncInfo model) {
            //return BuildErpResult(1, "测试");

            var db = new SqlHelper<object>().GetInstance();
            try {
                var err = "";
                var cgDetailList = new List<TN_CG_Detail>();
                var recordList = new List<TN_Inbound_DataRecord>();
                if (model.stockTransactions == null && model.stockTransactions.Count == 0) {
                    return BuildErpResult(400, "不能传入空的数据列表");
                }

                //var info = "";
                //var cgDetailList = new List<TN_CG_Detail>();
                var insetRecordList = new List<TN_Inbound_DataRecord>();
                var deleteRecordOldList = new List<TN_Inbound_DataRecord> ();
                //var errList = new List<TN_Inbound_DataRecord>();

                foreach (var transaction in model.stockTransactions) {
                    var recordOld = db.Queryable<TN_Inbound_DataRecord>()
                        .Where(r => r.S_LOCATION_CODE == "HJQ-" + transaction.locationCode.Trim()).First();
                    if (recordOld != null) {
                        deleteRecordOldList.Add(recordOld);
                        //errList.Add(recordOld);
                        //continue;
                    }

                    // 写入记录表
                    var record = new TN_Inbound_DataRecord {
                        S_LOCATION_CODE = transaction.locationCode,
                        S_LOCATION_CODE = "HJQ-" + transaction.locationCode.Trim(),
                        S_STOCK_TRANS = transaction.stockTransactionId,
                        S_ITEM_CODE = transaction.itemCode,
                        S_ITEM_NAME = transaction.itemName,
@@ -639,44 +859,58 @@
                        S_SUPPLIER_NAME = transaction.supplierName,
                        S_INVENTORY_MAN = transaction.inventoryManager
                    };
                    recordList.Add(record);
                    insetRecordList.Add(record);

                    // 查询对应物料
                    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 == transaction.locationCode)
                        .Select((l, c, d) => d)
                        .First();
                    //// 查询对应物料
                    //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 == transaction.locationCode)
                    //    .Select((l, c, d) => d)
                    //    .First();

                    if (cgDetail == null) {
                        err += $"储位码{transaction.locationCode}对应的货位物料不存在！";
                        continue;
                    }
                    cgDetail.S_ITEM_CODE = transaction.itemCode;
                    cgDetail.S_ITEM_NAME = transaction.itemName;
                    //if (cgDetail == null) {
                    //    err += $"储位码{transaction.locationCode}对应的货位物料不存在！";
                    //    continue;
                    //}
                    //cgDetail.S_ITEM_CODE = transaction.itemCode;
                    //cgDetail.S_ITEM_NAME = transaction.itemName;

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

                    if (db.Updateable<TN_CG_Detail>(cgDetailList).ExecuteCommand() <= 0) {
                    if (db.Insertable<TN_Inbound_DataRecord>(insetRecordList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildErpResult(500, $"更改物料信息失败");
                        return BuildErpResult(500, $"写入入库记录表失败!");
                    }

                    //if (db.Updateable<TN_CG_Detail>(cgDetailList).ExecuteCommand() <= 0) {
                    //    tran.RollbackTran();
                    //    return BuildErpResult(500, $"更改物料信息失败！待更新物料信息数量={cgDetailList.Count}");
                    //}

                    tran.CommitTran();
                    return BuildErpResult(0, $"写入入库记录表成功!");
                }

                if (err != "") {
                    return BuildErpResult(2, err + "其他信息正常已写入");
                }
                return BuildErpResult(0, $"更改物料信息成功");
                //if (err != "") {
                //    return BuildErpResult(2, err + "其他信息正常已写入");
                //}
                //return BuildErpResult(0, $"更改物料信息成功");

                // NOTE：暂时不检查，万一ERP发错了，可以选择重发

                //if (errList.Count > 0) {
                //    info = "更改物料信息部分成功，部分失败，原因：当前货位已经给过物料信息";
                //}
                //else {
                //    info = "更改物料信息成功!";
                //}
            }
            catch (Exception ex) {
                return BuildErpResult(1, $"发生了异常：{ex.Message}");
@@ -688,14 +922,27 @@

            var db = new SqlHelper<object>().GetInstance();
            try {
                var err = "";
                var cgDetailList = new List<TN_CG_Detail>();
                var recordList = new List<TN_Outbound_DataRecord>();
                if (model.materialIssues == null || model.materialIssues.Count == 0) {
                    return BuildErpResult(400, "不能传入空的数据列表");
                }

                //var err = "";
                //var cgDetailList = new List<TN_CG_Detail>();
                //var recordList = new List<TN_Outbound_DataRecord>();
                var insetRecordList = 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 == "HJQ-" + issue.locationCode.Trim()).First();
                    if (recordOld != null) {
                        deleteRecordOldList.Add(recordOld);
                        //errList.Add(recordOld);
                        //continue;
                    }

                    // 写入记录表
                    var record = new TN_Outbound_DataRecord {
                        S_LOCATION_CODE = issue.locationCode,
                        S_LOCATION_CODE = "HJQ-" + issue.locationCode.Trim(),
                        S_ORDER_NO = issue.withdrawalOrderNo,
                        S_ITEM_CODE = issue.itemCode,
                        S_ITEM_NAME = issue.itemName,
@@ -709,44 +956,50 @@
                        S_LINE_CODE = issue.lineCode,
                        S_BATCH_NO = issue.batchNo
                    };
                    recordList.Add(record);
                    insetRecordList.Add(record);

                    // 查询对应物料
                    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 == issue.locationCode)
                        .Select((l, c, d) => d)
                        .First();
                    //// 查询对应物料
                    //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 == issue.locationCode)
                    //    .Select((l, c, d) => d)
                    //    .First();

                    if (cgDetail == null) {
                        err += $"储位码{issue.locationCode}对应的货位物料不存在！";
                        continue;
                    }
                    //if (cgDetail == null) {
                    //    err += $"储位码{issue.locationCode}对应的货位物料不存在！";
                    //    continue;
                    //}

                    cgDetail.S_ITEM_CODE = issue.itemCode;
                    cgDetail.S_ITEM_NAME = issue.itemName;
                    //cgDetail.S_ITEM_CODE = issue.itemCode;
                    //cgDetail.S_ITEM_NAME = issue.itemName;

                    cgDetailList.Add(cgDetail);
                    //cgDetailList.Add(cgDetail);
                }

                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_Outbound_DataRecord>(recordList).ExecuteCommand() <= 0) {
                    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();
                        return BuildErpResult(500, $"写入出库记录表失败");
                    }

                    if (db.Updateable<TN_CG_Detail>(cgDetailList).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return BuildErpResult(500, $"更改物料信息失败");
                    } 
                    //if (db.Updateable<TN_CG_Detail>(cgDetailList).ExecuteCommand() <= 0) {
                    //    tran.RollbackTran();
                    //    return BuildErpResult(500, $"更改物料信息失败");
                    //} 

                    tran.CommitTran();
                    return BuildErpResult(0, $"写入出库记录表成功!");
                }

                if (err != "") {
                    return BuildErpResult(2, err + "其他信息正常已写入");
                }
                return BuildErpResult(0, $"更改物料信息成功");
                //if (err != "") {
                //    return BuildErpResult(2, err + "其他信息正常已写入");
                //}
                //return BuildErpResult(0, $"更改物料信息成功");

            }
            catch (Exception ex) {