kazelee
2025-07-03 736fb5782d375908a9097780743913193ffde494
完善部分日志内容,优化查询语句和日志打印代码
1 文件已重命名
3个文件已添加
6个文件已修改
3个文件已删除
505 ■■■■ 已修改文件
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/02c9955a-b11d-4346-b51b-88bd67310ee5.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/52b1bf39-572c-4392-9ec9-d2acb98174ba.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/7a460209-dbc4-48fb-b898-02f23d93e759.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a24f5716-1832-4d56-a0d6-fdd4886a51ea.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e75c296c-c8ea-460c-b254-e5337f896e37.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.DSZSH.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApiHelper.cs 305 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/ApiModel.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/MoboxController.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
util/LogBuilder.cs 99 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
util/Settings.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
wms/LocationHelper.cs 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/02c9955a-b11d-4346-b51b-88bd67310ee5.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/138ad012-fc4b-4ce6-afd4-7057b1c2cecf.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/52b1bf39-572c-4392-9ec9-d2acb98174ba.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/7a460209-dbc4-48fb-b898-02f23d93e759.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/a24f5716-1832-4d56-a0d6-fdd4886a51ea.vsidx
Binary files differ
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e75c296c-c8ea-460c-b254-e5337f896e37.vsidx
Binary files differ
HH.WCS.Mobox3.DSZSH.csproj
@@ -244,6 +244,7 @@
    <Compile Include="models\TN_SpotCheck_Detail.cs" />
    <Compile Include="models\TN_Spot_Check.cs" />
    <Compile Include="process\TaskProcess.cs" />
    <Compile Include="util\LogBuilder.cs" />
    <Compile Include="util\SqlHelper.cs" />
    <Compile Include="models\TN_Outbound_Order.cs" />
    <Compile Include="models\TN_Outbound_Detail.cs" />
api/ApiHelper.cs
@@ -27,106 +27,74 @@
        /// <returns></returns>
        public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            var taskInfo = Settings.GetTaskInfo(ETask.M满箱下线入库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            var taskInfo = ETask.M满箱下线入库.Info();
            const string preLog = "API:满箱下线入库:";
            const string cntrType = "好运箱";
            try {
                if (model.Num <= 0) {
                    info = $"物料数量'{model.Num}'不合法:物料数量应该大于0";
                    LogHelper.Info(info);
                    return NewSimpleResult(400, info);
                    return NewSimpleResult(400, preLog + $"物料数量'{model.Num}'不合法!要求:物料数量>0");
                }
                var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检").First(); // TODO model 中 数量、规格是否也参与比对 待后续要求
                // TODO model 中 数量、规格是否也参与比对 待后续要求
                var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "待检").First();
                if (cgDetail == null) {
                    info = $"PDA扫码物料信息与贴标机传递的信息不一致:" + JsonConvert.SerializeObject(model);
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                    return NewSimpleResult(1, preLog + $"没有在货品明细表中找到[物料编码='{model.ItemCode}',批次号='{model.BatchNo}']的物料!请检查:PDA扫码物料信息与贴标机传递的信息是否一致!要求:物料状态='待检';");
                }
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc)
                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .First();
                var startLoc = LocationHelper.Query(db, 0, 0, taskInfo.StartAreas, model.StartLoc).First();
                if (startLoc == null) {
                    info = $":没有找到起点货位'{model.StartLoc}'!要求:未上锁、数量=0、货区属于[{string.Join(", ", startAreas)}]";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(2, LogBuilder.StartLocNotFound(0, 0, taskInfo.StartAreas, model.StartLoc, preLog));
                }
                startLoc.N_CURRENT_NUM = 1; // 绑定后
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                    S_CNTR_TYPE = "好运箱",
                    S_CNTR_TYPE = cntrType,
                };
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .OrderBy(l => new { l.N_LAYER }).First();
                // Order:按货位层数,从小到大排列
                var endLoc = LocationHelper.Query(db, 0, 0, taskInfo.EndAreas).OrderBy(l => new { l.N_LAYER }).First();
                if (endLoc == null) {
                    info = $"没有找到合适的终点货位,需要满足:未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                    return NewSimpleResult(3, LogBuilder.EndLocNotFound(0, 0, taskInfo.EndAreas, pre: preLog));
                }
                LocationHelper.LockStartLoc(ref startLoc);
                LocationHelper.LockEndLoc(ref endLoc);
                var cntId = locCntrRel.S_CNTR_CODE; // 容器号
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
                using (var tran = db.Ado.UseTran()) {
                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        info = $"插入货位容器绑定表失败:" + JsonConvert.SerializeObject(locCntrRel);
                        tran.RollbackTran();
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"插入[货位容器绑定表]失败!" + JsonConvert.SerializeObject(locCntrRel));
                    }
                    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();
                        info = $"生成任务'{taskName}'失败:更新起点货位{startLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"更新起点货位'{startLoc.S_CODE}'锁状态失败!");
                    }
                    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}'失败:更新终点货位{endLoc.S_CODE}锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"更新终点货位'{endLoc.S_CODE}'锁状态失败!");
                    }
                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, preLog + $"生成任务'{taskInfo.TaskName}'失败!任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}");
                    }
                    tran.CommitTran();
                    info = $"生成任务'{taskName}'成功,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(0, LogBuilder.CreateTaskSuccess(task, preLog));
                }
            }
            catch (Exception ex) {
                info = $"发生了异常:{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(-1, info);
                return NewSimpleResult(-1, preLog + $"发生了异常:{ex.Message}", false);
            }
        }
