From 6bb120706b6b6aacbbe96bc6d172a31950fa6206 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期四, 13 十一月 2025 09:36:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 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 a2dda4f..f772492 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"
@@ -252,7 +252,7 @@
                             business_type = inboundOrder.BusinessType,
                             factoryArea = inboundOrder.FactoryArea,
                             operationType = 1,
-                            Operator = inboundOrder.Modifier,
+                            Operator = inboundOrder.Operator,
                             orderNo = inboundOrder.UpperOrderNo,
                             status = inboundOrder.OrderStatus,
                             details = new List<FeedbackInboundDetailsModel>()
@@ -350,7 +350,7 @@
             WebResponseContent content = new WebResponseContent();
             try
             {
-                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>().Where(x => x.PalletCode == task.PalletCode  ).First();
                 if (stockInfo == null)
                 {
                     return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑搴撳瓨淇℃伅");
@@ -362,7 +362,7 @@
                     return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
                 }
 
-               // _stockRepository.Db.Deleteable(stockInfo);
+                _stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();
 
                 int beforeStatus = locationInfo.LocationStatus;
 

--
Gitblit v1.9.3