From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng

---
 新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
index 4c41331..6e22071 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
@@ -12,17 +12,27 @@
     [ApiController]
     public class CabinOrderController : ApiBaseController<ICabinOrderServices, Dt_CabinOrder>
     {
-        public CabinOrderController(ICabinOrderServices service) : base(service)
+        private readonly IBusiness _business;
+        public CabinOrderController(ICabinOrderServices service, IBusiness business) : base(service)
         {
+            _business = business;
         }
-
-
-        [HttpPost,Route("GetUpstreamOrder"),AllowAnonymous]
+        [HttpPost, HttpGet, Route("GetUpstreamOrder"), AllowAnonymous]
         public WebResponseContent GetUpstreamOrder()
         {
-            return Service.GetUpstreamOrder();
+            return _business.GetUpstreamOrder();
         }
-
+        
+        /// <summary>
+        /// 瀹屾垚鍏ュ簱鍗�
+        /// </summary>
+        /// <param name="keys"></param>
+        /// <returns></returns>
+        [HttpPost, HttpGet, Route("FinishInOrder"),AllowAnonymous]
+        public WebResponseContent FinishInOrder(int key)
+        {
+            return Service.FinishInOrder(key);
+        }
         /// 鏌ヨ鍗曚俊鎭�
         /// </summary>
         /// <returns></returns>

--
Gitblit v1.9.3