From fd9b720fe6568f6aef072c5c1361bf95d11ff4c1 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Sun, 28 Sep 2025 09:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E9=80=81=E6=9C=BA=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/schedule/ScheduleThread.java    |  8 ++++++-
 .../schedule/plcRead/ssj/PlcSsjRead.java      | 21 ++++++++-----------
 .../resources/mapper/device/MsgDdjMapper.xml  |  6 +++---
 3 files changed, 19 insertions(+), 16 deletions(-)

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 27dfca3..03788b7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
@@ -111,7 +111,13 @@ public class ScheduleThread {
         ConcurrentHashMap<String, MsgDdj> ddjList = new ConcurrentHashMap<>();
         List<MsgDdj> msgDdjs = msgDdjService.selectMsgDdjList(new MsgDdj());
         for (MsgDdj msgDdj : msgDdjs) {
-            ddjList.put("ddj"+msgDdj.getId(), msgDdj);
+            switch (msgDdj.getId()){
+                case 1:
+                    msgDdj.setPlcDbReadAddress("DB40.0");
+                case 2:
+                    msgDdj.setPlcDbReadAddress("DB41.0");
+            }
+            ddjList.put("ddj" + msgDdj.getId(), msgDdj);
         }
         PlcDdjRead plcDdjRead = new PlcDdjRead(ddjList, new PlcConnectInfo("127.0.0.1", 102));
         Thread plcDdjReadThread = new Thread(plcDdjRead);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
index 9d97785..b68322e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
@@ -52,16 +52,16 @@ public class PlcSsjRead implements Runnable {
                         DeviceSsj ssjDevice = deviceSsjMap.get(ssjCode);
                         switch (ssjDevice.getType()) {
                             case "1":
-                                readPlcOutSsj(ssjDevice);
+                                readPlcLineSsj(ssjDevice);
                                 break;
                             case "2":
-                                readPlcPickSsj(ssjDevice);
+                                readPlcInOutSsj(ssjDevice);
                                 break;
                             case "3":
-                                readPlcInSsj(ssjDevice);
+                                readPlcOtherSsj(ssjDevice);
                                 break;
                             case "4":
-                                readPlcOtherSsj(ssjDevice);
+                                readPlcRoadWaySsj(ssjDevice);
                                 break;
                         }
                     }
@@ -92,9 +92,7 @@ public class PlcSsjRead implements Runnable {
             ddsx1 = SoftBasic.ByteToHexString(read2.Content);
             ssjDevice.setKx(ParseUtil.optInt(0, ddsx1));
             ssjDevice.setDw(ParseUtil.optInt(2, ddsx1));
-            ssjDevice.setRkqq(ParseUtil.optInt(4, ddsx1));
             ssjDevice.setTaskNo(ParseUtil.optDInt(6, ddsx1));
-            ssjDevice.setTrayCode(ParseUtil.optString(10, ddsx1));
         }
     }
 
@@ -103,7 +101,7 @@ public class PlcSsjRead implements Runnable {
      *
      * @param ssjDevice
      */
-    private void readPlcInSsj(DeviceSsj ssjDevice) {
+    private void readPlcRoadWaySsj(DeviceSsj ssjDevice) {
         OperateResultExOne<byte[]> read2 = readWriteNet.Read(ssjDevice.getPlcDbReadAddress(), Short.parseShort("20"));
         String ddsx1 = "0";
         if (read2.IsSuccess) {
@@ -112,7 +110,6 @@ public class PlcSsjRead implements Runnable {
             ssjDevice.setDw(ParseUtil.optInt(2, ddsx1));
             ssjDevice.setRkqq(ParseUtil.optInt(4, ddsx1));
             ssjDevice.setTaskNo(ParseUtil.optDInt(6, ddsx1));
-            ssjDevice.setTrayCode(ParseUtil.optString(12, ddsx1));
         }
     }
 
@@ -121,16 +118,15 @@ public class PlcSsjRead implements Runnable {
      *
      * @param ssjDevice
      */
-    private void readPlcPickSsj(DeviceSsj ssjDevice) {
+    private void readPlcInOutSsj(DeviceSsj ssjDevice) {
         OperateResultExOne<byte[]> read2 = readWriteNet.Read(ssjDevice.getPlcDbReadAddress(), Short.parseShort("20"));
         String ddsx1 = "0";
         if (read2.IsSuccess) {
             ddsx1 = SoftBasic.ByteToHexString(read2.Content);
             ssjDevice.setKx(ParseUtil.optInt(0, ddsx1));
             ssjDevice.setDw(ParseUtil.optInt(2, ddsx1));
-            ssjDevice.setRkqq(ParseUtil.optInt(4, ddsx1));
             ssjDevice.setTaskNo(ParseUtil.optDInt(6, ddsx1));
-            ssjDevice.setTrayCode(ParseUtil.optString(10, ddsx1));
+            ssjDevice.setException(ParseUtil.optInt(8, ddsx1));
         }
     }
 
@@ -139,7 +135,7 @@ public class PlcSsjRead implements Runnable {
      *
      * @param ssjDevice
      */
-    private void readPlcOutSsj(DeviceSsj ssjDevice) {
+    private void readPlcLineSsj(DeviceSsj ssjDevice) {
         OperateResultExOne<byte[]> read2 = readWriteNet.Read(ssjDevice.getPlcDbReadAddress(), Short.parseShort("20"));
         String ddsx1 = "0";
         if (read2.IsSuccess) {
@@ -149,6 +145,7 @@ public class PlcSsjRead implements Runnable {
             ssjDevice.setRkqq(ParseUtil.optInt(4, ddsx1));
             ssjDevice.setTaskNo(ParseUtil.optDInt(6, ddsx1));
             ssjDevice.setTrayCode(ParseUtil.optString(10, ddsx1));
+            ssjDevice.setTraySize(ParseUtil.optInt(14, ddsx1));
         }
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/device/MsgDdjMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/MsgDdjMapper.xml
index 87deede..6d459e0 100644
--- a/ruoyi-admin/src/main/resources/mapper/device/MsgDdjMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/device/MsgDdjMapper.xml
@@ -114,9 +114,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sbzt != null">sbzt = #{sbzt},</if>
             <if test="czfs != null">czfs = #{czfs},</if>
             <if test="yxxf != null">yxxf = #{yxxf},</if>
-            <if test="yph != null">yp = #{yph},</if>
-            <if test="ylh != null">yl = #{ylh},</if>
-            <if test="ych != null">yc = #{ych},</if>
+            <if test="yph != null">yph = #{yph},</if>
+            <if test="ylh != null">ylh = #{ylh},</if>
+            <if test="ych != null">ych = #{ych},</if>
             <if test="mbph != null">mbp = #{mbph},</if>
             <if test="mblh != null">mbl = #{mblh},</if>
             <if test="mbch != null">mbc = #{mbch},</if>