使用Container表优化容器与物料类型绑定的逻辑

kazelee

2025-06-06 a949debc0abbe90adfda1af653b7b5c2ab27d997

使用Container表优化容器与物料类型绑定的逻辑

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/00234e98-2307-4b05-8393-c563c56d7614.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/139907d5-bf69-4957-bd54-53b4b25a0984.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/4ae243f4-d9f0-4a8c-8620-a0c519179a88.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/797cacde-8caf-4c9b-8a9b-43a33fa8be1a.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/8ed17d81-cd33-4ea4-bf1d-fa3bebc1cbd6.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/93b0aa90-1489-440e-8c8a-64eb24e3558a.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9442875d-8d82-4dfd-bd01-827281423d02.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/9c0aa391-6594-401b-9354-62501bb2601d.vsidx

Binary files differ

 HH.WCS.Mobox3.DSZSH.csproj

@@ -244,7 +244,6 @@
    <Compile Include="models\TN_Spot_Check.cs" />
    <Compile Include="process\TaskProcess.cs" />
    <Compile Include="util\SqlHelper.cs" />
    <Compile Include="models\TN_Container_ItemType.cs" />
    <Compile Include="models\TN_Outbound_Order.cs" />
    <Compile Include="models\TN_Outbound_Detail.cs" />
    <Compile Include="device\ProductionLineDevice.cs" />

 api/ApiHelper.cs

@@ -32,6 +32,13 @@
            var endAreaName = AreaName.M满箱货架区; // 终点货区

            try {
                // 参数合法性确认部分：错误编码：400
                if (model.Num <= 0 ) {
                    info = $"物料数量{model.Num}不合法：物料数量应该大于 0";
                    LogHelper.Info(info);
                    return NewSimpleResult(400, info);
                }

                // 贴标机会提前将物料信息写入CG_Detail表中
                // 将PDA提供的物料编码与贴标机的信息比对
                var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -70,21 +77,44 @@
                    S_CNTR_TYPE = "好运箱",
                };

                // 每个新插入容器的逻辑，都需要查询这个表是否存在，如果不存在也加入，如果存在：暂不更新结果（待定）
                // 更详细的，是空箱入库，和满料下线这两个流程的容器可能是新的，其余容器一定是旧的，无需再判断
                // 严格来说，容器类型应该放在Container里面的，Loc_Container表只放关系，不过暂时先这样改吧
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                var insertContainerItemType = false;
                if (cntrItemRel == null) {
                    insertContainerItemType = true;
                    cntrItemRel = new TN_Container_ItemType {
                        S_ITEM_CODE = cgDetail.S_ITEM_CODE, // 物料类型对于好运箱而言其实不用，主要是类型
                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
                var needInsertContainer = false;
                var needUpdateContainer = false;

                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
                // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                if (cntr == null) {
                    needInsertContainer = true;
                    LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                    cntr = new TN_Container {
                        S_CODE = locCntrRel.S_CNTR_CODE,
                        S_SPEC = cgDetail.S_ITEM_CODE, // 登记容器对应的物料编号 
                        S_TYPE = "料箱", // 容器类型：料箱（好运箱）
                        S_SOURCE = taskName,
                    };
                }
                else {
                    // 如果容器存在，但没有类型或没有适用的物料编号，需要更新，并将容器来源设置为任务名称
                    if (string.IsNullOrEmpty(cntr.S_TYPE)) {
                        needUpdateContainer = true;
                        LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中登记但没有类型，" +
                            $"更新类型为：料箱，并设置容器来源为：{taskName}");

                        cntr.S_TYPE = "料箱"; // 容器类型：料箱（好运箱）
                        cntr.S_SOURCE = taskName;
                    }
                    if (string.IsNullOrEmpty(cntr.S_SPEC)) {
                        needUpdateContainer = true;
                        LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中登记但没有适用物料编码，" +
                            $"更新物料编码为：{cgDetail.S_ITEM_CODE}，并设置容器来源为：{taskName}");

                        cntr.S_SPEC = cgDetail.S_ITEM_CODE; // 规格：物料编号
                        cntr.S_SOURCE = taskName;
                    }
                }
                
                // TODO 满箱入库算法待优化
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE)) // 终点货区符合任务要求
@@ -99,20 +129,29 @@
                    return NewSimpleResult(4, info);
                }

                // 数据库操作部分
                
                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                // 数据库操作事务部分：错误编码：500
                using (var tran = db.Ado.UseTran()) {
                    if (insertContainerItemType) {
                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                            info = $"插入容器信息失败：" + JsonConvert.SerializeObject(cntrItemRel);
                    if (needInsertContainer) {
                        if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"插入容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                            return NewSimpleResult(500, info);
                        }
                    }
                    else if (needUpdateContainer) {
                        if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(500, info);
                        }
                    }

