From 5ad394cf1708a4629f90f40bfd9b48d9a9f6f0c8 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 21 五月 2025 16:55:18 +0800
Subject: [PATCH] 测试出库抽检流程,重构代码修复事务处理的问题

---
 api/MoboxController.cs |   54 +++++++++++++++++++++++-------------------------------
 1 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/Controllers/MoboxController.cs b/api/MoboxController.cs
similarity index 77%
rename from Controllers/MoboxController.cs
rename to api/MoboxController.cs
index e50687c..a309518 100644
--- a/Controllers/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -1,23 +1,18 @@
 锘縰sing 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 鐨勬帴鍙o級
     /// </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
     }
 }

--
Gitblit v1.9.1