diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
index 4582b70..00c4957 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
@@ -162,8 +162,14 @@ public class ScheduleThread {
      */
     public void startAllThread() {
         plcSsjReadCustomThread.getThread().start();
-        plcDdj1ReadCustomThread.getThread().start();
-        plcDdj4ReadCustomThread.getThread().start();
+        if (plcDdj1ReadCustomThread!=null){
+            plcDdj1ReadCustomThread.getThread().start();
+
+        }
+        if (plcDdj4ReadCustomThread!=null){
+            plcDdj4ReadCustomThread.getThread().start();
+
+        }
         /*plcDdj2ReadCustomThread.getThread().start();
         plcDdj3ReadCustomThread.getThread().start();
         plcDdj4ReadCustomThread.getThread().start();
@@ -177,8 +183,14 @@ public class ScheduleThread {
      */
     public void startAllThread2() {
         monitoringCustomThread.thread.start();
-        ddj1CustomThread.thread.start();
-        ddj4CustomThread.thread.start();
+        if (ddj1CustomThread!=null){
+            ddj1CustomThread.thread.start();
+
+        }
+        if (ddj4CustomThread!=null){
+            ddj4CustomThread.thread.start();
+
+        }
         /*ddj2CustomThread.thread.start();
         ddj3CustomThread.thread.start();
         ddj4CustomThread.thread.start();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
index 640873c..b223c5a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
@@ -198,6 +198,7 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
                         ddjDeviceExecutionQueue.setMlfs(5);
                         ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date()));
                         ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_3);
+                        ddjDeviceExecutionQueue.setSpare2(outSsj);
                         ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
                         outJob.setStatus("3");
                         outJob.setStartTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
@@ -355,6 +356,7 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
                     ddjDeviceExecutionQueue.setMlfs(5);
                     ddjDeviceExecutionQueue.setScsj(DateUtil.formatDateTime(DateUtil.date()));
                     ddjDeviceExecutionQueue.setRwlx(DDJ_RWLX_4);
+                    ddjDeviceExecutionQueue.setSpare2(road);
                     ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
                 }
             }
@@ -400,7 +402,6 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
                     ddjDeviceExecutionQueue.setScsj(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
                     ddjDeviceExecutionQueue.setMlfs(3);
                     ddjDeviceExecutionQueue.setSpare1("0");
-                    //ddjDeviceExecutionQueue.setSpare2(Convert.toStr(ddj.getHeight()));
                     ddjDeviceExecutionQueue.setSpare3(Convert.toStr(weight));
                     ddjDeviceExecutionQueueService.insertDdjDeviceExecutionQueue(ddjDeviceExecutionQueue);
                 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java
index 5f3a476..678bc10 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/impl/Ddj1Thread.java
@@ -65,7 +65,7 @@ public class Ddj1Thread extends BaseDdjThread {
         roadwayRollback.put("L2007", 82);
         roadwayRollback.put("L2008", 83);
         //初始化称重设备连接ip port
-        czRoadwayMap.put("L2001", "172.19.50.72:4001");
+        czRoadwayMap.put("L2001", "172.19.50.71:4001");
         czRoadwayMap.put("L2002", "172.19.50.72:4001");
         czRoadwayMap.put("L2007", "172.19.50.73:4001");
         czRoadwayMap.put("L2008", "172.19.50.74:4001");
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 605181e..7cff0ab 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
         druid:
             #主数据信息
             master:
-                url: jdbc:sqlserver://172.19.1.119:1433;databaseName=FT541-wcs;
+                url: jdbc:sqlserver://172.19.1.119:1433;databaseName=FT541-wcs-2;
                 username: sa
                 password: Flrd0914.
             # 从库数据源