@@ -141,58 +109,35 @@
        /// <returns></returns>
        public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            var taskInfo = Settings.GetTaskInfo(ETask.K空托入库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            var cntrType = "托盘";
            var taskInfo = ETask.K空托入库.Info();
            const string pre = "API:空托入库:";
            const string cntrType = "托盘";
            try {
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc)
                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .First();
                var startLoc = LocationHelper.Query(db, 0, 0, taskInfo.StartAreas, model.StartLoc).First();
                if (startLoc == null) {
                    info = $"没有找到起点货位'{model.StartLoc}',或不具备起点取货要求:未上锁、绑定前无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(1, info);
                    return NewSimpleResult(1, LogBuilder.StartLocNotFound(0, 0, taskInfo.StartAreas, model.StartLoc, pre));
                }
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言,S_CODE就是主键,维护时必定唯一
                    .First();
                // 对于前台程序而言,S_CODE就是主键,维护时必定唯一
                var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
                if (cntr == null) {
                    info = $"容器'{model.CntrCode}'在【容器表】中不存在,请在前台页面中维护!";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(2, pre + $"容器'{model.CntrCode}'在[容器表]中不存在,请在前台页面中维护!");
                }
                if (cntr.S_TYPE != cntrType) { // 空托入库
                    info = $"容器'{model.CntrCode}'在【容器表】中的类型为'{cntr.S_TYPE}',与输入的容器类型'{cntrType}'不同!";
                    LogHelper.Info(info);
                    return NewSimpleResult(3, info);
                if (cntr.S_TYPE != cntrType) {
                    return NewSimpleResult(3, pre + $"容器'{model.CntrCode}'在[容器表]中的类型为'{cntr.S_TYPE}',与输入的容器类型'{cntrType}'不同!");
                }
                // 假定人工不会将有物料的箱子放在空箱入库接驳位,没有必要检查
                // 如果人工将出库后的托盘入库,这时物料信息并没有删除,需要将托盘物料的关系解除
                var cgDetailOld = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_CNTR_CODE == model.CntrCode)
                    .First();
                var cgDetailOld = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == model.CntrCode).First();
                // 如果人工将出库后的托盘入库,此时容器仍然与旧的出库货位绑定,需要检查
                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == model.CntrCode)
                    .First();
                var locCntrRelOld = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == model.CntrCode).First();
                TN_Location locOld = null;
                if (locCntrRelOld != null) { // 如果需要解绑容器货位,也需要修改货位信息
                    locOld = db.Queryable<TN_Location>()
                        .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
                    locOld = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
                    if (locOld != null) {
                        locOld.N_CURRENT_NUM = 0; // 如果旧货位存在,将旧货位的数量设置为 0
                        locOld.T_MODIFY = DateTime.Now;
@@ -200,97 +145,69 @@
                }
                // 绑定货位和容器号(PDA在接驳位绑定)
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cntr.S_CODE,
                    S_CNTR_TYPE = cntrType, // 空托入库
                };
                var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cntr.S_CODE, S_CNTR_TYPE = cntrType };
                startLoc.N_CURRENT_NUM = 1; // 绑定后
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 暂定选择最低层按区位顺序入库,后面待修改
                    .First();
                // TODO 暂定选择最低层按区位顺序入库,后面待修改
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                if (endLoc == null) {
                    info = $"没有找到合适的终点货位!需要:未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                    return NewSimpleResult(4, pre + $"没有找到合适的终点货位!要求:(1)未上锁;(2)数量=0;(3)货区属于['{string.Join("','", taskInfo.EndAreas)}'];");
                }
                LocationHelper.LockStartLoc(ref startLoc);
                LocationHelper.LockEndLoc(ref endLoc);
                var cntId = locCntrRel.S_CNTR_CODE; // 容器号
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
                using (var tran = db.Ado.UseTran()) {
                    if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"删除【旧物料信息】失败:" + JsonConvert.SerializeObject(cgDetailOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"删除[旧物料信息]失败!" + JsonConvert.SerializeObject(cgDetailOld));
                    }
                    if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"删除【旧货位容器关系】失败:" + JsonConvert.SerializeObject(locCntrRelOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"删除[旧货位容器关系]失败!" + JsonConvert.SerializeObject(locCntrRelOld));
                    }
                    if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"更新旧货位【容器数量】失败:" + JsonConvert.SerializeObject(locOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"更新[旧货位][容器数量]失败!" + JsonConvert.SerializeObject(locOld));
                    }
                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"插入【货位容器关系】失败:" + JsonConvert.SerializeObject(locCntrRel);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"插入[货位容器关系]失败:" + JsonConvert.SerializeObject(locCntrRel));
                    }
                    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) {
                    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();
                        info = $"生成任务'{taskName}'失败:更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"更新起点货位'{startLoc.S_CODE}'锁状态失败!");
                    }
                    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) {
                    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}'失败:更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"更新终点货位'{endLoc.S_CODE}'锁状态失败!");
                    }
                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"生成任务'{taskInfo.TaskName}'失败!任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}");
                    }
                    tran.CommitTran();
                    info = $"生成任务'{taskName}'成功,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(0, pre + $"生成任务'{taskInfo.TaskName}'成功!任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}");
                }
            }
            catch (Exception ex) {
                info = $"发生了异常:{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(-1, info);
                return NewSimpleResult(-1, pre + $"发生了异常:{ex.Message}", false);
            }
        }
        /// <summary>
        /// 空箱入库(好运箱)
        /// 空箱入库
        /// </summary>
        /// <remarks>
        /// 人工:空箱==搬运==>入库接驳位,需要新绑定容器货位<br/>
