From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:52:14 +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 | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 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 9f64e5f..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"
@@ -42,6 +42,17 @@
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>
@@ -54,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)
//{
@@ -76,18 +84,35 @@
{
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)
{
--
Gitblit v1.9.3