From 945a65e917ffd620fc51354245f0e5b31f7a03ab Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期二, 13 五月 2025 18:09:56 +0800
Subject: [PATCH] 中策金坛

---
 dispatch/WcsTask.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 1dd1249..89a5593 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -942,7 +942,8 @@
                     Type = "3";
                     Meshod = "AgvRequestCancel";
                 }
-                else if (state == 4) {
+                else if (state == 4)
+                {
                     //鐢宠鍑洪棬
                     Type = "4";
                     Meshod = "AgvRequest";
@@ -1161,7 +1162,7 @@
 
                       var endLoc = LocationHelper.GetLocOne(task.S_END_LOC);
 
-                       var end = newDb.Queryable<Location>().Where(a => a.S_AREA_CODE == endLoc.S_AREA_CODE && a.N_ROW == endLoc.N_ROW && a.N_COL > endLoc.N_COL && a.S_LOCK_STATE == "鏃� && a.N_CURRENT_NUM == 0).OrderBy(b=>b.N_COL).First();
+                       var end = newDb.Queryable<Location>().Where(a => a.S_AREA_CODE == endLoc.S_AREA_CODE && a.N_ROW == endLoc.N_ROW && a.N_COL > endLoc.N_COL && a.S_LOCK_STATE == "鏃� && a.N_CURRENT_NUM == 0 && a.C_ENABLE=="Y").OrderBy(b=>b.N_COL).First();
 
                       LogHelper.Info($"Wcs鏀捐揣鏈夎揣瀵绘壘鏂扮粓鐐逛俊鎭� + JsonConvert.SerializeObject(end), "鏀捐揣鏈夎揣");
 

--
Gitblit v1.9.1