@@ -299,150 +216,100 @@
        /// <returns></returns>
        public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            var taskInfo = Settings.GetTaskInfo(ETask.K空箱入库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            var taskInfo = ETask.K空箱入库.Info();
            const string pre = "API:空箱入库:";
            const string cntrType = "好运箱";
            try {
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc)
                    .Where(l => startAreas.Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0) // 绑定前
                    .First();
                var startLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && taskInfo.StartAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).First();
                if (startLoc == null) {
                    info = $"没有找到起点货位'{model.StartLoc}',或不满足要求:未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(1, pre + $"没有找到起点货位'{model.StartLoc}'!要求:(1)未上锁;(2)数量=0;(3)货区属于['{string.Join("','", taskInfo.StartAreas)}'];");
                }
                var cntr = db.Queryable<TN_Container>()
                    .Where(c => c.S_CODE == model.CntrCode) // 对于前台程序而言,S_CODE就是主键,维护时必定唯一
                    .First();
                // 对于前台程序而言,S_CODE就是主键,维护时必定唯一
                var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == model.CntrCode).First();
                if (cntr == null) {
                    info = $"容器'{model.CntrCode}'在容器表中不存在,请在前台页面中维护!";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(2, pre + $"容器'{model.CntrCode}'在[容器表]中不存在,请在前台页面中维护!");
                }
                if (cntr.S_TYPE != cntrType) {
                    info = $"容器'{model.CntrCode}'在容器表中的类型为'{cntr.S_TYPE}',与输入的容器类型'{cntrType}'不同!";
                    LogHelper.Info(info);
                    return NewSimpleResult(2, info);
                    return NewSimpleResult(3, pre + $"容器'{model.CntrCode}'在[容器表]中的类型为'{cntr.S_TYPE}',与输入的容器类型'{cntrType}'不同!");
                }
                // 假定人工不会将有物料的箱子放在空箱入库接驳位,没有必要检查
                // 如果人工将出库后的托盘入库,这时物料信息并没有删除,需要将托盘物料的关系解除
                var cgDetailOld = db.Queryable<TN_CG_Detail>()
                    .Where(d => d.S_CNTR_CODE == model.CntrCode).First();
                var cgDetailOld = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == model.CntrCode).First();
                // 如果人工将出库后的托盘入库,此时容器仍然与旧的出库货位绑定,需要检查
                var locCntrRelOld = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == model.CntrCode).First();
                var locCntrRelOld = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == model.CntrCode).First();
                TN_Location locOld = null;
                if (locCntrRelOld != null) { // 如果需要解绑容器货位,也需要修改货位信息
                    locOld = db.Queryable<TN_Location>()
                        .Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
                    locOld = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).First();
                    if (locOld != null) {
                        locOld.N_CURRENT_NUM = 0; // 如果旧货位存在,将旧货位的数量设置为 0
                        locOld.T_MODIFY = DateTime.Now;
                    }
                }
                // 绑定货位和容器号
                var locCntrRel = new TN_Loc_Container {
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cntr.S_CODE,
                    S_CNTR_TYPE = cntrType,
                };
                // 绑定货位和容器号(PDA在接驳位绑定)
                var locCntrRel = new TN_Loc_Container { S_LOC_CODE = startLoc.S_CODE, S_CNTR_CODE = cntr.S_CODE, S_CNTR_TYPE = cntrType };
                startLoc.N_CURRENT_NUM = 1; // 绑定后
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => endAreas.Contains(l.S_AREA_CODE))
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .OrderBy(l => new { l.N_LAYER }) // TODO 暂定选择最低层顺序入库,后面待修改
                    .First();
                // TODO 暂定选择最低层按区位顺序入库,后面待修改
                var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && taskInfo.EndAreas.Contains(l.S_AREA_CODE) && l.N_CURRENT_NUM == 0).OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }).First();
                if (endLoc == null) {
                    info = $"没有找到合适的终点货位!需要:未上锁、无货物";
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                    return NewSimpleResult(4, pre + $"没有找到合适的终点货位!要求:(1)未上锁;(2)数量=0;(3)货区属于['{string.Join("','", taskInfo.EndAreas)}'];");
                }
                var cntId = locCntrRel.S_CNTR_CODE;
                LocationHelper.LockStartLoc(ref startLoc);
                LocationHelper.LockEndLoc(ref endLoc);
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                var cntId = locCntrRel.S_CNTR_CODE; // 容器号
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskInfo.TaskName);
                using (var tran = db.Ado.UseTran()) {
                    // 存在旧【物料明细】表时,删除旧表
                    if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"删除【旧物料信息】失败:" + JsonConvert.SerializeObject(cgDetailOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                    }
                    // 存在旧【货位容器绑定】表时,删除旧表
                    if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"删除【旧货位容器关系】失败:" + JsonConvert.SerializeObject(locCntrRelOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"删除[旧物料信息]失败!" + JsonConvert.SerializeObject(cgDetailOld));
                    }
                    if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
                    if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"更新旧货位【容器数量】失败:" + JsonConvert.SerializeObject(locOld);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"删除[旧货位容器关系]失败!" + JsonConvert.SerializeObject(locCntrRelOld));
                    }
                    if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return NewSimpleResult(500, pre + $"更新[旧货位][容器数量]失败!" + JsonConvert.SerializeObject(locOld));
                    }
                    if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"插入【货位容器关系】失败:" + JsonConvert.SerializeObject(locCntrRel);
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"插入[货位容器关系]失败:" + JsonConvert.SerializeObject(locCntrRel));
                    }
                    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) {
                    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();
                        info = $"生成任务'{taskName}'失败:更新起点货位'{startLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"更新起点货位'{startLoc.S_CODE}'锁状态失败!");
                    }
                    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) {
                    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}'失败:更新终点货位'{endLoc.S_CODE}'锁状态失败";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"更新终点货位'{endLoc.S_CODE}'锁状态失败!");
                    }
                    if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        info = $"生成任务'{taskName}'失败,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        return NewSimpleResult(500, info);
                        return NewSimpleResult(500, pre + $"生成任务'{taskInfo.TaskName}'失败!任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}");
                    }
                    tran.CommitTran();
                    info = $"生成任务'{taskName}'成功,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                    LogHelper.Info(info);
                    return NewSimpleResult(0, info);
                    return NewSimpleResult(0, pre + $"生成任务'{taskInfo.TaskName}'成功!任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}");
                }
            }
            catch (Exception ex) {
                info = $"发生了异常:{ex.Message}";
                LogHelper.InfoEx(ex);
                return NewSimpleResult(-1, info);
                return NewSimpleResult(-1, pre + $"发生了异常:{ex.Message}", false);
            }
        }