@@ -120,7 +159,7 @@
                        info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
                        tran.RollbackTran();
                        LogHelper.Info(info);
                        return NewSimpleResult(5, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -133,7 +172,7 @@
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(5, info);
                        return NewSimpleResult(500, info);
                    }

                    if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -145,14 +184,14 @@
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(5, info);
                        return NewSimpleResult(500, info);
                    }
                    
                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(5, info);
                        return NewSimpleResult(500, info);
                    }

                    tran.CommitTran();
@@ -175,7 +214,7 @@
        /// 人工将空托盘通过接驳位入库，需要新绑定容器货位<br/>
        /// 由于空托盘一般是出库卸货后获得，而出库时没有手动卸货的逻辑，所以需要在入库的时候再删除旧绑定信息
        /// </remarks>
        /// <param name="model"></param>
        /// <param name="model">包含：起点货位、容器号、容器类型、终点货区</param>
        /// <returns></returns>
        public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
@@ -225,19 +264,34 @@
                    S_CNTR_TYPE = "托盘",
                };

                // 每个新插入容器的逻辑，都需要查询这个表是否存在，如果不存在也加入，如果存在：暂不更新结果（待定）
                // 更详细的，是空箱入库，和满料下线这两个流程的容器可能是新的，其余容器一定是旧的，无需再判断
                // 严格来说，容器类型应该放在Container里面的，Loc_Container表只放关系，不过暂时先这样改吧
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                var insertContainerItemType = false;
                if (cntrItemRel == null) {
                    insertContainerItemType = true;
                    cntrItemRel = new TN_Container_ItemType {
                        S_ITEM_CODE = "", // 空托盘刚入库，没有物料类型，就默认先为空
                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
                var needInsertContainer = false;
                var needUpdateContainer = false;

                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
                // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                if (cntr == null) {
                    needInsertContainer = true;
                    LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                    cntr = new TN_Container {
                        S_CODE = locCntrRel.S_CNTR_CODE,
                        S_SPEC = "", // 空托，物料编码先设置为空
                        S_TYPE = locCntrRel.S_CNTR_TYPE, // 容器类型：托盘
                        S_SOURCE = taskName,
                    };
                }
                else {
                    // 如果容器存在，但没有类型或没有适用的物料编号，需要更新，并将容器来源设置为任务名称
                    if (string.IsNullOrEmpty(cntr.S_TYPE)) {
                        needUpdateContainer = true;
                        LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中登记但没有类型，" +
                            $"更新类型为：托盘，并设置容器来源为：{taskName}");

                        cntr.S_TYPE = "托盘"; // 容器类型：托盘
                    }
                    // 空托不更新物料编码
                }

                // TODO 暂定选择最低层按区位顺序入库，后面待修改
@@ -261,12 +315,20 @@
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (insertContainerItemType) {
                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                            info = $"插入容器信息失败：" + JsonConvert.SerializeObject(cntrItemRel);
                    if (needInsertContainer) {
                        if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"插入容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                            return NewSimpleResult(500, info);
                        }
                    }
                    else if (needUpdateContainer) {
                        if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(500, info);
                        }
                    }

