From 503608c5ad94cbc5ccff0f8806e2d5fa54143875 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期四, 11 十二月 2025 11:24:47 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundBatchPickingService.cs | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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..0eeaef1 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)
{
@@ -1021,6 +1011,8 @@
BarcodeUnit = stockDetail.BarcodeUnit,
BusinessType = stockDetail.BusinessType,
InboundOrderRowNo = stockDetail.InboundOrderRowNo,
+ FactoryArea = stockDetail.FactoryArea,
+ WarehouseCode = stockDetail.WarehouseCode,
};
await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
@@ -1852,8 +1844,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 +1875,7 @@
}
catch (Exception taskEx)
{
- _logger.LogError($"鍥炲簱浠诲姟鍒涘缓澶辫触: {taskEx.Message}");
+ _logger.LogError($"鍥炲簱浠诲姟CreateReturnTaskWithoutESS鍒涘缓澶辫触: {taskEx.Message}");
// 浠诲姟鍒涘缓澶辫触涓嶅奖鍝嶆暟鎹洖搴�
}
_unitOfWorkManage.CommitTran();
@@ -1908,8 +1900,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 +2679,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 +2885,7 @@
/// <summary>
- /// 鍙栬蛋绌虹 - 淇鐗堬紝姝ｇ‘澶勭悊鏈垎閰嶉攣瀹氳褰�
+ /// 鍙栬蛋绌虹 -姝ｇ‘澶勭悊鏈垎閰嶉攣瀹氳褰�
/// </summary>
public async Task<WebResponseContent> RemoveEmptyPallet(string orderNo, string palletCode)
{
@@ -3228,6 +3220,8 @@
BarcodeUnit = stockDetail.BarcodeUnit,
BusinessType = stockDetail.BusinessType,
InboundOrderRowNo = stockDetail.InboundOrderRowNo,
+ FactoryArea=stockDetail.FactoryArea,
+ WarehouseCode = stockDetail.WarehouseCode,
};
await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
@@ -3725,20 +3719,29 @@
{
var splitHistory = new Dt_SplitPackageRecord
{
- OrderNo = lockInfo.OrderNo,
+ FactoryArea = lockInfo.FactoryArea,
+ TaskNum = lockInfo.TaskNum,
OutStockLockInfoId = lockInfo.Id,
StockId = stockDetail.StockId,
Operator = App.User.UserName,
+ IsReverted = false,
OriginalBarcode = stockDetail.Barcode,
NewBarcode = newBarcode,
SplitQty = splitQty,
+ // RemainQuantity = remainQty,
+ MaterielCode = lockInfo.MaterielCode,
SplitTime = DateTime.Now,
+ OrderNo = lockInfo.OrderNo,
+ PalletCode = lockInfo.PalletCode,
+
+
+
Status = (int)SplitPackageStatusEnum.宸叉媶鍖�,
IsAutoSplit = isAutoSplit,
// SplitType = isAutoSplit ? "鑷姩鎷嗗寘" : "鎵嬪姩鎷嗗寘"
OriginalStockQuantity = originalStockQuantity ?? stockDetail.StockQuantity,
//RemainingStockQuantity = stockDetail.StockQuantity - splitQty
- TaskNum = lockInfo.TaskNum
+
};
await _splitPackageService.Db.Insertable(splitHistory).ExecuteCommandAsync();
--
Gitblit v1.9.3