测试修复轮询出库、抽检流程的问题

kazelee

2025-05-19 b079910e5de15863c26e479ffab15cc45d706f1a

 ServiceCore/ShiftCore.cs

@@ -23,13 +23,13 @@
                    .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc).First();

                if (order == null) {
                    LogHelper.Info("轮询：暂无待执行的移库单");
                    LogHelper.Info("轮询--移库--暂无待执行的Order");
                    return;
                }

                if (db.Queryable<TN_Shift_Detail>()
                    .First(d => d.S_NO == order.S_NO && d.N_B_STATE == SpotStateCode.任务执行中) != null) {
                    LogHelper.Debug("轮询：上一个移库任务仍在进行中");
                    LogHelper.Debug("轮询--移库--上一个任务仍在进行中");
                    return;
                }

@@ -40,7 +40,7 @@
                if (detail == null) {
                    //order.N_B_STATE = SpotStateCode.任务执行中;

                    LogHelper.Info("轮询移库：暂无待执行的任务");
                    LogHelper.Info("轮询--移库--暂无待执行的任务");
                    return;
                }

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

                if (startLocCntrRel == null) {
                    LogHelper.Info("轮询：移库：没有找到合适的起点货位");
                    LogHelper.Info("轮询--移库：没有找到合适的起点货位！");
                    return;
                }

@@ -59,7 +59,7 @@
                    .Where(ExprHelper.LocIsEmpty).First();

                if (endLoc == null) {
                    LogHelper.Info("轮询：出库：没有找到合适的终点货位");
                    LogHelper.Info("轮询--出库：没有找到合适的终点货位！");
                    return;
                }

@@ -67,16 +67,15 @@
                    detail.N_B_STATE = SpotStateCode.任务执行中;
                    if (db.Updateable<TN_Shift_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        LogHelper.Info($"轮询：出库：更新失败：修改明细表状态为完成");
                        LogHelper.Info($"轮询--出库：修改明细表状态为完成--失败！");
                    }

                    if (TaskHelper.LogCreateTask(startLocCntrRel.S_LOC_CODE, startLocCntrRel.S_CNTR_CODE,
                    if (!TaskHelper.LogCreateTask(startLocCntrRel.S_LOC_CODE, startLocCntrRel.S_CNTR_CODE,
                        endLoc.S_CODE, TaskName.成品胶出库)) {
                        tran.CommitTran();
                    }
                    else {
                        tran.RollbackTran();
                    }

                    tran.CommitTran();
                }
            }
            catch (Exception ex) {
@@ -85,28 +84,39 @@
        }

        public static void UpdateTaskState(int spotStateCode) {

            var db = DbHelper.GetDbClient();

            var detail = db.Queryable<TN_Shift_Detail>()
                .First(d => d.N_B_STATE == SpotStateCode.任务执行中);

            if (detail == null) {
                LogHelper.Info("当前没有执行中的移库单明细项目");
                LogHelper.Info("移库--AGV任务完成--查询Detail：当前没有 执行中 的Detail表！");
                return;
            }

            using (var tran = db.Ado.UseTran()) {
                detail.N_B_STATE = spotStateCode;
                db.Updateable<TN_Shift_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand();
                if (db.Updateable<TN_Shift_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
                    tran.RollbackTran();
                    LogHelper.Info("移库--AGV任务完成：修改Detail状态 N_B_STATE 为 3任务执行完成 失败！");
                    return;
                }

                if (db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO && d.N_B_STATE == 2) ==
                    db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO)) {
                var finishedCount = db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO && d.N_B_STATE == 3);
                var allCount = db.Queryable<TN_Shift_Detail>().Count(d => d.S_NO == detail.S_NO);

                LogHelper.Info($"移库--AGV任务完成：统计任务已完成：{finishedCount} / {allCount}");

                if (finishedCount == allCount) { // 当前order下的detail，任务都已经完成

                    if (db.Updateable<TN_Shift_Order>().SetColumns(it => it.N_B_STATE == SpotStateCode.任务执行完成)
                        .Where(it => it.S_NO == detail.S_NO)
                        .ExecuteCommand() <= 0) {

                        tran.RollbackTran();
                        LogHelper.Info("修改Order状态错误");
                        LogHelper.Info("移库--AGV任务完成--所有任务完成时：修改Order状态 N_B_STATE 为 3任务执行完成 失败！");
                        return;
                    }
                }