From f0e2d9d2c7c41b311217bdb2c4d114ff53f6a146 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 16 四月 2024 07:47:17 +0800
Subject: [PATCH] 优化空托逻辑

---
 代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs"
index 79a3d97..b3837d0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ReplaceTray.cs"
@@ -63,12 +63,12 @@
                     var types = station.tray_type.Split('/');
                     var area = types[0] == "SmallTray" ? "11" : "10";
                     //鎵�1搴撳尯鐨勭┖鎵樹綅
-
-                    var EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains("A") /*&& x.location_state == "Empty"*/ && x.enable)
-                        .OrderBy(x => x.column).OrderBy(x => x.line).FirstOrDefault();
-                    if (EmptyStation == null)
-                        EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") /*&& x.location_state == "Empty"*/ && x.enable)
-                        .OrderBy(x => x.line).OrderBy(x => x.column).FirstOrDefault();
+                    var EmptyStation = GetStation.EmptyPalletStation(area);
+                    //var EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains("A") /*&& x.location_state == "Empty"*/ && x.enable)
+                    //    .OrderBy(x => x.column).OrderBy(x => x.line).FirstOrDefault();
+                    //if (EmptyStation == null)
+                    //    EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") /*&& x.location_state == "Empty"*/ && x.enable)
+                    //    .OrderBy(x => x.line).OrderBy(x => x.column).FirstOrDefault();
                     if (EmptyStation != null)
                     {
                         dt_agvtask agvtask = new dt_agvtask()
@@ -93,6 +93,8 @@
                             agv_Traytype = types[0]
                         };
                         agvtaskRepository.Add(agvtask, true);
+                        EmptyStation.location_state = LocationStateEnum.Busy.ToString();
+                        stationinfoRepository.Update(EmptyStation, true);
                         WriteDBLog.Success("鍒涘缓鏇存崲绌虹洏浠诲姟", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
                         CreatePartQueue(agvtaskRepository, agvtask, types[1]);
                     }

--
Gitblit v1.9.3