From e83bd2f6a38957c0d47c9e0a6c6b2ca45836e114 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 08 十一月 2025 10:13:43 +0800
Subject: [PATCH] 提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 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_TaskInfoService/TaskService.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_TaskInfoService/TaskService.cs"
index e1afe73..225e7f6 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_TaskInfoService/TaskService.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_TaskInfoService/TaskService.cs"
@@ -156,7 +156,7 @@
             decimal beforeQuantity = 0;
 
             //鏌ュ簱瀛�
-            Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
+            Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
             if (stockInfo == null)
             {
                 return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
@@ -264,7 +264,7 @@
                                supplyCode = group.Key.SupplyCode,
                                batchNo = group.Key.BatchNo,
                                lineNo = group.Key.lineNo,
-                               warehouseCode = group.Key.WarehouseCode,
+                               warehouseCode = group.Key.WarehouseCode=="0"?"1072": group.Key.WarehouseCode,
                                unit= group.Key.BarcodeUnit,
                                barcodes = group.Select(row => new FeedbackBarcodesModel
                                {
@@ -273,7 +273,7 @@
                                }).ToList()
                            }).ToList();
                         feedmodel.details = groupedData;
-
+                        
                         _invokeMESService.FeedbackInbound(feedmodel);
                     }
 
@@ -359,7 +359,7 @@
                     return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
                 }
 
-                _stockRepository.Db.Deleteable(stockInfo);
+               // _stockRepository.Db.Deleteable(stockInfo);
 
                 int beforeStatus = locationInfo.LocationStatus;
 

--
Gitblit v1.9.3