From 1a0c5192cd1269a1aa2c0af94fc2bcb5fcc9a056 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期四, 26 六月 2025 17:16:11 +0800
Subject: [PATCH] 111

---
 HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs        |   13 ++++++++++++-
 HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs |    2 +-
 HH.WCS.Mobox3.NongFuLinZhi/models/LocationExt.cs  |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs b/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs
index 89efb2a..188adbe 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs
@@ -314,7 +314,18 @@
                 var areaInfo = Settings.areaInfos.Where(a => a.areaName == "鐡跺澂闈炲嵆浜х┖妗� && a.enable == 1).FirstOrDefault();
                 if(areaInfo != null)
                 {
-
+                    var locInfo = db.Queryable<Location>().Where(a => a.S_AREA_CODE == areaInfo.areaCode && a.N_CURRENT_NUM == 0 && a.S_LOCK_STATE == "鏃�).First();
+                    if(locInfo != null)
+                    {
+                        //鐢熸垚浠诲姟
+                        Location location = TaskProcess.BCPInOrOut(db, false, "鐡跺澂搴撳尯", "");
+                        if (location != null)
+                        {
+                            string cntrCode = getCntrCode(db, location);
+                            //鍒涘缓浣滀笟
+                            WMSHelper.CreateOpTask(location.S_CODE, locInfo.S_CODE, "鍏ュ簱", "鐡跺澂闈炴�浜цˉ绌烘", cntrCode, "鐡跺澂");
+                        }
+                    }
                 }
                 else
                 {
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/models/LocationExt.cs b/HH.WCS.Mobox3.NongFuLinZhi/models/LocationExt.cs
index 6756fa3..f1db705 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/models/LocationExt.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/models/LocationExt.cs
@@ -4,7 +4,7 @@
 
 namespace HH.WCS.Mobox3.NFLZ {
 
-    [SugarTable("LocationExt")]
+    [SugarTable("TN_LocationExt")]
     public class LocationExt : BaseModel 
     {
         /// <summary>
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs b/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
index 787df20..8bf9e63 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
@@ -1109,7 +1109,7 @@
                         }
                         if (mst.N_END_LAYER > 1)
                         {
-                            Extend2 = db.Queryable<LocationExt>().Where(a => a.S_LOC_CODE == mst.S_START_LOC && a.N_LAYER == mst.N_END_LAYER).First().S_AGV_SITE;
+                            Extend2 = db.Queryable<LocationExt>().Where(a => a.S_LOC_CODE == mst.S_END_LOC && a.N_LAYER == mst.N_END_LAYER).First().S_AGV_SITE;
                         }
                         if(mst.S_TYPE == "鐡跺澂闈炴�浜цˉ婊℃" || mst.S_TYPE == "鐡剁洊闈炴�浜цˉ婊℃" || mst.S_TYPE == "鐡跺澂闈炴�浜цˉ绌烘" || mst.S_TYPE == "鐡剁洊闈炴�浜цˉ绌烘" || mst.S_TYPE == "娉ㄥ鍗充骇婊℃墭涓嬬嚎锛堢摱鍧級")
                         {

--
Gitblit v1.9.1