From 4476740c214edb7ab667c48fcab00488fbdd9879 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 15 十一月 2025 09:03:54 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundPickingController.cs | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 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 3935b6d..e92783d 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,5 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO.Outbound;
@@ -38,14 +39,43 @@
return WebResponseContent.Instance.OK(null, lockInfos);
}
- /// <summary>
- /// 鎷ｉ�夌‘璁�
- /// </summary>
- [HttpPost("ConfirmPicking")]
- public async Task<WebResponseContent> ConfirmPicking([FromBody] PickingConfirmRequest request)
+
+
+ [HttpGet("unpicked-list")]
+ public async Task<WebResponseContent> GetUnpickedList(string orderNo, string palletCode)
{
- return await Service.ConfirmPicking(request);
+ var lists= await Service.GetUnpickedList(orderNo, palletCode);
+ return WebResponseContent.Instance.OK("", lists);
}
+
+ [HttpGet("picked-list")]
+ public async Task<WebResponseContent> GetPickedList(string orderNo, string palletCode)
+ {
+ var lists = await Service.GetPickedList(orderNo, palletCode);
+ return WebResponseContent.Instance.OK("", lists);
+ }
+
+ [HttpPost("confirm-picking")]
+ public async Task<WebResponseContent> ConfirmPicking([FromBody] ConfirmPickingDto dto)
+ {
+ return await Service.ConfirmPicking(dto.OrderNo, dto.PalletCode, dto.Barcode);
+ }
+
+ [HttpGet("picking-summary")]
+ public async Task<WebResponseContent> GetPickingSummary(string orderNo)
+ {
+ var data = await Service.GetPickingSummary(orderNo);
+ return WebResponseContent.Instance.OK("", data);
+ }
+
+ ///// <summary>
+ ///// 鎷ｉ�夌‘璁�
+ ///// </summary>
+ //[HttpPost("ConfirmPicking")]
+ //public async Task<WebResponseContent> ConfirmPicking([FromBody] PickingConfirmRequest request)
+ //{
+ // return await Service.ConfirmPicking(request);
+ //}
/// <summary>
/// 楠岃瘉鏉＄爜骞惰幏鍙栫墿鏂欎俊鎭�
/// </summary>
@@ -58,7 +88,7 @@
/// 鎷嗗寘鎿嶄綔
/// </summary>
[HttpPost("SplitPackage")]
- public async Task<WebResponseContent> SplitPackage([FromBody] SplitPackageRequest request)
+ public async Task<WebResponseContent> SplitPackage([FromBody] SplitPackageDto request)
{
return await _splitPackageService.SplitPackage(request);
}
--
Gitblit v1.9.3