根据业务重构库区，增加记录表，开始ERP下发反馈逻辑开发

kazelee

2025-05-28 de8cd5585ba690902333cf4ce9aa5dbc7eb9acf6

 core/WCSCore.cs

@@ -4,6 +4,7 @@
using System.Text;
using System.Threading.Tasks;

using HH.WCS.Mobox3.DSZSH.api;
using HH.WCS.Mobox3.DSZSH.device;
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.process;
@@ -83,9 +84,12 @@
                    WCSHelper.UpdateStatus(TN_Task, "取货完成"); // 任务状态改成取货完成
                    TaskProcess.OperateStatus(TN_Task, 4); // 起点容器货位解绑,解锁起点

                    if (TN_Task.S_TYPE == TaskName.成品胶出库) {
                    if (TN_Task.S_TYPE == TaskName.C成品胶出库) {
                        var nextOutboundTask = Task.Run(() => {
                            UpdateOutboundTaskState(3);
                        });
                        var pickUpReturnErpTask = Task.Run(() => {
                            PickUpReturnErp(TN_Task);
                        });
                    }

@@ -215,13 +219,14 @@
        }

        public static void UpdateOutboundTaskState(int spotStateCode) {
            var taskName = TaskName.C成品胶出库;
            var db = new SqlHelper<object>().GetInstance();

            var detail = db.Queryable<TN_Outbound_Detail>()
                .First(d => d.N_B_STATE == 2);

            if (detail == null) {
                LogHelper.Info("出库--AGV取货--查询Detail：当前没有 执行中 的Detail表！");
                LogHelper.Info($"{taskName}--AGV取货--查询明细单：当前没有执行中的明细单");
                return;
            }

@@ -229,14 +234,14 @@
                detail.N_B_STATE = spotStateCode;
                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任务执行完成 失败！");
                    LogHelper.Info($"{taskName}--AGV取货：修改明细单状态为3任务执行完成--失败！");
                    return;
                }

                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);

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

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

@@ -245,7 +250,7 @@
                        .ExecuteCommand() <= 0) {

                        tran.RollbackTran();
                        LogHelper.Info("出库--AGV取货--所有任务完成时：修改Order状态 N_B_STATE 为 3任务执行完成 失败！");
                        LogHelper.Info($"{taskName}--AGV取货--所有任务完成时：修改单据状态为3任务执行完成--失败！");
                        return;
                    }
                }
@@ -254,83 +259,17 @@
            }
        }

        public static void UpdateCheckTaskState(int spotStateCode) {
            var db = new SqlHelper<object>().GetInstance();

            var detail = db.Queryable<TN_Check_Detail>()
                .First(d => d.N_B_STATE == 2);

            if (detail == null) {
                LogHelper.Info("抽检--AGV任务完成--查询Detail：当前没有 执行中 的Detail表！");
                return;
        public static void PickUpReturnErp(TN_Task task) {
            var httpH = new HttpHelper();
            var model = new OtherModel.PickUpReturnErpInfo();
            model.LocCode = task.S_START_LOC;
            try {
                var jsonInfo = JsonConvert.SerializeObject(model);
                var result = httpH.WebPost(Settings.ErpApiUrl + "PickUpReturn", jsonInfo);
                // TODO
            }

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

                var finishedCount = db.Queryable<TN_Check_Detail>().Count(d => d.S_NO == detail.S_NO && d.N_B_STATE == 3);
                var allCount = db.Queryable<TN_Check_Detail>().Count(d => d.S_NO == detail.S_NO);

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

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

                    if (db.Updateable<TN_Check_Order>().SetColumns(it => it.N_B_STATE == 3)
                        .Where(it => it.S_NO == detail.S_NO)
                        .ExecuteCommand() <= 0) {

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

                tran.CommitTran();
            }
        }

        public static void UpdateShiftTaskState(int spotStateCode) {
            var db = new SqlHelper<object>().GetInstance();

            var detail = db.Queryable<TN_Shift_Detail>()
                .First(d => d.N_B_STATE == 2);

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

            detail.N_B_STATE = spotStateCode;

            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}");

            using (var tran = db.Ado.UseTran()) {
                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 (finishedCount == allCount) { // 当前order下的detail，任务都已经完成
                    if (db.Updateable<TN_Shift_Order>().SetColumns(it => it.N_B_STATE == 3)
                        .Where(it => it.S_NO == detail.S_NO)
                        .ExecuteCommand() <= 0) {

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

                tran.CommitTran();
            catch (Exception ex) {
                LogHelper.InfoEx(ex);
            }
        }

@@ -347,12 +286,13 @@
                    //使用自定义任务推送
                    TaskProcess.SendTask(task);//调度NDC或杭奥或国自设备
                    //TaskProcess.SendGZTask(task);///调度国自设备

                });
            }
            else {
                LogHelper.Info("暂无任务");
            }


        }
    }
}