From e9a5f5c065e7232e9d5ca1f2a4948d2f8e6e0c03 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 27 四月 2025 09:29:25 +0800
Subject: [PATCH] 米多泉州wcs开发完成

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 7cd498d..9f6e7cb 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -278,16 +278,10 @@
         array[7] = command.getDestinationPosY(); // 鐩爣浣嶇疆鍒楀彿
         array[8] = command.getDestinationPosZ(); // 鐩爣浣嶇疆灞傚彿
         array[9] = command.getCommand();
-//        array[10] = 0;   //澶囩敤1
-
-//        boolean[] array2 = new boolean[1];
-//        array2[0] = command.isTraySize();
         OperateResult result = siemensNet.Write("DB100.0", array);
-//        OperateResult result2 = siemensNet.Write("DB100.22", array2);
         News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
 
-//        if(!result.IsSuccess || !result2.IsSuccess){
-            if(!result.IsSuccess){
+        if(!result.IsSuccess){
             News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
             MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
             Thread.sleep(100);
@@ -372,14 +366,6 @@
             }
         }
 
-//        if (command.getAckFinish() == 0) {
-//            short commandFinish = 1;
-//            Thread.sleep(200L);
-//            result = siemensNet.Write("DB100.18", commandFinish);
-//            log.info("鍫嗗灈鏈篶ommandFinish涓嬪彂[id:{}] >>>>> {}", slave.getId(), commandFinish);
-////            result = siemensNet.Write("DB100.22", commandFinish);
-//        }
-
         try {
             // 鏃ュ織璁板綍
             BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
@@ -403,7 +389,7 @@
             bean.insert(basCrnOpt);
         } catch (Exception ignore) {}
 
-        if (result != null && result.IsSuccess) {
+        if (result.IsSuccess) {
             this.readStatus();
             News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));

--
Gitblit v1.9.1