From 18d1f45193e34e00fc1b6f65b8596ddb29c5267d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 24 十二月 2024 15:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
index 7339731..29dec73 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
@@ -1,5 +1,7 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core;
 using WIDESEA_Core.BaseController;
 using WIDESEA_IOutboundService;
 using WIDESEA_Model.Models;
@@ -14,10 +16,21 @@
         {
         }
 
-        [HttpPost, Route("GetByOrderDetailId")]
-        public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId)
+        /// <summary>
+        /// 鎷i��
+        /// </summary>
+        /// <param name="saveModel"></param>
+        /// <returns></returns>
+        [HttpPost, HttpGet, Route("GetStockOutboundOrder")]
+        public List<Dt_OutStockLockInfo> GetStockOutboundOrder([FromBody] SaveModel saveModel)
         {
-            return Service.GetByOrderDetailId(orderDetailId);
+            return Service.GetStockOutboundOrder(saveModel);
+        }
+
+        [HttpPost, HttpGet, Route("MaterialPick"), AllowAnonymous]
+        public WebResponseContent MaterialPick(string palletCode)
+        {
+            return Service.MaterialPick(palletCode);
         }
     }
 }

--
Gitblit v1.9.3