From 025c515a6945fbedcf772bdd595413f50596fd47 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 24 十一月 2025 11:52:42 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 20 ++++++++++++++++----
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 37 ++++++++++++++++++++-----------------
2 files changed, 36 insertions(+), 21 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_OutboundService/OutboundPickingService.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_OutboundService/OutboundPickingService.cs"
index 8e030a2..4784256 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_OutboundService/OutboundPickingService.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_OutboundService/OutboundPickingService.cs"
@@ -549,9 +549,11 @@
return ValidationResult<bool>.Success(true);
}
+
+
private async Task<PickingResult> ExecutePickingLogic(
- Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail, Dt_StockInfoDetail stockDetail,
- string orderNo, string palletCode, string barcode, decimal actualQty)
+ Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail, Dt_StockInfoDetail stockDetail,
+ string orderNo, string palletCode, string barcode, decimal actualQty)
{
decimal stockQuantity = stockDetail.StockQuantity;
var result = new PickingResult
@@ -562,18 +564,29 @@
ActualPickedQty = actualQty
};
+ decimal finalPickedQty = actualQty;
+
if (actualQty < stockQuantity)
{
+ // 鎷嗗寘鍦烘櫙
await HandleSplitPacking(lockInfo, stockDetail, actualQty, stockQuantity, result);
+ finalPickedQty = actualQty;
}
else if (actualQty == stockQuantity)
{
+ // 鏁村寘鎷ｉ��
await HandleFullPicking(lockInfo, stockDetail, actualQty, result);
+ finalPickedQty = actualQty;
}
else
{
+ // 閮ㄥ垎鎷ｉ�夛紙搴撳瓨涓嶈冻锛�
await HandlePartialPicking(lockInfo, stockDetail, actualQty, stockQuantity, result);
+ finalPickedQty = result.ActualPickedQty; // 鍙兘琚皟鏁�
}
+
+ // 缁熶竴鏇存柊璁㈠崟鏁版嵁锛堟墍鏈夊垎鏀兘浠庤繖閲屾洿鏂帮級
+ await UpdateOrderRelatedData(lockInfo.OrderDetailId, finalPickedQty, orderNo);
return result;
}
@@ -608,8 +621,7 @@
result.FinalBarcode = newBarcode;
result.SplitResults.AddRange(CreateSplitResults(lockInfo, actualQty, remainingStockQty, newBarcode, stockDetail.Barcode));
- await UpdateOrderRelatedData(lockInfo.OrderDetailId, actualQty, lockInfo.OrderNo);
-
+
_logger.LogInformation($"鎷嗗寘鍒嗘嫞鏇存柊璁㈠崟鏄庣粏 - OrderDetailId: {lockInfo.OrderDetailId}, 鍒嗘嫞鏁伴噺: {actualQty}");
}
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/TaskInfo/TaskController.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/TaskInfo/TaskController.cs"
index 966db0e..012dc97 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/TaskInfo/TaskController.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/TaskInfo/TaskController.cs"
@@ -28,34 +28,37 @@
}
[HttpPost, Route("AddTestTask"), AllowAnonymous, MethodParamsValidate]
- public WebResponseContent AddTest(WMSTaskDTO wMSTaskDTO)
+ public WebResponseContent AddTest(WMSTaskDTO wMSTaskDTO)
{
Dt_Task task = new Dt_Task
{
- PalletCode =wMSTaskDTO. PalletCode ,
- PalletType =wMSTaskDTO. PalletType ,
- Roadway = "t",
- TaskType =wMSTaskDTO. TaskType ,
- TaskStatus =wMSTaskDTO. TaskStatus ,
- SourceAddress =wMSTaskDTO. SourceAddress ,
- TargetAddress =wMSTaskDTO. TargetAddress ,
- CurrentAddress = "t",
- NextAddress ="t" ,
- WarehouseId =wMSTaskDTO. WarehouseId ,
- OrderNo ="testt" ,
- Grade =wMSTaskDTO. Grade ,
- Dispatchertime = DateTime.Now ,
+ PalletCode = wMSTaskDTO.PalletCode,
+ PalletType = wMSTaskDTO.PalletType,
+ Roadway = "t",
+ TaskType = wMSTaskDTO.TaskType,
+ TaskStatus = wMSTaskDTO.TaskStatus,
+ SourceAddress = wMSTaskDTO.SourceAddress,
+ TargetAddress = wMSTaskDTO.TargetAddress,
+ CurrentAddress = "t",
+ NextAddress = "t",
+ WarehouseId = wMSTaskDTO.WarehouseId,
+ OrderNo = "testt",
+ Grade = wMSTaskDTO.Grade,
+ Dispatchertime = DateTime.Now,
};
Service.AddData(task);
+
+
+
return WebResponseContent.Instance.OK();
}
- [HttpPost, Route("PalletOutboundTask"), AllowAnonymous, MethodParamsValidate]
+ [HttpPost, Route("PalletOutboundTask"), AllowAnonymous, MethodParamsValidate]
public async Task<WebResponseContent> PalletOutboundTask(string endStation, string palletCode = "")
{
-
+
var result = await Service.PalletOutboundTask(endStation, palletCode);
return result;
@@ -70,7 +73,7 @@
[HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
public async Task<WebResponseContent> GenerateOutboundTasks([FromBody] GenerateOutboundTasksDto data)
{
- return await Service.GenerateOutboundTasksAsync(data.taskIds,data.outboundPlatform);
+ return await Service.GenerateOutboundTasksAsync(data.taskIds, data.outboundPlatform);
}
/// <summary>
--
Gitblit v1.9.3