From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 fe51171..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,14 +16,16 @@
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>
/// 鍒涘缓鐩樼偣浠诲姟
@@ -30,7 +33,7 @@
/// <param name="keys"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("CreateCheckOrder")]
- public WebResponseContent CreateCheckOrder([FromBody]int[] keys)
+ public WebResponseContent CreateCheckOrder([FromBody] int[] keys)
{
return Service.CreateCheckOrder(keys);
}
@@ -62,7 +65,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>
/// 瀹屾垚鐩樼偣浠诲姟
@@ -106,6 +109,16 @@
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