From 526b70eecc5dac5aea91bfffbe0b98118f25827f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 23 六月 2025 09:01:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
index aff5205..6bb636a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
@@ -47,10 +47,10 @@
/// <param name="warehouseId"></param>
/// <param name="serNums"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("InPinKu")]
- public WebResponseContent InPinKu(int warehouseId, [FromBody] List<string> serNums)
+ [HttpPost, HttpGet, Route("WMSInPinKu")]
+ public WebResponseContent WMSInPinKu(int warehouseId, [FromBody] List<string> serNums)
{
- return Service.InPinKu(warehouseId, serNums);
+ return Service.WMSInPinKu(warehouseId, serNums);
}
/// <summary>
/// 鍗曚釜鐗╂枡鐮佺粍鐩�
@@ -65,13 +65,10 @@
return Service.MaterielGroup(inboundOrderId, palletCode, serNum);
}
- /// <summary>
- /// 澶氫釜鐗╂枡鐮佺粍鐩�
- /// </summary>
- /// <param name="inboundOrderId"></param>
- /// <param name="palletCode"></param>
- /// <param name="serNums"></param>
- /// <returns></returns>
+ // <summary>
+ // 澶氫釜鐗╂枡鐮佺粍鐩�
+ // </summary>
+ // <returns></returns>
//[HttpPost, HttpGet, Route("MaterielGroup")]
//public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
//{
@@ -87,7 +84,16 @@
{
return Service.MaterielGroup(saveModel);
}
-
+ /// <summary>
+ /// 鏇存嵁鍏ュ簱鍗曞彿ID涓婁紶ERP
+ /// </summary>
+ /// <param name="inboundOrderId">鍏ュ簱鍗曞彿Id</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("FeedbackInboundOrder")]
+ public WebResponseContent FeedbackInboundOrder(int inboundOrderId)
+ {
+ return Service.FeedbackInboundOrder(inboundOrderId);
+ }
///// <summary>
///// 鍏ュ簱瀹屾垚鍚庡洖浼燛RP
///// </summary>
--
Gitblit v1.9.3