From 63b7c5764a2b567a1aeaf939e0edabf98aba2378 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 17 六月 2025 12:59:14 +0800
Subject: [PATCH] qx

---
 HH.WCS.QingXiNongfu/process/TaskProcess.cs |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 2a50fd8..7ca0154 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -1523,6 +1523,13 @@
                     }
                 }
 
+                if (Settings.GetDeviceInfoList().Find(x => x.location.Contains(mst.S_END_LOC))?.deviceType == 13 && mst.S_TYPE.Contains("鏀剁缉鑶滃弶杩�))
+                {
+                    end = 7682;
+                }
+
+
+
                 LogHelper.Info("SendTask " + mst.S_TASK_NO);
                 Console.WriteLine("start=" + start.ToString());
                 Console.WriteLine("end= " + end.ToString());
@@ -1600,7 +1607,7 @@
         /// <param name="trayCarryCount"></param>
         /// <param name="priority"></param>
         /// <returns></returns>
-        public static bool CreateTransport(string wWorkNo, string start, string end, string taskType, List<string> cntrs, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1, string note = "")
+        public static bool CreateTransport(string wWorkNo, string start, string end, string taskType, List<string> cntrs, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1, string note = "", string TwoEndLoc = "")
         {
             var result = false;
             //鎵规鍙峰瓨鎵樼洏鍙凤紝1~3涓墭鐩�@@ -1609,7 +1616,7 @@
 
             LogHelper.Info($"CreateTransport-  " + $"{taskNo}-{start}-{end}-{taskType}");
 
-            var res = TaskHelper.CreateTask(wWorkNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, trayCarryCount, startLayer, endLayer, note, lockLoc: true);
+            var res = TaskHelper.CreateTask(wWorkNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, trayCarryCount, startLayer, endLayer, note, lockLoc: true, TwoEndLoc);
             if (res)
             {
                 result = true;

--
Gitblit v1.9.1