From e579c8d3ab3accb26258f0c615101e3d86093730 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 29 十月 2025 01:08:03 +0800
Subject: [PATCH] 添加库存临期提醒，优化前端弹窗提醒
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 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 6f67fa9..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,24 +15,41 @@
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>
- [HttpPost, HttpGet, Route("GetPdDeliveryOrders")]
- public WebResponseContent GetPdDeliveryOrders([FromBody] SaveModel saveModel)
+ [HttpPost, HttpGet, Route("GetCheckOrders")]
+ public WebResponseContent GetCheckOrders([FromBody] SaveModel saveModel)
{
- return Service.GetPdDeliveryOrders(saveModel);
+ return Service.GetCheckOrders(saveModel);
}
- /// 鏌ヨ鍗曚俊鎭�
+
+
+ /// 鏌ヨ鍑哄簱鍗曚俊鎭�
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("GetDeliveryOrders")]
@@ -41,25 +58,43 @@
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);
+ return Service.GetDeliveryOrderDetail(pageNo, orderNo, isPick);
}
-
- [HttpPost, HttpGet, Route("MatPicking")]
- public WebResponseContent MatPicking([FromBody] SaveModel saveModel)
+ /// <summary>
+ /// 瀹屾垚鐩樼偣浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("CheckFinish")]
+ public WebResponseContent CheckFinish([FromBody] SaveModel saveModel)
{
- return Service.MatPicking(saveModel);
+ return Service.CheckFinish(saveModel);
}
-
- [HttpPost, HttpGet, Route("FeedbackOut")]
- public WebResponseContent FeedbackOut([FromBody] SaveModel saveModel)
+ /// <summary>
+ /// 瀹屾垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("OutFinish")]
+ public WebResponseContent OutFinish([FromBody] SaveModel saveModel)
{
- return Service.FeedbackOut(saveModel);
+ return Service.OutFinish(saveModel);
+ }
+ /// <summary>
+ /// 鏌ユ壘鏈畬鎴愮洏鐐�/鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GetCheckOutTasks")]
+ public WebResponseContent GetCheckOutTasks([FromBody] SaveModel saveModel)
+ {
+ return Service.GetCheckOutTasks(saveModel);
}
/// <summary>
@@ -68,11 +103,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