From 4dd24c39a6c0e598b72c1a22eebec3ef6f66bbef Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 10 一月 2025 11:49:03 +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 | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 5109a00..8a3bbf1 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"
@@ -30,6 +30,18 @@
}
/// <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>
/// 鍗曚釜鐗╂枡鐮佺粍鐩�
/// </summary>
/// <param name="inboundOrderId"></param>
@@ -65,17 +77,25 @@
return Service.MaterielGroup(saveModel);
}
- /// <summary>
- /// 鍏ュ簱瀹屾垚鍚庡洖浼燛RP
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
+ ///// <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)
{
--
Gitblit v1.9.3