From 68628c6cc163cddfcc745c225a9f3f34767261ef Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 22 十一月 2025 20:44:40 +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 | 64 +++++---------------------------
1 files changed, 10 insertions(+), 54 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 a0d02a9..dd51866 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.Http;
+锘縰sing Autofac.Core;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
@@ -20,14 +21,7 @@
_splitPackageService = splitPackageService;
_outStockLockInfoService = outStockLockInfoService;
}
- /// <summary>
- /// 鑾峰彇鎵樼洏鐨勫嚭搴撶姸鎬�
- /// </summary>
- [HttpPost("GetPalletOutboundStatus")]
- public async Task<WebResponseContent> GetPalletOutboundStatus(string palletCode)
- {
- return await Service.GetPalletOutboundStatus(palletCode);
- }
+
/// <summary>
/// 鑾峰彇鎵樼洏鐨勯攣瀹氫俊鎭�
@@ -92,56 +86,18 @@
[HttpPost("return-to-stock")]
- public async Task<WebResponseContent> ReturnToStock( )
+ public async Task<WebResponseContent> ReturnToStock([FromBody] ConfirmPickingDto dto)
{
- var data= "";
- return WebResponseContent.Instance.OK("", data);
+ return await Service.ReturnRemaining(dto.OrderNo, dto.PalletCode, "");
}
- [HttpPost("direct-outbound")]
- public async Task<WebResponseContent> DirectOutbound([FromBody] DirectOutboundRequest dto)
- {
- return await Service.DirectOutbound(dto);
-
- }
-
- ///// <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>
/// 鎾ら攢鎷ｉ��
/// </summary>
--
Gitblit v1.9.3