From ce7a8f994eead6c0c982afa01919427685b2bd1c Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 21 五月 2025 11:02:55 +0800
Subject: [PATCH] #调试

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java   |    2 +-
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    9 +++++++--
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |   17 +++++++++++++++--
 3 files changed, 23 insertions(+), 5 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 341a528..1f14dbc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -151,18 +151,22 @@
                     back = true;
                 }
                 if (!back && staProtocol.getWeight() > 1000) {
-                    errMsg = "瓒呴噸";
+                    errMsg = "瓒呴噸鎴栨湭璇诲彇";
                     back = true;
                 }
                 if (!back && staProtocol.isBarcodeErr()) {
                     errMsg = "鎵爜澶辫触";
                     back = true;
                 }
+                if(staProtocol.getWeight() <= 0 ){
+                    continue;
+                }
 //                if (!back && staProtocol.getWeight() == 0.0) {
 //                    errMsg = "閲嶉噺鑾峰彇澶辫触";
 //                    back = true;
 //                }
 
+//                News.info("{}閲嶉噺", staProtocol.getWeight());
 
                 // 閫�鍥�
                 if (back) {
@@ -307,7 +311,8 @@
                             staProtocol.setStaNo(inSta.getBackSta().shortValue());
                             devpThread.setPakMk(staProtocol.getSiteId(), false);
                             MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//
+                            log.error("杈撻�佺嚎涓嬪彂2锛�" + staProtocol.getWorkNo() + "," + staProtocol.getStaNo());
+
 //                            if (ledThread != null) {
                             String errorMsg = jsonObject.getString("msg");
                             if (!Cools.isEmpty(errorMsg)) {
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index f155d99..090619e 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -121,7 +121,7 @@
         basDevp.setLocType2((short) 0);  // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
         basDevp.setLocType3((short) 0);  // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
         basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
-        basDevp.setInQty(weight !=null ?(int)weight : 0);
+        basDevp.setMaxWt((double) (weight !=null ?(int)weight : 0));
         return basDevp;
     }
 
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 88ad1af..6f726be 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -274,6 +274,8 @@
         int staNoSize = staNos.size();
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (500 * 8));
         OperateResultExOne<byte[]> resultWeight = siemensS7Net.Read("DB102.0", (short)  (8 * 4));
+        OperateResultExOne<byte[]> resultWeight2 = siemensS7Net.Read("DB102.0", (short)  (4 * 4));
+
         if (result.IsSuccess && resultWeight.IsSuccess) {
             int j = 0;
             for(int i = 0 ; i<staNoSize;i++){
@@ -289,8 +291,14 @@
 
                 staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset));     // 宸ヤ綔鍙�
                 if (staNoWeight.contains(siteId)) {
-                    staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight.Content, j));
-                    j = j + 4;
+                    if(staNoWeight.size() == 4){
+                        staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight2.Content, j));
+                        j = j + 4;
+                    }else{
+                        staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight.Content, j));
+                        j = j + 4;
+
+                    }
                 }
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, offset+ 4));   // 鐩爣绔�
                 status = siemensS7Net.getByteTransform().TransBool(result.Content, offset+ 6, 2);
@@ -332,6 +340,11 @@
                     Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
                     boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
                     StaProtocol staProtocol = station.get(siteId);
+                    if (staProtocol == null) {
+                        staProtocol = new StaProtocol();
+                        staProtocol.setSiteId(siteId);
+                        station.put(siteId, staProtocol);
+                    }
                     staProtocol.setFrontErr(status[0]);
                     staProtocol.setBackErr(status[1]);
                     staProtocol.setHighErr(status[2]);

--
Gitblit v1.9.1