@@ -403,19 +465,34 @@
                    S_CNTR_TYPE = "好运箱",
                };

                // 每个新插入容器的逻辑，都需要查询这个表是否存在，如果不存在也加入，如果存在：暂不更新结果（待定）
                // 更详细的，是空箱入库，和满料下线这两个流程的容器可能是新的，其余容器一定是旧的，无需再判断
                // 严格来说，容器类型应该放在Container里面的，Loc_Container表只放关系，不过暂时先这样改吧
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(c => c.S_CNTR_CODE == locCntrRel.S_CNTR_CODE).First();
                var insertContainerItemType = false;
                if (cntrItemRel == null) {
                    insertContainerItemType = true;
                    cntrItemRel = new TN_Container_ItemType {
                        S_ITEM_CODE = "", // 空托盘刚入库，没有物料类型，就默认先为空
                        S_CNTR_TYPE = locCntrRel.S_CNTR_TYPE,
                        S_CNTR_CODE = locCntrRel.S_CNTR_CODE,
                var needInsertContainer = false;
                var needUpdateContainer = false;

                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == locCntrRel.S_CNTR_CODE).First();
                // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                if (cntr == null) {
                    needInsertContainer = true;
                    LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                    cntr = new TN_Container {
                        S_CODE = locCntrRel.S_CNTR_CODE,
                        S_SPEC = "", // 空箱，物料编码先设置为空
                        S_TYPE = locCntrRel.S_CNTR_TYPE, // 容器类型：料箱（好运箱）
                        S_SOURCE = taskName,
                    };
                }
                else {
                    // 如果容器存在，但没有类型或没有适用的物料编号，需要更新，并将容器来源设置为任务名称
                    if (string.IsNullOrEmpty(cntr.S_TYPE)) {
                        needUpdateContainer = true;
                        LogHelper.Info($"起点货位的容器：{locCntrRel.S_CNTR_CODE}，在容器表中登记但没有类型，" +
                            $"更新类型为：料箱，并设置容器来源为：{taskName}");

                        cntr.S_TYPE = "料箱"; // 容器类型：料箱（好运箱）
                    }
                    // 空箱不更新物料编码
                }

                // TODO 暂定选择最低层顺序入库，后面待修改
@@ -439,12 +516,20 @@
                LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (insertContainerItemType) {
                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                            info = $"插入容器信息失败：" + JsonConvert.SerializeObject(cntrItemRel);
                    if (needInsertContainer) {
                        if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"插入容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(5, info);
                            return NewSimpleResult(500, info);
                        }
                    }
                    else if (needUpdateContainer) {
                        if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return NewSimpleResult(500, info);
                        }
                    }

@@ -532,7 +617,7 @@
        /// <remarks>
        /// 人工根据当前生产物料所需的容器类型，呼叫AGV从空容器货架中叫一个符合要求的托盘
        /// </remarks>
        /// <param name="model"></param>
        /// <param name="model">b包含：容器号、物料编码</param>
        /// <returns></returns>
        public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var db = new SqlHelper<object>().GetInstance();
@@ -543,16 +628,24 @@
            var endAreaName = AreaName.B包装区;

            try {
                // 查容器-物料类型表
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "托盘")
                    .First();
                // 如果表中存在这个托盘信息，且物料类型与上线所需物料不符，报错
                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntId).First();
                // 如果表中存在这个托盘信息，但容器类型、物料类型与上线所需物料不符，报错
                // 如果不存在，不作限制（视作第一次上线）
                if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
                    info = $"容器{model.CntId}已经与物料类型{cntrItemRel.S_ITEM_CODE}绑定，无法用于装载物料{model.ItemCode}";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                if (cntr != null) { 
                    // 如果存在容器号，但类型不是托盘，报错
                    if (!string.IsNullOrEmpty(cntr.S_TYPE) && cntr.S_TYPE != "托盘") {
                        info = $"容器在容器表中找到，但类型是：{cntr.S_TYPE}，不是{taskName}所需的：托盘";
                        LogHelper.Info(info);
                        return NewSimpleResult(1, info);
                    }
                    // 如果表中物料编码不为空，且与上线所需物料不一致，报错
                    if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != model.ItemCode) {
                        info = $"容器{model.CntId}已经与物料类型{cntr.S_SPEC}绑定，无法用于装载物料{model.ItemCode}";
                        LogHelper.Info(info);
                        return NewSimpleResult(2, info);
                    }
                }

                var startLoc = db.Queryable<TN_Location>()