api/ApiModel.cs
@@ -22,8 +22,10 @@
        /// </summary>
        /// <param name="code"></param>
        /// <param name="message"></param>
        /// <param name="log"></param>
        /// <returns></returns>
        public static SimpleResult NewSimpleResult(int code, string message) {
        public static SimpleResult NewSimpleResult(int code, string message, bool log = true) {
            if (log) { LogHelper.Info(message); }
            return new SimpleResult { resultCode = code, resultMsg = message };
        }
api/MoboxController.cs
@@ -21,9 +21,7 @@
        [HttpPost]
        [Route("goodpack-offline")]
        public SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
            var apiName = "满箱下线入库";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("满箱下线入库", model);
            return ApiHelper.GoodpackOffline(model);
        }
@@ -35,8 +33,7 @@
        [HttpPost]
        [Route("empty-inbound")]
        public SimpleResult EmptyInbound(EmptyInboundInfo model) {
            var apiName = "空托/空箱入库";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("空托/空箱入库", model);
            if (model.CntrType == "空托盘") {
                return ApiHelper.EmptyInboundPallet(model);
@@ -50,15 +47,14 @@
        }
        
        /// <summary>
        /// 托盘-空托上线(PDA)
        /// 空托上线
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("empty-online-pallet")]
        public SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            var apiName = "托盘-空托上线(PDA)";
            LogHelper.InfoApi(apiName, model);
            LogHelper.InfoApi("空托上线", model);
            return ApiHelper.EmptyOnlinePallet(model);
        }
