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

kazelee

2025-05-19 b079910e5de15863c26e479ffab15cc45d706f1a

 ServiceCore/OutboundCore.cs

@@ -2,8 +2,9 @@

using HH.WCS.Mobox3.DSZSH.Consts;
using HH.WCS.Mobox3.DSZSH.Helpers;
using HH.WCS.Mobox3.DSZSH.Helpers.Model;
using HH.WCS.Mobox3.DSZSH.Models;

using Newtonsoft.Json;

namespace HH.WCS.Mobox3.DSZSH.ServiceCore {
    public class OutboundCore {
@@ -15,42 +16,35 @@
                    .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc).First();

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

                if (db.Queryable<TN_Outbound_Detail>()
                    .First(d => d.S_NO == order.S_NO && d.N_B_STATE == SpotStateCode.任务执行中) != null) {
                    LogHelper.Debug("轮询：上一个出库任务仍在进行中");
                var lastDetail = db.Queryable<TN_Outbound_Detail>()
                    .First(d => d.S_OO_NO == order.S_NO && d.N_B_STATE == SpotStateCode.任务执行中);

                if (lastDetail != null) {
                    LogHelper.Info($"轮询--出库--上一个任务仍在进行中：" + JsonConvert.SerializeObject(lastDetail));
                    return;
                }

                var detail = db.Queryable<TN_Outbound_Detail>()
                    .Where(d => d.S_NO == order.S_NO && d.N_B_STATE == SpotStateCode.已执行待生成任务)
                    .Where(d => d.S_OO_NO == order.S_NO && d.N_B_STATE == SpotStateCode.已执行待生成任务)
                    .OrderBy(d => d.T_CREATE, SqlSugar.OrderByType.Asc).First();

                if (detail == null) {
                    //order.N_B_STATE = SpotStateCode.任务执行中;

                    LogHelper.Info("轮询出库：暂无待执行的任务");
                    LogHelper.Info($"轮询--出库--当前Order '{order.S_NO}' 暂无待执行的任务");
                    return;
                }

                var startLocCntrRel = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail>
                    ((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE)
                    // 筛选要求的物料编码和批次号
                    .Where((l, c, d) => d.S_CG_ID == detail.S_CG_ID && d.S_BATCH_NO == detail.S_BATCH_NO)
                    // 如果不是强制出库，物料状态必须必须合格
                    // 否则，只要不是 正在检验 的物料即可
                    .Where((l, c, d) => (detail.N_FORCE == 0 && d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "合格")
                        || (detail.N_FORCE != 0 && d.N_ITEM_STATE != 3 && d.S_ITEM_STATE != "正在检验"))
                    // 排序：数字越小越优先，合格＞待检＞不合格
                    .OrderBy((l, c, d) => d.N_ITEM_STATE)
                    .OrderBy(l => l.N_LAYER)
                    .Select((l, c) => c).First();
                var startLocCntrRel = db.Queryable<TN_Loc_Container>()
                    .Where(c => c.S_CNTR_CODE == detail.S_CNTR_CODE)
                    .First();

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

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

                if (endLoc == null) {
                    LogHelper.Info("轮询：出库：没有找到合适的终点货位");
                    LogHelper.Info($"轮询--出库：没有找到合适的终点货位！S_NO为 '{detail.S_OO_NO}'，要求Area为 '{detail.S_END_AREA}'");
                    return;
                }

@@ -68,16 +62,15 @@
                    detail.N_B_STATE = SpotStateCode.任务执行中;
                    if (db.Updateable<TN_Outbound_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) {
@@ -86,28 +79,39 @@
        }

        public static void UpdateTaskState(int spotStateCode) {
            
            var db = DbHelper.GetDbClient();

            var detail = db.Queryable<TN_Outbound_Detail>()
                    .First(d => d.N_B_STATE == SpotStateCode.任务执行中);
                .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_Outbound_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand();
                if (db.Updateable<TN_Outbound_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_Outbound_Detail>().Count(d => d.S_NO == detail.S_NO && d.N_B_STATE == 2) ==
                    db.Queryable<TN_Outbound_Detail>().Count(d => d.S_NO == detail.S_NO)) {
                var finishedCount = db.Queryable<TN_Outbound_Detail>().Count(d => d.S_OO_NO == detail.S_OO_NO && d.N_B_STATE == 3);
                var allCount = db.Queryable<TN_Outbound_Detail>().Count(d => d.S_OO_NO == detail.S_OO_NO);

                    if (db.Updateable<TN_Check_Order>().SetColumns(it => it.N_B_STATE == SpotStateCode.任务执行完成)
                        .Where(it => it.S_NO == detail.S_NO)
                LogHelper.Info($"出库--AGV取货--统计任务已完成：{finishedCount} / {allCount}");

                if (finishedCount == allCount) { // 当前出库单下的所有明细单，任务都已经完成

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

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