kazelee
2025-05-26 53d582ad41d8450b21045b2d862a532ecc57a9ba
api/ApiHelper.cs
@@ -45,6 +45,7 @@
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc) // 指定:起点货位号
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(l => l.N_CURRENT_NUM == 0) // 起点绑定前没有容器
                    .First();
                if (startLoc == null) {
@@ -59,12 +60,6 @@
                    S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                    S_CNTR_TYPE = "好运箱",
                };
                if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
                    info = $"插入货位容器关系失败:" + JsonConvert.SerializeObject(locCntrRel);
                    LogHelper.Info(info);
                    return NewSimpleResult(4, info);
                }
                // TODO 满箱入库算法待优化
                var endLoc = db.Queryable<TN_Location>()
@@ -87,6 +82,13 @@
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁
                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(4, info);
                    }
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        it.N_LOCK_STATE,
                        it.S_LOCK_STATE,
@@ -266,7 +268,9 @@
                // TODO 暂定选择最低层按区位顺序入库,后面待修改
                var endLoc = db.Queryable<TN_Location>()
                    .Where(a => Settings.AreaMap[AreaName.空托存放区].Contains(a.S_AREA_CODE))
                    .Where(l => Settings.AreaMap[AreaName.空托存放区].Contains(l.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .OrderBy(l => l.N_LAYER)
                    .First();
@@ -361,9 +365,11 @@
                // TODO 暂定选择最低层按区位顺序入库,后面待修改
                var endLoc = db.Queryable<TN_Location>()
                    .Where(a => Settings.AreaMap[AreaName.空箱存放区].Contains(a.S_AREA_CODE))
                    .OrderBy(l => l.N_LAYER)
                    .OrderBy(l => l.S_AREA_CODE).First();
                    .Where(l => Settings.AreaMap[AreaName.空箱存放区].Contains(l.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .OrderBy(l => new { l.N_LAYER })
                    .First();
                if (endLoc == null) {
                    return NewSimpleResult(4, $"暂时没有符合条件的终点放货位");
@@ -451,10 +457,10 @@
                }
                var endLoc = db.Queryable<TN_Location>()
                    .Where(a => Settings.AreaMap[AreaName.包装区].Contains(a.S_AREA_CODE))
                    .Where(l => Settings.AreaMap[AreaName.包装区].Contains(l.S_AREA_CODE))
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(a => a.N_CURRENT_NUM == 0) // 筛选:空货位
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(l => l.N_CURRENT_NUM == 0) // 筛选:空货位
                    .First();
                if (endLoc == null) {
@@ -542,10 +548,10 @@
                }
                var endLoc = db.Queryable<TN_Location>()
                    .Where(a => Settings.AreaMap[AreaName.包装区].Contains(a.S_AREA_CODE))
                    .Where(l => Settings.AreaMap[AreaName.包装区].Contains(l.S_AREA_CODE))
                    .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(l => l.N_CURRENT_NUM == 0)
                    .First();
                if (endLoc == null) {
@@ -707,7 +713,8 @@
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(l => l.N_CURRENT_NUM == 1)
                    .First();
                if (startLoc == null) {
@@ -719,16 +726,16 @@
                var endLoc = new TN_Location();
                if (locCntrRel.S_CNTR_TYPE == "托盘") {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(a => Settings.AreaMap[AreaName.满托存放区].Contains(a.S_AREA_CODE))
                        .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                        .Where(a => a.N_CURRENT_NUM == 0) // 筛选:空货位
                        .Where(l => Settings.AreaMap[AreaName.满托存放区].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();
                }
                else if (locCntrRel.S_CNTR_TYPE == "好运箱") {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(a => Settings.AreaMap[AreaName.满箱存放区].Contains(a.S_AREA_CODE))
                        .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                        .Where(a => a.N_CURRENT_NUM == 0)
                        .Where(l => Settings.AreaMap[AreaName.满箱存放区].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();
                }
                else {
@@ -827,7 +834,8 @@
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(l => l.N_CURRENT_NUM == 1)
                    .First();
                if (startLoc == null) {
@@ -839,7 +847,8 @@
                var endLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_AREA_CODE == model.EndArea)
                    .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(a => a.N_CURRENT_NUM == 0).First();
                    .Where(a => a.N_CURRENT_NUM == 0)
                    .First();
                if (endLoc == null) {
                    return NewSimpleResult(3, "查询:没有找到合适的终点货位");
@@ -915,6 +924,7 @@
                var startLoc = db.Queryable<TN_Location>()
                    .Where(l => l.S_CODE == model.StartLoc)
                    .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选:未上锁
                    .Where(l => l.N_CURRENT_NUM == 1)
                    .First();
                var locCntrRel = db.Queryable<TN_Loc_Container>()