From 7ec2fdc761acd483a621c590fae3a60af7b464ba Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 04 十一月 2025 15:17:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 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..c11332c 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"
@@ -5,6 +5,7 @@
using WIDESEA_Core.BaseController;
using WIDESEA_ISquareCabinServices;
using WIDESEA_Model.Models;
+using static WIDESEA_DTO.SquareCabin.OrderDto;
namespace WIDESEA_WMSServer.Controllers
{
@@ -15,12 +16,86 @@
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"),AllowAnonymous]
+ 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("GetCheckOrders")]
+ public WebResponseContent GetCheckOrders([FromBody] SaveModel saveModel)
+ {
+ return Service.GetCheckOrders(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);
+ }
+ /// <summary>
+ /// 瀹屾垚鐩樼偣浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("CheckFinish")]
+ public WebResponseContent CheckFinish([FromBody] SaveModel saveModel)
+ {
+ return Service.CheckFinish(saveModel);
+ }
+ /// <summary>
+ /// 瀹屾垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("OutFinish")]
+ public WebResponseContent OutFinish([FromBody] SaveModel 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>
@@ -29,9 +104,21 @@
/// <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);
}
+
+ /// <summary>
+ /// 鍑哄簱娴嬭瘯
+ /// </summary>
+ /// <param name="outorder"></param>
+ /// <returns></returns>
+ [HttpPost, Route("CreateOutboundOrder"), AllowAnonymous]
+ public WebResponseContent CreateOutboundOrder([FromBody]UpstramOutOrderInfo outorder)
+ {
+ return Service.CreateOutboundOrder(outorder);
+ }
+
}
}
--
Gitblit v1.9.3