From c8e93170cbce244ff4cb06bf120bcede279ca297 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 12 十月 2022 10:17:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java      |    8 +++++---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 +-
 2 files changed, 6 insertions(+), 4 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 2392b6b..3ac56af 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2627,9 +2627,9 @@
                     wrkCharge.setIoPri((double) 10);
                     wrkCharge.setSourceLocNo(sourceLocNo);
                     wrkCharge.setLocNo(locNo);
+                    wrkCharge.setMemo("demo");
                     if (!wrkChargeService.insert(wrkCharge)) {
                         log.error("鐢熸垚婕旂ず浠诲姟澶辫触锛屽爢鍨涙満鍙凤細{}锛屽皬杞︼細{}锛屾簮搴撲綅锛歿}锛岀洰鏍囧簱浣嶏細{}", crn.getId(), steNo, sourceLocNo, locNo);
-                        continue;
                     }
                 }
             }
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index c886c18..30723f7 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -239,9 +239,11 @@
         OperateResult result = siemensNet.Write("DB100.0", array);
 
         if (command.getAckFinish() == 0) {
-            short commandFinish = 1;
-            Thread.sleep(100);
-            result = siemensNet.Write("DB100.18", commandFinish);
+            if (result.IsSuccess) {
+                short commandFinish = 1;
+                Thread.sleep(300);
+                result = siemensNet.Write("DB100.18", commandFinish);
+            }
         }
 
         try {

--
Gitblit v1.9.1