From 649a53d114a121a0af785c67a8ca1bd8142f4b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B1=97=E9=9D=92?= <lhq@flrd.com>
Date: Thu, 27 Aug 2026 10:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FT503-WCS.iml                                 | 21 -------------------
 .../abb/schedule/ABBThreadSchedule.java       | 15 +++++++------
 .../dss/ats/customs/abb/schedule/DbGet.java   |  2 +-
 .../ats/customs/abb/schedule/RgvThread3.java  |  2 +-
 4 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 FT503-WCS.iml

diff --git a/FT503-WCS.iml b/FT503-WCS.iml
deleted file mode 100644
index 33e36bd..0000000
--- a/FT503-WCS.iml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="hibernate" name="Hibernate">
-      <configuration>
-        <datasource-map />
-        <naming-strategy-map />
-        <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/wmsdssconfig/abb/hibernate.cfg.xml" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="lib" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/com/wms/dss/ats/customs/abb/schedule/ABBThreadSchedule.java b/src/com/wms/dss/ats/customs/abb/schedule/ABBThreadSchedule.java
index 212b926..06f3e47 100644
--- a/src/com/wms/dss/ats/customs/abb/schedule/ABBThreadSchedule.java
+++ b/src/com/wms/dss/ats/customs/abb/schedule/ABBThreadSchedule.java
@@ -46,18 +46,13 @@ public class ABBThreadSchedule extends ThreadSchedule {
 			productionLineEndSsjThread.start();
 			Thread.sleep(400);
 
-			/*productionLineStartSsjThread = new ProductionLineStartSsjThread(m_hsSysParam);
-			productionLineStartSsjThread.setName("产线入库开始输送机");
-			productionLineStartSsjThread.start();
-			Thread.sleep(400);*/
+
+			Thread.sleep(400);
 			outTraySsjThread = new OutTraySsjThread(m_hsSysParam);
 			outTraySsjThread.setName("空托盘出库输送机");
 			outTraySsjThread.start();
 			Thread.sleep(400);
-			callTraySsjThread = new CallTraySsjThread(m_hsSysParam);
-			callTraySsjThread.setName("呼叫空托盘线程");
-			callTraySsjThread.start();
-			Thread.sleep(400);
+
 
 			rgvThread2 = new RgvThread2(m_hsSysParam);
 			rgvThread2.setName("RGV2线程组");
@@ -71,6 +66,10 @@ public class ABBThreadSchedule extends ThreadSchedule {
 			rgvThread3.setName("RGV3线程组");
 			rgvThread3.start();
 			Thread.sleep(400);
+			callTraySsjThread = new CallTraySsjThread(m_hsSysParam);
+			callTraySsjThread.setName("呼叫空托盘线程");
+			callTraySsjThread.start();
+			Thread.sleep(400);
 
 		} catch (Exception er) {
 			Logger.error("........设备调度线程启动出错........" + er.getMessage());
diff --git a/src/com/wms/dss/ats/customs/abb/schedule/DbGet.java b/src/com/wms/dss/ats/customs/abb/schedule/DbGet.java
index 2b68abc..2a14546 100644
--- a/src/com/wms/dss/ats/customs/abb/schedule/DbGet.java
+++ b/src/com/wms/dss/ats/customs/abb/schedule/DbGet.java
@@ -54,8 +54,8 @@ public class DbGet {
         List<SsjDevice> ls = new ArrayList<>();
         try {
             HashMap<?, ?> hsSSJMap = (HashMap<?, ?>) hsComParamSSJ.get("hsSSJMap");
-            ls.add((SsjDevice) hsSSJMap.get("productionLineStartSsj-5"));
             ls.add((SsjDevice) hsSSJMap.get("productionLineStartSsj-6"));
+            ls.add((SsjDevice) hsSSJMap.get("productionLineStartSsj-5"));
         } catch (Exception ex) {
             Logger.error("获取输送机状态信息异常" + ex.getMessage());
         }
diff --git a/src/com/wms/dss/ats/customs/abb/schedule/RgvThread3.java b/src/com/wms/dss/ats/customs/abb/schedule/RgvThread3.java
index 2c8415c..8986e3c 100644
--- a/src/com/wms/dss/ats/customs/abb/schedule/RgvThread3.java
+++ b/src/com/wms/dss/ats/customs/abb/schedule/RgvThread3.java
@@ -136,7 +136,7 @@ public class RgvThread3 extends CraneThread {
             Optional<SsjDevice> first = trayDisassembleEndSsj.stream().filter(x -> (x.RKDW == 1 && x.ssjNo.equals(startPoint))).findFirst();
             if (first.isPresent()){
                 SsjDevice startSsj = first.get();
-                QueryDbDataUtils.createRgvQueue(m_dao,startSsj.ssjNo, startSsj.RWH, "1111",TYPE_A_1.getXd(),TYPE_A_1.getCode());
+                QueryDbDataUtils.createRgvQueue(m_dao,startSsj.ssjNo, startSsj.RWH, "1017",TYPE_A_1.getXd(),TYPE_A_1.getCode());
             }/*else {
                 Optional<SsjDevice> first1 = trayDisassembleEndSsj.stream().filter(x -> x.RKDW == 1).findFirst();
                 if (first1.isPresent()){