@@ -742,12 +835,20 @@
                    .First();

                if (cgDetail == null) {
                    return NewSimpleResult(2, "没有找到待回库的抽检物料：" + JsonConvert.SerializeObject(model));
                    info = "没有找到待回库的抽检物料：" + JsonConvert.SerializeObject(model);
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                }

                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
                    .First();

                if (locCntrRel == null) {
                    info = $"容器{model.CntrCode}在货位容器关系表中不存在";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -759,7 +860,7 @@
                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到容器{model.CntrCode}的起点货位，或不具备取货要求：未上锁、有货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(4, info);
                }

                var endLoc = new TN_Location();
@@ -778,7 +879,7 @@
                        .First();
                }
                else {
                    return NewSimpleResult(2, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
                    return NewSimpleResult(-1, $"托盘类型{locCntrRel.S_CNTR_TYPE}不合法：托盘号{locCntrRel.S_CNTR_CODE}");
                }

                if (endLoc == null) {
@@ -880,6 +981,12 @@
                var locCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
                    .First();

                if (locCntrRel == null) {
                    info = $"容器{model.CntrCode}在货位容器关系表中不存在";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                }

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
@@ -1307,12 +1414,33 @@
            var info = "";

            try {
                if (string.IsNullOrEmpty(model.ItemCode)) {
                    info = $"博实下发物料信息：参数不合法：物料编码（itemCode）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                }
                if (string.IsNullOrEmpty(model.CntrCode)) {
                    info = $"博实下发物料信息：参数不合法：容器编码（CntrCode）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                }
                if (string.IsNullOrEmpty(model.BatchNo)) {
                    info = $"博实下发物料信息：参数不合法：批次号（BatchNo）不能为空";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                }
                if (model.ItemNum <= 0) {
                    info = $"博实下发物料信息：参数不合法：货品数量（ItemNum）应该大于 0";
                    LogHelper.Info(info);
                    return NewMesResult(400, info);
                }

                // 将下发的信息先存储到CG表中（此时托盘没有与产线处的货位绑定）
                var detail = new TN_CG_Detail {
                    S_ITEM_CODE = model.ItemCode,
                    S_ITEM_NAME = model.ItemName,
                    S_CNTR_CODE = model.CntrCode, // 料箱编号（待定，现在暂时设定为博实下发）
                    S_BATCH_NO = model.BatchNo,
                    S_ITEM_CODE = model.ItemCode, // NOT NULL
                    S_ITEM_NAME = model.ItemName, 
                    S_CNTR_CODE = model.CntrCode, // NOT NULL 料箱编号（待定，现在暂时设定为博实下发）
                    S_BATCH_NO = model.BatchNo,   // NOT NULL
                    S_STANDARD = model.Standard,
                    S_NET_WEIGHT = model.NetWeight,
                    S_QUALITY_GRADE = model.QualityGrade,
@@ -1335,7 +1463,7 @@
                    if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = "插入物料信息失败：" + JsonConvert.SerializeObject(detail);
                        return NewMesResult(2, info);
                        return NewMesResult(500, info);
                    }

                    tran.CommitTran();

 api/ApiModel.cs

@@ -359,6 +359,11 @@
            /// </summary>
            [JsonProperty("cntrCode")]
            public string CntrCode { get; set; }
            /// <summary>
            /// 物料数量（待定）
            /// </summary>
            [JsonProperty("itemNum")]
            public int ItemNum { get; set; }
            ///// <summary>
            ///// 产线号（待定，好运箱有2条产线，对应2个下线货位，这里暂定为：3和4）
            ///// </summary>

 api/DebugController.cs

@@ -328,68 +328,6 @@
        }

        /// <summary>
        /// DEBUG：根据容器物料信息表，插入容器物料登记信息表
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [Route("InsertContainerItemByCgDetail")]
        public string InsertContainerItemByCgDetail(FalseOk _) {
            var db = new SqlHelper<object>().GetInstance();
            try {
                var cgDetailList = db.Queryable<TN_CG_Detail>().ToList();
                var cntrItemList = new List<TN_Container_ItemType>();
                foreach (var cgDetail in cgDetailList) {
                    if (db.Queryable<TN_Container_ItemType>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) {
                        continue;
                    }

                    cntrItemList.Add(new TN_Container_ItemType {
                        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                        S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                    });
                }

                if (db.Insertable<TN_Container_ItemType>(cntrItemList).ExecuteCommand() <= 0) {
                    return "插入失败";
                }

                return "插入成功";
            }
            catch (Exception ex) {

                LogHelper.InfoEx(ex);
                return ex.Message;
            }
        }

        /// <summary>
        /// DEBUG：根据容器物料信息表，插入容器物料登记信息表
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        [Route("InsertContainerItem")]
        public string InsertContainerItem(InsertCntrItemInfo cgDetail) {
            var db = new SqlHelper<object>().GetInstance();
            try {
                var cntrItem = new TN_Container_ItemType {
                    S_CNTR_CODE = cgDetail.Cntr,
                    S_ITEM_CODE = cgDetail.Item,
                };

                if (db.Insertable<TN_Container_ItemType>(cntrItem).ExecuteCommand() <= 0) {
                    return "插入失败";
                }

                return "插入成功";
            }
            catch (Exception ex) {

                LogHelper.InfoEx(ex);
                return ex.Message;
            }
        }

        /// <summary>
        /// DEBUG：模拟输送线产线满托盘下线流程
        /// </summary>
        /// <param name="model"></param>
@@ -416,22 +354,34 @@
                    S_CNTR_CODE = cntrCode,
                };

                // BEG 每次轮询都检查对应容器是否已登记，登记保持不变，未登记则插入
                // TODO 可能会采用每次上线都更新的逻辑，后面再看
                var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                    .Where(i => i.S_CNTR_CODE == cntrCode).First();
                var needInsertContainer = false;
                var needUpdateContainer = false;
                // 查容器信息表是否已经有这个容器
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == cntrCode).First();
                // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                if (cntr == null) {
                    needInsertContainer = true;
                    LogHelper.Info($"轮询：{taskName}：容器：{cntrCode}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                var insertTable = cntrItemRel == null;

                if (insertTable) {
                    // 暂定在满托下线入库的时候，登记托盘容器-物料号关系（后面可能会改成系统维护）
                    cntrItemRel = new TN_Container_ItemType {
                        S_ITEM_CODE = itemCode,
                        S_CNTR_CODE = cntrCode,
                        S_CNTR_TYPE = "托盘",
                    cntr = new TN_Container {
                        S_CODE = cntrCode,
                        S_TYPE = "托盘",
                        S_SPEC = itemCode,
                        S_SOURCE = taskName,
                    };
                }
                // END
                else {
                    // 如果找到该容器，但容器物料类型与下线物料不符，记录并直接覆盖（待定）
                    if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
                        needUpdateContainer = true;
                        LogHelper.Info($"轮询：{taskName}：容器表中容器{cntrCode}对应的物料信息：{cntr.S_SPEC}，" +
                            $"与所需要的物料信息{itemCode}不符，直接覆盖结果");

                        cntr.S_SPEC = itemCode;
                        cntr.S_SOURCE = taskName;
                    }
                }

                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == startLocCode) // 指定：起点货位号
@@ -480,24 +430,22 @@
                        return info;
                    }

                    // BEG 插入或更新容器与物料类型的绑定表
                    if (insertTable) {
                        if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                    if (needInsertContainer) {
                        if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"插入容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            info = $"登记容器物料类型绑定表失败：物料编码{cntrItemRel.S_ITEM_CODE}，容器编码{cntrItemRel.S_CNTR_CODE}";
                            LogHelper.Info(info);
                            return info;
                        }
                    }
                    //else {
                    //    if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        info = $"登记容器物料类型绑定表失败：物料编码{cntrItemRel.S_ITEM_CODE}，容器编码{cntrItemRel.S_CNTR_CODE}";
                    //        LogHelper.Info(info);
                    //        return info;
                    //    }
                    //}
                    // END
                    else if (needUpdateContainer) {
                        if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                            tran.RollbackTran();
                            LogHelper.Info(info);
                            return info;
                        }
                    }

                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();

 core/Monitor.cs

