From 92e1560e29419d855c9e23b31c11ef261d391e45 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 27 十月 2025 11:08: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 | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 9c04bb0..da3be19 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"
@@ -15,14 +15,29 @@
public DeliveryOrderController(IDeliveryOrderServices service) : base(service)
{
}
-
-
- [HttpPost,Route("GetUpstreamOutOrder"),AllowAnonymous]
- public WebResponseContent GetUpstreamOutOrder()
+ /// <summary>
+ /// 瀹屾垚鍑哄簱鍗�
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("FinishOutOrder")]
+ public WebResponseContent FinishOutOrder(int key)
{
- return Service.GetUpstreamOutOrder();
+ return Service.FinishOutOrder(key);
}
-
+
+ /// <summary>
+ /// 鍒涘缓鐩樼偣浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("CreateCheckOrder")]
+ public WebResponseContent CreateCheckOrder([FromBody] int[] keys)
+ {
+ return Service.CreateCheckOrder(keys);
+ }
+
+
/// 鏌ヨ鐩樼偣鍗曚俊鎭�
/// </summary>
/// <returns></returns>
@@ -31,6 +46,8 @@
{
return Service.GetCheckOrders(saveModel);
}
+
+
/// 鏌ヨ鍑哄簱鍗曚俊鎭�
/// </summary>
@@ -47,7 +64,7 @@
[HttpPost, HttpGet, Route("GetDeliveryOrderDetail")]
public WebResponseContent GetDeliveryOrderDetail(int pageNo, string orderNo, bool isPick)
{
- return Service.GetDeliveryOrderDetail(pageNo, orderNo,isPick);
+ return Service.GetDeliveryOrderDetail(pageNo, orderNo, isPick);
}
/// <summary>
/// 瀹屾垚鐩樼偣浠诲姟
@@ -91,6 +108,6 @@
return Service.InventoryGood(batchNo, goodsNo);
}
-
+
}
}
--
Gitblit v1.9.3