From 5d756f53f07880dc8b7ba0bc9f060b9e94d4b25e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 05 十一月 2025 18:08:34 +0800
Subject: [PATCH] 修改人工入库完成和wcs小车问题
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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/CabinOrderController.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
index 28b69d4..25723f2 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
@@ -12,18 +12,50 @@
[ApiController]
public class CabinOrderController : ApiBaseController<ICabinOrderServices, Dt_CabinOrder>
{
- public CabinOrderController(ICabinOrderServices service) : base(service)
+ private readonly IBusiness _business;
+ public CabinOrderController(ICabinOrderServices service, IBusiness business) : base(service)
{
+ _business = business;
}
-
-
- [HttpPost,Route("GetUpstreamOrder"),AllowAnonymous]
+ [HttpPost, HttpGet, Route("GetUpstreamOrder"), AllowAnonymous]
public WebResponseContent GetUpstreamOrder()
{
- return Service.GetUpstreamOrder();
+ return _business.GetInOrder();
+ }
+
+ /// <summary>
+ /// 瀹屾垚鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("FinishInOrder"),AllowAnonymous]
+ public WebResponseContent FinishInOrder(int key)
+ {
+ return Service.FinishInOrder(key);
+ }
+ /// 鏌ヨ鍗曚俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GetCabinOrders")]
+ public WebResponseContent GetCabinOrders([FromBody] SaveModel saveModel)
+ {
+ return Service.GetCabinOrders(saveModel);
}
+ /// 鏌ヨ鍗曡鎯呬俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GetCabinOrderDetail")]
+ public WebResponseContent GetCabinOrderDetail(int pageNo, string orderNo)
+ {
+ return Service.GetCabinOrderDetail(pageNo,orderNo);
+ }
+ [HttpPost, HttpGet, Route("FeedbackIn")]
+ public WebResponseContent FeedbackIn([FromBody] SaveModel saveModel)
+ {
+ return Service.FeedbackIn(saveModel);
+ }
//[HttpPost, Route("CompleteOrder"), AllowAnonymous]
//public WebResponseContent CompleteOrder(string order_no)
//{
--
Gitblit v1.9.3