From a2f948006c6c7e918ba4f2e66d477cc2d5017a75 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 10 十二月 2025 21:49:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundBatchPickingService.cs | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 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/OutboundBatchPickingService.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/OutboundBatchPickingService.cs"
index cb55dde..ba05939 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/OutboundBatchPickingService.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/OutboundBatchPickingService.cs"
@@ -339,17 +339,7 @@
_unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK("鍒嗘嫞鎴愬姛", new
- {
- PickedQuantity = actualPickedQty,
- Barcode = barcode,
- MaterialCode = lockInfo.MaterielCode,
- AutoSplitted = autoSplitResult != null,
- RemainingStock = stockDetail.StockQuantity,
- CurrentOutbound = stockDetail.OutboundQuantity,
- // 濡傛灉鏄嚜鍔ㄦ媶鍖咃紝杩斿洖鐩稿叧淇℃伅
- UnallocatedCreated = autoSplitResult != null ? "鏄�" : "鍚�"
- });
+ return WebResponseContent.Instance.OK("鍒嗘嫞鎴愬姛", autoSplitResult);
}
catch (Exception ex)
{
@@ -1852,8 +1842,8 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- _logger.LogError($"绌虹鍥炲簱澶辫触: {ex.Message}");
- return WebResponseContent.Instance.Error($"绌虹鍥炲簱澶辫触锛歿ex.Message}");
+ _logger.LogError($"绌虹鍥炲簱ExecutePalletReturn澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"绌虹鍥炲簱ExecutePalletReturn澶辫触锛歿ex.Message}");
}
}
@@ -1883,7 +1873,7 @@
}
catch (Exception taskEx)
{
- _logger.LogError($"鍥炲簱浠诲姟鍒涘缓澶辫触: {taskEx.Message}");
+ _logger.LogError($"鍥炲簱浠诲姟CreateReturnTaskWithoutESS鍒涘缓澶辫触: {taskEx.Message}");
// 浠诲姟鍒涘缓澶辫触涓嶅奖鍝嶆暟鎹洖搴�
}
_unitOfWorkManage.CommitTran();
@@ -1908,8 +1898,8 @@
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- _logger.LogError($"鍥炲簱澶辫触: {ex.Message}");
- return WebResponseContent.Instance.Error($"鍥炲簱澶辫触锛歿ex.Message}");
+ _logger.LogError($"ExecutePalletReturn 鍥炲簱澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"ExecutePalletReturn 鍥炲簱澶辫触锛歿ex.Message}");
}
}
@@ -2687,12 +2677,12 @@
// 鍒涘缓鍥炲簱浠诲姟锛堜笉鍙戦�丒SS鍛戒护锛�
var returnTaskInfo = await CreateEmptyPalletReturnTask(orderNo, palletCode, emptyStockInfo, currentTask);
- return WebResponseContent.Instance.OK("绌烘墭鐩樺洖搴撴垚鍔�");
+ return WebResponseContent.Instance.OK("绌烘墭鐩樺洖搴撴垚鍔�", returnTaskInfo);
}
catch (Exception ex)
{
- _logger.LogError($"绌烘墭鐩樺洖搴撳け璐�: {ex.Message}");
- return WebResponseContent.Instance.Error($"绌烘墭鐩樺洖搴撳け璐�: {ex.Message}");
+ _logger.LogError($"绌烘墭鐩樺洖搴撳け璐� HandleEmptyPalletReturn: {ex.Message}");
+ return WebResponseContent.Instance.Error($"绌烘墭鐩樺洖搴撳け璐� HandleEmptyPalletReturn: {ex.Message}");
}
}
@@ -2893,7 +2883,7 @@
/// <summary>
- /// 鍙栬蛋绌虹 - 淇鐗堬紝姝ｇ‘澶勭悊鏈垎閰嶉攣瀹氳褰�
+ /// 鍙栬蛋绌虹 -姝ｇ‘澶勭悊鏈垎閰嶉攣瀹氳褰�
/// </summary>
public async Task<WebResponseContent> RemoveEmptyPallet(string orderNo, string palletCode)
{
--
Gitblit v1.9.3