@@ -66,21 +66,34 @@
                        S_CNTR_CODE = cntrCode,
                    };

                    // BEG 每次轮询都检查对应容器是否已登记，登记则更新，未登记则插入
                    var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                        .Where(i => i.S_CNTR_CODE == cntrCode).First();
                    var needInsertContainer = false;
                    var needUpdateContainer = false;
                    // 查容器信息表是否已经有这个容器
                    var cntr = db.Queryable<TN_Container>()
                        .Where(c => c.S_CODE == cntrCode).First();
                    // 如果找不到该容器，需要添加，并且将容器来源设置为任务名称
                    if (cntr == null) {
                        needInsertContainer = true;
                        LogHelper.Info($"轮询：{taskName}：容器：{cntrCode}，在容器表中没有登记，登记并设置容器来源为：{taskName}");

                    var insertTable = cntrItemRel == null;

                    if (insertTable) {
                        // 暂定在满托下线入库的时候，登记托盘容器-物料号关系（后面可能会改成系统维护）
                        cntrItemRel = new TN_Container_ItemType {
                            S_ITEM_CODE = itemCode,
                            S_CNTR_CODE = cntrCode,
                            S_CNTR_TYPE = "托盘",
                        cntr = new TN_Container {
                            S_CODE = cntrCode,
                            S_TYPE = "托盘",
                            S_SPEC = itemCode,
                            S_SOURCE = taskName,
                        };
                    }
                    // END
                    else {
                        // 如果找到该容器，但容器物料类型与下线物料不符，记录并直接覆盖（待定）
                        if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
                            needUpdateContainer = true;
                            LogHelper.Info($"轮询：{taskName}：容器表中容器{cntrCode}对应的物料信息：{cntr.S_SPEC}，" +
                                $"与所需要的物料信息{itemCode}不符，直接覆盖结果");

                            cntr.S_SPEC = itemCode;
                            cntr.S_SOURCE = taskName;
                        }
                    }

                    var startLoc = db.Queryable<TN_Location>()
                        .Where(l => l.S_CODE == startLocCode) // 指定：起点货位号
@@ -102,13 +115,6 @@
                        S_CNTR_TYPE = "托盘",
                    };

                    //if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                    //    info = $"插入货位容器关系失败：" + JsonConvert.SerializeObject(locCntrRel);
                    //    LogHelper.Info(info);
                    //    continue;
                    //    //return;
                    //}

                    var endLoc = db.Queryable<TN_Location>()
                        .Where(a => Settings.AreaMap[AreaName.K空托存放区].Contains(a.S_AREA_CODE))
                        .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
