From 29f20b28392d212c04c0c40a512894f8622cfa53 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 16 四月 2025 09:32:01 +0800
Subject: [PATCH] 合并

---
 CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
index f871924..12ab8e6 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
@@ -44,7 +44,7 @@
         try
         {
             // 鍒ゆ柇闇�涓嶉渶瑕佸幓鍖呰锛屼笉闇�瑕佸氨鍘诲父娓╀笁
-            var stationManagers = _stationManagerRepository.QueryData(x => x.stationPLC == "1018" && x.stationArea == "Cache" && x.productLine == input.ProductionLine);
+            var stationManagers = _stationManagerRepository.QueryData(x => x.stationPLC == "1007" && x.stationArea == "Cache" && x.productLine == input.ProductionLine);
 
             var STATION = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
 
@@ -78,16 +78,18 @@
 
             // TODO 鍒ゆ柇鍦ㄩ�旀暟閲�
 
-            var needBarcode = await SqlSugarHelper.DbWCS.Queryable<dt_needBarcode>().FirstAsync(x => x.productLine == STATION.productLine);
+            var needBarcode = await SqlSugarHelper.DbWCS.Queryable<dt_needBarcode>().FirstAsync(x => x.productLine == STATION.productLine && x.fromArea == "CW");
             var needCount = needBarcode.inLineNum;
             //var count = BaseDal.QueryData(x => x.TargetAddress == stationManagers[0].Roadway).Count;
             if (needCount < needBarcode.cacheNum)
             {
                 // 閫佽嚦鍖呰
                 List<string> strings = stationManagers.Where(x => x.stationType == 0 && x.productLine == input.ProductionLine).Select(x => x.Roadway).ToList();
+
                 var x = await SqlSugarHelper.DbWCS.Updateable<dt_needBarcode>()
                     .SetColumns(x => x.inLineNum == x.inLineNum + 1)
                     .Where(x => x.id == needBarcode.id).ExecuteCommandHasChangeAsync();
+
                 ConsoleHelper.WriteSuccessLine($"鍦ㄩ�旀暟閲忔坊鍔爗(x ? "鎴愬姛" : "澶辫触")}鏁伴噺+1,褰撳墠宸ュ簭{boxing.ProcessCode},浜х嚎{input.ProductionLine}");
                 LogFactory.GetLog("OCVB").InfoFormat(true, $"鍦ㄩ�旀暟閲忔坊鍔爗(x ? "鎴愬姛" : "澶辫触")}鏁伴噺+1,褰撳墠宸ュ簭{boxing.ProcessCode},浜х嚎{input.ProductionLine}", "鏃犲弬鏁�");
                 return await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings, 3);

--
Gitblit v1.9.3