util/LogBuilder.cs
New file
@@ -0,0 +1,99 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using HH.WCS.Mobox3.DSZSH.models;
using static HH.WCS.Mobox3.DSZSH.Config;
namespace HH.WCS.Mobox3.DSZSH.util {
    /// <summary>
    /// 打印日志内容构造器
    /// </summary>
    public static class LogBuilder {
        /// <summary>
        /// 没有找到起点货位
        /// </summary>
        /// <remarks>
        /// <b>lockStated</b> - 锁状态,默认为0,小于0时忽略<br/>
        /// <b>curNum</b> - 当前数量,默认为-1,小于0时忽略<br/>
        /// <b>areas</b> - 所在库区列表,默认为null,为null或为空时忽略<br/>
        /// <b>name</b> - 货位名称,默认为null,为null或为空时忽略
        /// </remarks>
        /// <param name="lockState">锁状态,默认为0,小于0时忽略</param>
        /// <param name="curNum">当前数量,默认为-1,小于0时忽略</param>
        /// <param name="areas">所在库区列表,默认为null,为null或为空时忽略</param>
        /// <param name="name">货位名称,默认为null,为null或为空时忽略</param>
        /// <param name="pre"></param>
        /// <returns></returns>
        public static string StartLocNotFound(int lockState = 0, int curNum = -1, List<string> areas = null, string name = null, string pre = "") {
            var res = string.Empty;
            if (string.IsNullOrEmpty(name)) { res = $"没有找到合适的起点货位!"; }
            else { res = $"没有找到起点货位'{name}'!"; }
            res += "要求:";
            if (lockState >= 0) { res += $"锁状态='{GetLockStateStr(lockState)}';"; }
            if (curNum >= 0) { res += $"当前容器数量={curNum};"; }
            if (areas != null && areas.Count != 0) { res += $"所在库区=['{string.Join("','", areas)}'];"; }
            return pre + res;
        }
        /// <summary>
        /// 没有找到终点货位
        /// </summary>
        /// <remarks>
        /// <b>lockStated</b> - 锁状态,默认为0,小于0时忽略<br/>
        /// <b>curNum</b> - 当前数量,默认为-1,小于0时忽略<br/>
        /// <b>areas</b> - 所在库区列表,默认为null,为null或为空时忽略<br/>
        /// <b>name</b> - 货位名称,默认为null,为null或为空时忽略
        /// </remarks>
        /// <param name="lockState">锁状态,默认为0,小于0时忽略</param>
        /// <param name="curNum">当前数量,默认为-1,小于0时忽略</param>
        /// <param name="areas">所在库区列表,默认为null,为null或为空时忽略</param>
        /// <param name="name">货位名称,默认为null,为null或为空时忽略</param>
        /// <param name="pre"></param>
        /// <returns></returns>
        public static string EndLocNotFound(int lockState = 0, int curNum = -1, List<string> areas = null, string name = null, string pre = "") {
            var res = string.Empty;
            if (string.IsNullOrEmpty(name)) { res = $"没有找到合适的终点货位!"; }
            else { res = $"没有找到终点货位'{name}'!"; }
            res += "要求:";
            if (lockState >= 0) { res += $"锁状态='{GetLockStateStr(lockState)}';"; }
            if (curNum >= 0) { res += $"当前容器数量={curNum};"; }
            if (areas != null && areas.Count != 0) { res += $"所在库区=['{string.Join("','", areas)}'];"; }
            return pre + res;
        }
        /// <summary>
        ///
        /// </summary>
        /// <param name="task"></param>
        /// <param name="pre"></param>
        /// <returns></returns>
        public static string CreateTaskSuccess(TN_Task task, string pre = "") {
            var res = $"生成任务'{task.S_TYPE}'成功!" +
                $"任务号='{task.S_CODE}',容器号='{task.S_CNTR_CODE}',起点='{task.S_START_LOC}',终点='{task.S_END_LOC}'";
            return pre + res;
        }
        public static string CreateTaskFail(TN_Task task, string pre = "") {
            var res = $"生成任务'{task.S_TYPE}'失败!" +
                $"任务号={task.S_CODE},容器号={task.S_CNTR_CODE},起点={task.S_START_LOC},终点={task.S_END_LOC}";
            return pre + res;
        }
        private static string GetLockStateStr(int lockState) {
            var str = "";
            switch (lockState) {
                case 0: str = "无"; break;
                case 1: str = "入库锁"; break;
                case 2: str = "出库锁"; break;
                case 3: str = "其它锁"; break;
            }
            return str;
        }
    }
}
util/Settings.cs
@@ -147,5 +147,17 @@
        public static string Name(this ETask eTask) {
            return Settings.TaskInfos[(int)eTask].TaskName;
        }
        public static Config.TaskInfo Info(this ETask eTask) {
            return Settings.TaskInfos[(int)eTask];
        }
        public static List<string> StartAreas(this ETask eTask) {
            return Settings.TaskInfos[(int)(eTask)].StartAreas;
        }
        public static List<string> EndAreas(this ETask eTask) {
            return Settings.TaskInfos[((int)eTask)].EndAreas;
        }
    }
}
wms/LocationHelper.cs
@@ -145,7 +145,7 @@
            if (loc != null && loc.N_LOCK_STATE == 0) {
                loc.N_LOCK_STATE = 2; // 起点出库锁
                loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 起点出库锁
                loc.S_LOCK_STATE = GetLockStateStr(2); // 起点出库锁
                loc.S_LOCK_OP = lockSource;
                loc.T_MODIFY = System.DateTime.Now;
            }
