From 0b0899370f271793f7156144b4b912438aebdf73 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 24 十一月 2025 08:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs | 110 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 40 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 5b1725d..35c2dc3 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,4 +1,6 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
+锘縰sing Autofac.Core;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Outbound;
@@ -19,69 +21,97 @@
_splitPackageService = splitPackageService;
_outStockLockInfoService = outStockLockInfoService;
}
- /// <summary>
- /// 鑾峰彇鎵樼洏鐨勫嚭搴撶姸鎬�
- /// </summary>
- [HttpGet("GetPalletOutboundStatus")]
- public async Task<WebResponseContent> GetPalletOutboundStatus(string palletCode)
- {
- return await Service.GetPalletOutboundStatus(palletCode);
- }
+
/// <summary>
/// 鑾峰彇鎵樼洏鐨勯攣瀹氫俊鎭�
/// </summary>
- [HttpGet("GetPalletLockInfos")]
+ [HttpPost("GetPalletLockInfos")]
public async Task<WebResponseContent> GetPalletLockInfos(string palletCode)
{
var lockInfos = await _outStockLockInfoService.GetPalletLockInfos(palletCode);
return WebResponseContent.Instance.OK(null, lockInfos);
}
- /// <summary>
- /// 鎷ｉ�夌‘璁�
- /// </summary>
- [HttpPost("ConfirmPicking")]
- public async Task<WebResponseContent> ConfirmPicking([FromBody] PickingConfirmRequest request)
+
+
+ [HttpPost("unpicked-list")]
+ public async Task<WebResponseContent> GetUnpickedList([FromBody] ConfirmPickingDto dto)
{
- return await Service.ConfirmPicking(request);
+ var lists= await Service.GetUnpickedList(dto.OrderNo, dto.PalletCode);
+ return WebResponseContent.Instance.OK("", lists);
}
- /// <summary>
- /// 鎷嗗寘鎿嶄綔
- /// </summary>
- [HttpPost("SplitPackage")]
- public async Task<WebResponseContent> SplitPackage([FromBody] SplitPackageRequest request)
+ [HttpPost("picked-list")]
+ public async Task<WebResponseContent> GetPickedList([FromBody] ConfirmPickingDto dto)
{
- return await _splitPackageService.SplitPackage(request);
+ var lists = await Service.GetPickedList(dto.OrderNo, dto.PalletCode);
+ return WebResponseContent.Instance.OK("", lists);
}
- ///// <summary>
- ///// 鐩存帴鍑哄簱
- ///// </summary>
- //[HttpPost("DirectOutbound")]
- //public async Task<WebResponseContent> DirectOutbound([FromBody] DirectOutboundRequest request)
+ [HttpPost("confirm-picking")]
+ public async Task<WebResponseContent> ConfirmPicking([FromBody] ConfirmPickingDto dto)
+ {
+ return await Service.ConfirmPicking(dto.OrderNo, dto.PalletCode, dto.Barcode);
+ }
+
+ [HttpPost("picking-summary")]
+ public async Task<WebResponseContent> GetPickingSummary([FromBody] ConfirmPickingDto dto)
+ {
+ var data = await Service.GetPickingSummary(dto);
+ return WebResponseContent.Instance.OK("", data);
+ }
+
+ [HttpPost("split-package")]
+ public async Task<WebResponseContent> SplitPackage([FromBody] SplitPackageDto dto)
+ {
+ return await _splitPackageService.SplitPackage(dto);
+
+ }
+
+ [HttpPost("revert-split-package")]
+ public async Task<WebResponseContent> RevertSplitPackage([FromBody] RevertSplitDto dto)
+ {
+ return await _splitPackageService.RevertSplitPackage(dto.OriginalBarcode);
+
+
+ }
+
+ [HttpPost("split-package-info")]
+ public async Task<WebResponseContent> GetSplitPackageInfo([FromBody] ConfirmPickingDto dto)
+ {
+ return await _splitPackageService.GetSplitPackageInfo(dto.OrderNo, dto.PalletCode, dto.Barcode);
+
+ }
+
+
+ [HttpPost("return-to-stock")]
+ public async Task<WebResponseContent> ReturnToStock([FromBody] ConfirmPickingDto dto)
+ {
+ return await Service.ReturnRemaining(dto.OrderNo, dto.PalletCode, "");
+ }
+
+ [HttpPost("remove-empty-pallet")]
+ public async Task<WebResponseContent> RemoveEmptyPallet ([FromBody] ConfirmPickingDto dto)
+ {
+ return await Service.RemoveEmptyPallet(dto.OrderNo, dto.PalletCode);
+ }
+
+
+ //[HttpPost("direct-outbound")]
+ //public async Task<WebResponseContent> DirectOutbound([FromBody] DirectOutboundRequest dto)
//{
- // return await Service.DirectOutbound(request);
- //}
+ // return await Service.DirectOutbound(dto);
- /// <summary>
- /// 鑾峰彇鎷ｉ�夊巻鍙�
- /// </summary>
- [HttpGet("GetPickingHistory")]
- public async Task<WebResponseContent> GetPickingHistory(int orderId)
- {
- var history = await Service.GetPickingHistory(orderId);
- return WebResponseContent.Instance.OK(null, history);
- }
+ //}
/// <summary>
/// 鎾ら攢鎷ｉ��
/// </summary>
[HttpPost("CancelPicking")]
- public async Task<WebResponseContent> CancelPicking([FromBody] CancelPickingRequest request)
+ public async Task<WebResponseContent> CancelPicking([FromBody] ConfirmPickingDto dto)
{
- return await Service.CancelPicking(request);
+ return await Service.CancelPicking(dto.OrderNo,dto.PalletCode,dto.Barcode);
}
}
}
--
Gitblit v1.9.3