测试出库抽检流程，重构代码修复事务处理的问题

kazelee

2025-05-21 5ad394cf1708a4629f90f40bfd9b48d9a9f6f0c8

 api/MoboxController.cs

File was renamed from Controllers/MoboxController.cs
@@ -1,23 +1,18 @@
using System.Web.Http;

using HH.WCS.Mobox3.DSZSH.Consts;
using HH.WCS.Mobox3.DSZSH.Helpers;
using HH.WCS.Mobox3.DSZSH.Models;
using HH.WCS.Mobox3.DSZSH.Services;
using HH.WCS.Mobox3.DSZSH.models;

using Newtonsoft.Json;

using static HH.WCS.Mobox3.DSZSH.Dtos.Request.MoboxRequest;
using static HH.WCS.Mobox3.DSZSH.Dtos.Response.MoboxResponse;
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;

namespace HH.WCS.Mobox3.DSZSH.Controllers {
namespace HH.WCS.Mobox3.DSZSH.api {
    /// <summary>
    /// Mobox3 调用，脚本中调用（包括 PDA 的接口）
    /// </summary>
    [RoutePrefix("api")]
    public class MoboxController : ApiController {

        #region PDA 接口
        /// <summary>
        /// 好运箱-满托下线入库(PDA)
        /// </summary>
@@ -27,7 +22,7 @@
        [Route("goodpack-offline")]
        public SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
            LogHelper.InfoApi("好运箱-满托下线入库(PDA)", model);
            return MoboxService.GoodpackOffline(model);
            return ApiHelper.GoodpackOffline(model);
        }

        ///// <summary>
@@ -40,11 +35,11 @@

        //    if (model.CntrType == "托盘") {
        //        //LogHelper.Info($"触发API：空托绑定 " + JsonConvert.SerializeObject(model), "API");
        //        return MoboxService.EmptyBindPallet(model);
        //        return ApiHelper.EmptyBindPallet(model);
        //    }
        //    else if (model.CntrType == "好运箱") {
        //        //LogHelper.Info($"触发API：空箱绑定 " + JsonConvert.SerializeObject(model), "API");
        //        return MoboxService.EmptyBindGoodpack(model);
        //        return ApiHelper.EmptyBindGoodpack(model);
        //    }
        //    else {
        //        return BuildSimpleResult(-1, $"不合法的容器类型：'{model.CntrType}'");
@@ -62,13 +57,13 @@
            LogHelper.InfoApi("空托/空箱入库", model);

            if (model.CntrType == "托盘") {
                return MoboxService.EmptyInboundPallet(model);
                return ApiHelper.EmptyInboundPallet(model);
            }
            else if (model.CntrType == "好运箱") {
                return MoboxService.EmptyInboundGoodpack(model);
                return ApiHelper.EmptyInboundGoodpack(model);
            }
            else {
                return BuildSimpleResult(-1, $"容器类型 '{model.CntrType}' 不合法：应为 '托盘' 或 '好运箱'");
                return NewSimpleResult(-1, $"容器类型 '{model.CntrType}' 不合法：应为 '托盘' 或 '好运箱'");
            }
        }

@@ -87,14 +82,14 @@

        //    if (locCntrRel.S_CNTR_TYPE == "托盘") {

        //        return MoboxService.EmptyOnlinePallet(new EmptyOnlinePalletInfo {
        //        return ApiHelper.EmptyOnlinePallet(new EmptyOnlinePalletInfo {
        //            CntId = locCntrRel.S_CNTR_CODE,
        //            EndLoc = model.EndLoc
        //        });
        //    }
        //    else if (locCntrRel.S_CNTR_TYPE == "好运箱") {

        //        return MoboxService.EmptyOnlineGoodpack(new EmptyOnlineGoodpackInfo {
        //        return ApiHelper.EmptyOnlineGoodpack(new EmptyOnlineGoodpackInfo {
        //            CntId = locCntrRel.S_CNTR_CODE,
        //            EndLoc = model.EndLoc
        //        });
@@ -112,7 +107,7 @@
        [HttpPost]
        [Route("empty-online-pallet")]
        public SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
            return MoboxService.EmptyOnlinePallet(model);
            return ApiHelper.EmptyOnlinePallet(model);
        }

        /// <summary>
@@ -123,7 +118,7 @@
        [HttpPost]
        [Route("empty-online-goodpack")]
        public SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
            return MoboxService.EmptyOnlineGoodpack(model);
            return ApiHelper.EmptyOnlineGoodpack(model);
        }

        ///// <summary>
@@ -137,10 +132,10 @@
        //    LogHelper.InfoApi("合格回库/不合格移库", model);

        //    if (model.Qualified) {
        //        return MoboxService.QualifiedBack(model);
        //        return ApiHelper.QualifiedBack(model);
        //    }
        //    else {
        //        return MoboxService.UnqualifiedShift(model);
        //        return ApiHelper.UnqualifiedShift(model);
        //    }
        //}

@@ -151,7 +146,7 @@
        [HttpPost]
        [Route("qualified-back")]
        public SimpleResult QualifiedBack(QualifiedBackInfo model) {
            return MoboxService.QualifiedBack(model);
            return ApiHelper.QualifiedBack(model);
        }

        /// <summary>   
@@ -161,7 +156,7 @@
        [HttpPost]
        [Route("unqualified-shift")]
        public SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
            return MoboxService.UnqualifiedShift(model);
            return ApiHelper.UnqualifiedShift(model);
        }

        /// <summary>
@@ -172,7 +167,7 @@
        [HttpPost]
        [Route("rest-back")]
        public SimpleResult RestBack(RestBackInfo model) {
            return MoboxService.RestBack(model);
            return ApiHelper.RestBack(model);
        }

        /// <summary>
@@ -186,15 +181,13 @@
            LogHelper.InfoApi("成品胶出库(PDA)", model);

            if (model.ForcedOut) {
                return MoboxService.FinishedOutboundForce(model);
                return ApiHelper.FinishedOutboundForce(model);
            }
            else {
                return MoboxService.FinishedOutbound(model);
                return ApiHelper.FinishedOutbound(model);
            }
        }
        #endregion

        #region Mobox 接口
        /// <summary>
        /// 抽检-创建抽检单(WMS)
        /// </summary>
@@ -203,7 +196,7 @@
        [HttpPost]
        [Route("create-check-order")]
        public SimpleResult CreateCheckOrder(CreateCheckOrderInfo model) {
            return MoboxService.CreateCheckOrder(model);
            return ApiHelper.CreateCheckOrder(model);
        }

        /// <summary>
@@ -214,8 +207,7 @@
        [HttpPost]
        [Route("shift-storage")]
        public SimpleResult CreateShiftOrder(CreateShiftOrderInfo model) {
            return MoboxService.CreateShiftOrder(model);
            return ApiHelper.CreateShiftOrder(model);
        }
        #endregion
    }
}