@@ -172,7 +172,7 @@
            if (loc != null && loc.N_LOCK_STATE == 0) {
                loc.N_LOCK_STATE = 1; // 终点出库锁
                loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 终点出库锁
                loc.S_LOCK_STATE = GetLockStateStr(1); // 终点出库锁
                loc.S_LOCK_OP = lockSource;
                loc.T_MODIFY = System.DateTime.Now;
            }
@@ -180,22 +180,38 @@
            return true;
        }
        /// <summary>
        /// 构建货位查询表达式:当前数量、货区、名称
        /// </summary>
        /// <param name="db"></param>
        /// <param name="nCurrentNum"></param>
        /// <param name="areas"></param>
        /// <param name="name"></param>
        /// <returns></returns>
        public static ISugarQueryable<TN_Location> GetLocQuery(SqlSugarClient db, int nCurrentNum = 0, List<string> areas = null, string name = null) {
            var query = db.Queryable<TN_Location>()
                .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == nCurrentNum);
        private static string GetLockStateStr(int lockState) {
            var str = "";
            switch (lockState) {
                case 0: str = "无"; break;
                case 1: str = "入库锁"; break;
                case 2: str = "出库锁"; break;
                case 3: str = "其它锁"; break;
            }
            return str;
        }
            if (areas != null && !areas.Any()) {
        /// <summary>
        /// 构建货位查询表达式:当前锁状态、数量、货区、名称(默认筛选已启用货位)
        /// </summary>
        /// <param name="db">调用区域的数据库Client</param>
        /// <param name="lockState">锁状态,默认为0,小于0时不筛选</param>
        /// <param name="curNum">当前数量,默认为-1,小于0时不筛选</param>
        /// <param name="areas">所在库区列表,默认为null,为null或为空时不筛选</param>
        /// <param name="name">货位名称,默认为null,为null或为空时不筛选</param>
        /// <returns></returns>
        public static ISugarQueryable<TN_Location> Query(SqlSugarClient db, int lockState = 0, int curNum = -1, List<string> areas = null, string name = null) {
            var query = db.Queryable<TN_Location>().Where(l => l.C_ENABLE == "Y"); // 已启用
            if (lockState >= 0) {
                query = query.Where(l => l.N_LOCK_STATE == lockState && l.S_LOCK_STATE == GetLockStateStr(lockState));
            }
            if (curNum >= 0) {
                query = query.Where(l => l.N_CURRENT_NUM == curNum);
            }
            if (areas != null && areas.Count == 0) {
                query = query.Where(l => areas.Contains(l.S_AREA_CODE));
            }
            if (!string.IsNullOrEmpty(name)) {
                query = query.Where(l => l.S_CODE == name);
            }
@@ -204,6 +220,32 @@
        }
        /// <summary>
        /// 构建货位查询的要求信息
        /// </summary>
        /// <param name="lockState"></param>
        /// <param name="curNum"></param>
        /// <param name="areas"></param>
        /// <returns></returns>
        public static string Require(int lockState = 0, int curNum = -1, List<string> areas = null) {
            var res = "货位要求:";
            var index = 1;
            if (lockState >= 0) {
                res += $"({index})锁状态='{GetLockStateStr(lockState)}';";
                index++;
            }
            if (curNum >= 0) {
                res += $"({index})当前容器数量={curNum};";
                index++;
            }
            if (areas != null && areas.Count != 0) {
                res += $"({index})所在库区=['{string.Join("','", areas)}'];";
                index++;
            }
            return res;
        }
        /// <summary>
        /// 取货完解锁起点,卸货完解锁终点,可检验锁的来源,也可以不校验
        /// </summary>
        /// <param name="loc"></param>