From 74ab8260224fd69add7b0b7c98ad139b28136334 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 01 十二月 2025 08:38:52 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs | 87 ++++++++++++++++++++-----------------------
1 files changed, 41 insertions(+), 46 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs"
index 0acdabf..051be09 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs"
@@ -1,6 +1,8 @@
锘縰sing Autofac.Core;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Outbound;
@@ -21,14 +23,7 @@
_splitPackageService = splitPackageService;
_outStockLockInfoService = outStockLockInfoService;
}
- /// <summary>
- /// 鑾峰彇鎵樼洏鐨勫嚭搴撶姸鎬�
- /// </summary>
- [HttpPost("GetPalletOutboundStatus")]
- public async Task<WebResponseContent> GetPalletOutboundStatus(string palletCode)
- {
- return await Service.GetPalletOutboundStatus(palletCode);
- }
+
/// <summary>
/// 鑾峰彇鎵樼洏鐨勯攣瀹氫俊鎭�
@@ -98,49 +93,19 @@
return await Service.ReturnRemaining(dto.OrderNo, dto.PalletCode, "");
}
- [HttpPost("direct-outbound")]
- public async Task<WebResponseContent> DirectOutbound([FromBody] DirectOutboundRequest dto)
+ [HttpPost("remove-empty-pallet")]
+ public async Task<WebResponseContent> RemoveEmptyPallet ([FromBody] ConfirmPickingDto dto)
{
- return await Service.DirectOutbound(dto);
-
+ return await Service.RemoveEmptyPallet(dto.OrderNo, dto.PalletCode);
}
- ///// <summary>
- ///// 鎷ｉ�夌‘璁�
- ///// </summary>
- //[HttpPost("ConfirmPicking")]
- //public async Task<WebResponseContent> ConfirmPicking([FromBody] PickingConfirmRequest request)
+
+ //[HttpPost("direct-outbound")]
+ //public async Task<WebResponseContent> DirectOutbound([FromBody] DirectOutboundRequest dto)
//{
- // return await Service.ConfirmPicking(request);
- //}
- /// <summary>
- /// 楠岃瘉鏉＄爜骞惰幏鍙栫墿鏂欎俊鎭�
- /// </summary>
- [HttpGet("ValidateBarcode")]
- public async Task<WebResponseContent> ValidateBarcode(string barcode)
- {
- return await Service.ValidateBarcode(barcode);
- }
-
+ // return await Service.DirectOutbound(dto);
- ///// <summary>
- ///// 鐩存帴鍑哄簱
- ///// </summary>
- //[HttpPost("DirectOutbound")]
- //public async Task<WebResponseContent> DirectOutbound([FromBody] DirectOutboundRequest request)
- //{
- // return await Service.DirectOutbound(request);
- //}
-
- /// <summary>
- /// 鑾峰彇鎷ｉ�夊巻鍙�
- /// </summary>
- [HttpGet("GetPickingHistory")]
- public async Task<WebResponseContent> GetPickingHistory(int orderId)
- {
- var history = await Service.GetPickingHistory(orderId);
- return WebResponseContent.Instance.OK(null, history);
- }
+ //}
/// <summary>
/// 鎾ら攢鎷ｉ��
@@ -150,5 +115,35 @@
{
return await Service.CancelPicking(dto.OrderNo,dto.PalletCode,dto.Barcode);
}
+
+ [HttpPost,HttpGet, Route("GetAvailablePurchaseOrders"),AllowAnonymous]
+ public WebResponseContent GetAvailablePurchaseOrders()
+ {
+ return Service.GetAvailablePurchaseOrders();
+ }
+
+ [HttpPost, HttpGet, Route("GetAvailablePickingOrders"),AllowAnonymous]
+ public WebResponseContent GetAvailablePickingOrders()
+ {
+ return Service.GetAvailablePickingOrders();
+ }
+
+ [HttpPost, HttpGet, Route("BarcodeValidate"), AllowAnonymous]
+ public WebResponseContent BarcodeValidate([FromBody] NoStockOutModel noStockOut)
+ {
+ return Service.BarcodeValidate(noStockOut);
+ }
+
+ [HttpPost, HttpGet, Route("DeleteBarcode"), AllowAnonymous]
+ public WebResponseContent DeleteBarcode([FromBody] NoStockOutModel noStockOut)
+ {
+ return Service.DeleteBarcode(noStockOut);
+ }
+
+ [HttpPost, HttpGet, Route("NoStockOutSubmit"), AllowAnonymous]
+ public async Task<WebResponseContent> NoStockOutSubmit([FromBody] NoStockOutSubmit noStockOutSubmit)
+ {
+ return await Service.NoStockOutSubmit(noStockOutSubmit);
+ }
}
}
--
Gitblit v1.9.3