@@ -129,31 +135,29 @@
                    LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                    using (var tran = db.Ado.UseTran()) {
                        if (needInsertContainer) {
                            if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                                info = $"插入容器表失败：" + JsonConvert.SerializeObject(cntr);
                                tran.RollbackTran();
                                LogHelper.Info(info);
                                continue;
                            }
                        }
                        else if (needUpdateContainer) {
                            if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                                info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                                tran.RollbackTran();
                                LogHelper.Info(info);
                                continue;
                            }
                        }

                        if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"插入容器货品信息表失败：物料编码{cgDetail.S_ITEM_CODE}，容器编码{cgDetail.S_CNTR_CODE}";
                            LogHelper.Info(info);
                            continue;
                        }

                        // BEG 插入或更新容器与物料类型的绑定表
                        if (insertTable) {
                            if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                                tran.RollbackTran();
                                info = $"登记容器物料类型绑定表失败：物料编码{cntrItemRel.S_ITEM_CODE}，容器编码{cntrItemRel.S_CNTR_CODE}";
                                LogHelper.Info(info);
                                continue;
                            }
                        }
                        else {
                            if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
                                tran.RollbackTran();
                                info = $"登记容器物料类型绑定表失败：物料编码{cntrItemRel.S_ITEM_CODE}，容器编码{cntrItemRel.S_CNTR_CODE}";
                                LogHelper.Info(info);
                                continue;
                            }
                        }
                        // END

                        if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                            tran.RollbackTran();

 models/TN_Container.cs

