From 55142f3214485c7ec12c5e414a56519f66a1eb1d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 十月 2025 19:54:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs"
index 0460675..b2fb472 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs"
@@ -22,6 +22,45 @@
{
return Service.GetUpstreamOutOrder();
}
+
+ /// 鏌ヨ鐩樼偣鍗曚俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GetPdDeliveryOrders")]
+ public WebResponseContent GetPdDeliveryOrders([FromBody] SaveModel saveModel)
+ {
+ return Service.GetPdDeliveryOrders(saveModel);
+ }
+
+ /// 鏌ヨ鍗曚俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GetDeliveryOrders")]
+ public WebResponseContent GetDeliveryOrders([FromBody] SaveModel saveModel)
+ {
+ return Service.GetDeliveryOrders(saveModel);
+ }
+
+ /// 鏌ヨ鍗曡鎯呬俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GetDeliveryOrderDetail")]
+ public WebResponseContent GetDeliveryOrderDetail(int pageNo, string orderNo, bool isPick)
+ {
+ return Service.GetDeliveryOrderDetail(pageNo, orderNo,isPick);
+ }
+
+ [HttpPost, HttpGet, Route("MatPicking")]
+ public WebResponseContent MatPicking([FromBody] SaveModel saveModel)
+ {
+ return Service.MatPicking(saveModel);
+ }
+
+ [HttpPost, HttpGet, Route("FeedbackOut")]
+ public WebResponseContent FeedbackOut([FromBody] SaveModel saveModel)
+ {
+ return Service.FeedbackOut(saveModel);
+ }
/// <summary>
/// 鐩樼偣鍑哄簱鎺ュ彛
@@ -29,9 +68,11 @@
/// <param name="externalOrderNo"></param>
/// <returns></returns>
[HttpPost, Route("InventoryGood"), AllowAnonymous]
- public WebResponseContent InventoryGood(string externalOrderNo)
+ public WebResponseContent InventoryGood(string batchNo, string goodsNo)
{
- return Service.InventoryGood(externalOrderNo);
+ return Service.InventoryGood(batchNo, goodsNo);
}
+
+
}
}
--
Gitblit v1.9.3