From 5335e892470760a25db793d249c94d8aa32e8b0b Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 09 十二月 2025 13:44:46 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 11 +++++++++--
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockDetailByMaterielService.cs | 11 +++++++----
2 files changed, 16 insertions(+), 6 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_InboundService/InboundOrderService.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_InboundService/InboundOrderService.cs"
index 55465fe..ccbb4de 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_InboundService/InboundOrderService.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_InboundService/InboundOrderService.cs"
@@ -682,8 +682,10 @@
return WebResponseContent.Instance.Error($"鎵樼洏{palletCode}涓嬫湭鎵惧埌鏉＄爜{barcode}鐨勬槑缁嗚褰�");
}
+ ResetInboundOrderStatus(new List<string> { targetDetail.OrderNo},new List<string> { targetDetail.Barcode});
// 鍒犻櫎鎸囧畾鏄庣粏
_stockDetailRepository.DeleteData(targetDetail);
+
// 閲嶆柊鏌ヨ鍓╀綑鏄庣粏锛堜繚璇佹暟鎹噯纭�э級
var remainingDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>()
@@ -749,8 +751,13 @@
if (inboundOrder == null) continue;
- inboundOrder.OrderStatus = 0;
- _inboundOrderRepository.UpdateData(inboundOrder);
+ bool isSingleBarcode = barcodes != null && barcodes.Count == 1;
+ if (!isSingleBarcode)
+ {
+ // 闈炲崟涓潯鐮侊紙鏁村崟/澶氫釜鏉＄爜锛夛細閲嶇疆涓昏〃鐘舵�佷负0
+ inboundOrder.OrderStatus = 0;
+ _inboundOrderRepository.UpdateData(inboundOrder);
+ }
// 閲嶇疆鍏ュ簱鍗曟槑缁嗙姸鎬�
if (inboundOrder.Details == null || !inboundOrder.Details.Any()) continue;
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_StockService/StockDetailByMaterielService.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_StockService/StockDetailByMaterielService.cs"
index ea36886..e7308e9 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_StockService/StockDetailByMaterielService.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_StockService/StockDetailByMaterielService.cs"
@@ -110,15 +110,18 @@
var groupedData = new Dictionary<string, StockDetailByMateriel>();
foreach (var item in allData)
{
+
+ string groupKey = $"{item.MaterielCode}|{item.SupplyCode}|{item.BatchNo}|{item.WarehouseCode}";
+
// 纭繚鍒濆鍊间负decimal绫诲瀷
- if (groupedData.ContainsKey(item.MaterielCode))
+ if (groupedData.ContainsKey(groupKey))
{
- groupedData[item.MaterielCode].StockQuantity += Convert.ToDecimal(item.StockQuantity);
- groupedData[item.MaterielCode].OutboundQuantity += Convert.ToDecimal(item.OutboundQuantity);
+ groupedData[groupKey].StockQuantity += Convert.ToDecimal(item.StockQuantity);
+ groupedData[groupKey].OutboundQuantity += Convert.ToDecimal(item.OutboundQuantity);
}
else
{
- groupedData[item.MaterielCode] = new StockDetailByMateriel
+ groupedData[groupKey] = new StockDetailByMateriel
{
StockId = item.StockId,
MaterielCode = item.MaterielCode,
--
Gitblit v1.9.3