@@ -8,11 +8,19 @@
    /// </summary>
    [SugarTable("TN_Container")]
    public class TN_Container : BaseModel {
        public string S_CODE { get; set; }

        public string S_TYPE { get; set; }

        public string S_SPEC { get; set; }
        public string S_CODE { get; set; } = string.Empty;
        /// <summary>
        /// 容器类型
        /// </summary>
        public string S_TYPE { get; set; } = string.Empty;
        /// <summary>
        /// 规格（用于记录容器适用的物料编号）
        /// </summary>
        public string S_SPEC { get; set; } = string.Empty;
        /// <summary>
        /// 来源（这里记录为创建该容器的主体：Mobox或具体的任务）
        /// </summary>
        public string S_SOURCE { get; set; } = string.Empty;

        public int N_DETAIL_COUNT { get; set; }


 models/TN_Container_ItemType.cs

File was deleted

 util/SqlHelper.cs

@@ -39,6 +39,12 @@
                //相当于EF的 PrintToMiniProfiler
            };

            // 配置AOP日志
            //db.Aop.OnLogExecuting = (sql, pars) =>
            //{
            //    Console.WriteLine(sql); // 输出纯SQL语句
            //};

            //每次设置数值时都去除前导后导空格
            db.Aop.DataExecuted = (value, entity) => {
                entity.EntityColumnInfos.ToList().ForEach(a => {

 wms/LocationHelper.cs

@@ -249,7 +249,6 @@
                }
                cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();


                var log = JsonConvert.SerializeObject(cntrs);
                var location = db.Queryable<TN_Location>().First(a => a.S_CODE == loc);
                if (location != null)
@@ -258,8 +257,30 @@
                    location.S_LOCK_STATE = "无";
                    location.N_LOCK_STATE = 0;

                    var containerList = new List<TN_Container>();
                    foreach (var item in lcrList) {
                        // 针对容器类型添加的新逻辑
                        var cntr = db.Queryable<TN_Container>()
                            .Where(c => c.S_CODE == item.S_CNTR_CODE).First();
                        if (cntr == null) {
                            LogHelper.Info($"货位解绑时，容器{item.S_CNTR_CODE}没有在容器信息表中查到，这里根据货位容器关系添加");
                            containerList.Add(new TN_Container {
                                S_CODE = item.S_CNTR_CODE,
                                S_TYPE = item.S_CNTR_TYPE,
                            });
                        }
                    }

                    using (var tran = db.Ado.UseTran())
                    {
                        if (containerList.Count > 0) {
                            if (db.Insertable<TN_Container>(containerList).ExecuteCommand() <= 0) {
                                LogHelper.Info($"插入容器信息表失败" + JsonConvert.SerializeObject(containerList));
                                tran.RollbackTran();
                                return "货位解绑容器失败，" + logs;
                            }
                        }

                        if (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
                        {
                            LogHelper.Info($"删除货位容器关系表成功，{log}");
@@ -326,14 +347,14 @@
                foreach (var item in cntrs)
                {
                    // 针对容器类型添加的新逻辑
                    var cntrItemRel = db.Queryable<TN_Container_ItemType>()
                        .Where(c => c.S_CNTR_CODE == item).First();
                    if (cntrItemRel == null) {
                        LogHelper.Info($"货位解绑时，容器{item}没有在容器物料信息关系表中查到");
                    var cntr = db.Queryable<TN_Container>()
                        .Where(c => c.S_CODE == item).First();
                    if (cntr == null) {
                        LogHelper.Info($"货位解绑时，容器{item}没有在容器信息表中查到，不记录容器类型");
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
                    }
                    else {
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_CNTR_TYPE = cntrItemRel.S_CNTR_TYPE });
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_CNTR_TYPE = cntr.S_TYPE });
                    }
                }


 wms/WCSHelper.cs

@@ -167,7 +167,7 @@
        internal static void Begin(TN_Task task, string forklift_no) {
            var db = new SqlHelper<TN_Task>().GetInstance();
            if (task != null) {
                if (task.N_B_STATE == 1) {
                if (task.N_B_STATE == 1 || task.N_B_STATE == 0) { // 添加当task状态为0时也可以触发
                    task.N_B_STATE = 2;
                    task.S_B_STATE = TN_Task.GetStateStr(task.N_B_STATE);
                    task.T_START_TIME = System.DateTime.Now;