内部联调，修复问题，添加取消任务功能

kazelee

2025-05-23 c4e968254a4f1c5d538a9fd91284b4843ea08198

 api/ApiHelper.cs

@@ -31,7 +31,7 @@
                    .First();

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

                // 容器 ID 和 物料 ID 未指定，由系统直接生成
@@ -45,6 +45,7 @@
                    S_LOC_CODE = startLoc.S_CODE,
                    S_CNTR_CODE = cntId,
                };

                var cgDetail = new TN_CG_Detail() {
                    S_ITEM_CODE = cgId,
                    S_CNTR_CODE = cntId,
@@ -65,7 +66,7 @@
                }

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

                // 无论是否选择终点货架，都等到称重之后再计算终点货位
                using (var tran = db.Ado.UseTran()) {
@@ -122,6 +123,7 @@
            try {
                // 任务号存在：终点货架和终点位置为空，且任务为产品入库(PDA)
                var task = db.Queryable<TN_Task>()
                    .Where(a => a.S_CODE == model.TaskNo)
                    .Where(a => a.S_B_STATE == "取货完成" && a.S_TYPE == TaskName.产品入库)
                    .OrderBy(a => a.T_CREATE, SqlSugar.OrderByType.Desc).First();

@@ -141,22 +143,27 @@
                }

                var endLoc = new TN_Location();
                if (cgDetail.F_QTY > 1500) {
                    // 重量超过1.5t，需要选择1-3层货架
                if (cgDetail.F_QTY > 2000) {
                    // 重量超过2t，报错
                    return BuildSimpleResult(8, $"物料重量{cgDetail.F_QTY}超过2t");
                }
                else if (cgDetail.F_QTY > 1500) {
                    // 重量超过1.5t，需要选择1-2层货架
                    endLoc = db.Queryable<TN_Location>()
                        .Where(a => a.S_CODE == model.endLoc)
                        .Where(a => a.S_CODE == model.EndLoc)
                        .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y")
                        .Where(a => a.N_CURRENT_NUM == 0)
                        .Where(a => Settings.Areas[1].Contains(a.S_AREA_CODE))
                        .Where(a => a.N_LAYER <= 3)
                        .Where(a => a.N_LAYER <= 2)
                        .First();
                }
                else if (cgDetail.F_QTY > 0) {
                    endLoc = db.Queryable<TN_Location>()
                        .Where(a => a.S_CODE == model.endLoc)
                        .Where(a => a.S_CODE == model.EndLoc)
                        .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y")
                        .Where(a => a.N_CURRENT_NUM == 0)
                        .Where(a => Settings.Areas[1].Contains(a.S_AREA_CODE))
                        .OrderBy(a => a.N_LAYER > 2 ? 0 : 1) // 优先取大于2的
                        //.Where(a => a.N_LAYER <= 3)
                        .First();
                }
@@ -166,7 +173,7 @@

                // 没有符合条件的货位
                if (endLoc == null) {
                    return BuildSimpleResult(6, $"货位{model.endLoc}不存在，或不满足称重放置要求");
                    return BuildSimpleResult(6, $"货位{model.EndLoc}不存在，或不满足称重放置要求");
                }

                // 修改任务终点为PDA指定终点
@@ -230,8 +237,8 @@
                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                LocationHelper.LockLoc(ref startLoc, 1); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 2); // 终点入库锁
                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -294,8 +301,8 @@

                var cntId = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                LocationHelper.LockLoc(ref startLoc, 1); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 2); // 终点入库锁
                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -322,6 +329,90 @@
                    return BuildSimpleResult(0,
                        $"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货架 {endLoc.S_CODE}");
                }
            }
            catch (Exception ex) {
                return BuildSimpleResult(1, $"发生了异常：{ex.Message}");
            }
        }

        public static SimpleResult CancelTask(CancelTaskInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            try {
                var task = db.Queryable<TN_Task>()
                    .Where(a => a.S_CODE == model.TaskNo)
                    .First();

                if (task == null) {
                    return BuildSimpleResult(2, $"任务号{model.TaskNo}不存在");
                }

                if (task.N_B_STATE == 0 && task.S_B_STATE == TN_Task.GetStateStr(0)
                    || task.N_B_STATE == 1 && task.S_B_STATE == TN_Task.GetStateStr(1)) {

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

                    var starloc = 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 (starloc != null) {
                        starloc.N_LOCK_STATE = 0;
                        starloc.S_LOCK_STATE = "无";
                        //starloc.N_CURRENT_NUM = 0;
                        starloc.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;
                    }

                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable<TN_Location>(starloc).ExecuteCommand() <= 0) {
                            tran.RollbackTran();

                            info = $"任务{task.S_CODE}取消失败";

                            return BuildSimpleResult(0, info);
                        }

                        if (endloc != null) {
                            if (db.Updateable<TN_Location>(endloc).ExecuteCommand() <= 0) {
                                tran.RollbackTran();

                                info = $"任务{task.S_CODE}取消失败";

                                return BuildSimpleResult(0, info);
                            }
                        }

                        if (db.Updateable<TN_Task>(task).ExecuteCommand() <= 0) {
                            if (db.Updateable<TN_Location>(endloc).ExecuteCommand() <= 0) {
                                tran.RollbackTran();

                                info = $"任务{task.S_CODE}取消失败";

                                return BuildSimpleResult(0, info);
                            }
                        }

                        tran.CommitTran();

                        info = $"任务{task.S_CODE}取消成功";

                        return BuildSimpleResult(0, info);
                    }

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

            }
            catch (Exception ex) {
                return BuildSimpleResult(1, $"发生了异常：{ex.Message}");
@@ -496,8 +587,8 @@

                var cntID = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntID, taskName);
                LocationHelper.LockLoc(ref startLoc, 1); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 2); // 终点入库锁
                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -559,8 +650,8 @@

                var cntID = locCntrRel.S_CNTR_CODE;
                var task = WCSHelper.BuildTask(startLoc, endLoc, cntID, taskName);
                LocationHelper.LockLoc(ref startLoc, 1); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 2); // 终点入库锁
                LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
                LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {