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 | 78 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 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 1b4e531..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"
@@ -9,6 +9,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 鍏ュ簱鍗�
+ /// </summary>
[Route("api/InboundOrder")]
[ApiController]
public class InboundOrderController : ApiBaseController<IInboundOrderService, Dt_InboundOrder>
@@ -27,6 +30,29 @@
}
/// <summary>
+ /// 鍏ュ钩搴�
+ /// </summary>
+ /// <param name="orderNo"></param>
+ /// <param name="warehouseId"></param>
+ /// <param name="serNums"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("InPinKu")]
+ public WebResponseContent InPinKu(string orderNo, int warehouseId, [FromBody] List<string> serNums)
+ {
+ return Service.InPinKu(orderNo, warehouseId, serNums);
+ }
+ /// <summary>
+ /// WMS鍏ュ钩搴�
+ /// </summary>
+ /// <param name="warehouseId"></param>
+ /// <param name="serNums"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("WMSInPinKu")]
+ public WebResponseContent WMSInPinKu(int warehouseId, [FromBody] List<string> serNums)
+ {
+ return Service.WMSInPinKu(warehouseId, serNums);
+ }
+ /// <summary>
/// 鍗曚釜鐗╂枡鐮佺粍鐩�
/// </summary>
/// <param name="inboundOrderId"></param>
@@ -39,28 +65,58 @@
return Service.MaterielGroup(inboundOrderId, palletCode, serNum);
}
+ // <summary>
+ // 澶氫釜鐗╂枡鐮佺粍鐩�
+ // </summary>
+ // <returns></returns>
+ //[HttpPost, HttpGet, Route("MaterielGroup")]
+ //public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
+ //{
+ // return Service.MaterielGroup(inboundOrderId, palletCode, serNums);
+ //}
/// <summary>
- /// 澶氫釜鐗╂枡鐮佺粍鐩�
+ ///
/// </summary>
- /// <param name="inboundOrderId"></param>
- /// <param name="palletCode"></param>
- /// <param name="serNums"></param>
+ /// <param name="saveModel"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("MaterielGroup")]
- public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
+ public WebResponseContent MaterielGroup([FromBody] SaveModel saveModel)
{
- return Service.MaterielGroup(inboundOrderId, palletCode, serNums);
+ return Service.MaterielGroup(saveModel);
}
-
/// <summary>
- /// 鍏ュ簱瀹屾垚鍚庡洖浼燛RP
+ /// 鏇存嵁鍏ュ簱鍗曞彿ID涓婁紶ERP
/// </summary>
- /// <param name="id"></param>
+ /// <param name="inboundOrderId">鍏ュ簱鍗曞彿Id</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("FeedbackInboundOrder")]
- public WebResponseContent FeedbackInboundOrder(int id)
+ public WebResponseContent FeedbackInboundOrder(int inboundOrderId)
{
- return Service.FeedbackInboundOrder(id);
+ return Service.FeedbackInboundOrder(inboundOrderId);
+ }
+ ///// <summary>
+ ///// 鍏ュ簱瀹屾垚鍚庡洖浼燛RP
+ ///// </summary>
+ ///// <param name="id"></param>
+ ///// <returns></returns>
+ //[HttpPost, HttpGet, Route("FeedbackInboundOrder")]
+ //public WebResponseContent FeedbackInboundOrder(int id)
+ //{
+ // return Service.FeedbackInboundOrder(id);
+ //}
+
+ /// <summary>
+ /// 鏃犲叆搴撳崟缁勭洏
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <param name="initiallife"></param>
+ /// <param name="warehouseId"></param>
+ /// <param name="serNums"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ManualMaterielGroup")]
+ public WebResponseContent MaterielGroup(string palletCode, int initiallife, int warehouseId, [FromBody] List<string> serNums)
+ {
+ return Service.MaterielGroup(palletCode, initiallife, warehouseId, serNums);
}
}
}
--
Gitblit v1.9.3