From a859c92ab9368b061da7e3b1bbe576043da868aa Mon Sep 17 00:00:00 2001 From: zjj <zjj123456> Date: 星期六, 16 三月 2024 10:26:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 +- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 9a781a5..7631d84 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -200,6 +200,9 @@ if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){ continue; } + if (taskWrk.getStatus() != 2){ + continue; + } //鑾峰彇鍫嗗灈鏈虹珯鐐� StaDesc staDesc = new StaDesc(); if (devp.getId() <= 1){ diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index a11b349..efd2def 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -318,7 +318,7 @@ CrnCommand one = new CrnCommand(); one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0)); one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2)); - //one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4)); + one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4)); one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6)); one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8)); one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10)); -- Gitblit v1.9.1