From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端,pda,后端接口更改,新增,优化

---
 WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs b/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs
index a5abbcc..a258c32 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using WIDESEA_Common;
+using WIDESEA_Common.TaskEnum;
 using WIDESEA_Core;
 using WIDESEA_Core.BaseController;
 using WIDESEA_DTO.Inbound;
@@ -32,7 +33,7 @@
         /// </summary>
         /// <param name="orderAddDTO"></param>
         /// <returns></returns>
-        [HttpPost, Route("AddInboundOrders"), AllowAnonymous]
+        [HttpPost,HttpGet, Route("AddInboundOrders"), AllowAnonymous]
         public WebResponseContent AddInboundOrders([FromBody] HouseInbound orderAddDTO)
         {
             return Service.AddInboundOrders(orderAddDTO);
@@ -49,21 +50,50 @@
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
-        [HttpPost, Route("InventoryIn"), AllowAnonymous]
+        [HttpPost,HttpGet, Route("InventoryIn"), AllowAnonymous]
         public WebResponseContent InventoryIn([FromBody] string name)
         {
             return Service.InventoryIn(name);
         }   
         /// <summary>
-        /// 鍏ュ簱鍗曟嵁鍙栨秷
+        /// SMOM鎺ㄩ�佸叆搴撳崟鎹彇娑�
         /// </summary>
         /// <param name="houseCancelIn"></param>
         /// <returns></returns>
-        [HttpPost, Route("CancelIn"), AllowAnonymous]
+        [HttpPost,HttpGet, Route("CancelIn"), AllowAnonymous]
         public WebResponseContent CancelIn([FromBody] HouseCancelIn  houseCancelIn)
         {
             return Service.CancelIn(houseCancelIn);
         }
 
+        [HttpGet, HttpPost, Route("Save"), AllowAnonymous]
+        public WebResponseContent Save([FromBody] AddInboundOrderModel addInboundOrder)
+        {
+            return Service.Save(addInboundOrder);
+        }
+        
+        [HttpGet, HttpPost, Route("FeedbackInboundCanceERP"), AllowAnonymous]
+        public WebResponseContent FeedbackInboundCanceERP([FromBody] int[] keys)
+        {
+            return Service.FeedbackInboundCanceERP(keys);
+        }
+
+        [HttpGet, HttpPost, Route("ReceiveReturnOrder"), AllowAnonymous]
+        public WebResponseContent ReceiveReturnOrder([FromBody] List<HouseReturnOrder> houseReturnOrder)
+        {
+            return Service.ReceiveReturnOrder(houseReturnOrder);
+        }
+
+        [HttpGet, HttpPost, Route("GetMaterielCode"), AllowAnonymous]
+        public WebResponseContent GetMaterielCode(int warehouseId)
+        {
+            return Service.GetMaterielCode(warehouseId);
+        }
+
+        [HttpGet, HttpPost, Route("GetMaterielName"), AllowAnonymous]
+        public WebResponseContent GetMaterielName(int warehouseId, string materielCode)
+        {
+            return Service.GetMaterielName(warehouseId,materielCode);
+        }
     }
 }

--
Gitblit v1.9.3