From 4c5e20c4b76c8d6ec5d8ad49ef88fdd51844ade5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 十月 2023 17:10:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 9 ++++++++-
src/main/resources/application.yml | 26 ++++++++++++++++----------
src/main/java/com/zy/core/ServerBootstrap.java | 6 +++---
3 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index e8e5600..739b86c 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -84,9 +84,9 @@
new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}else {
- DevpThread devpThread = new SiemensDevpThread2(devp);
- new Thread((Runnable) devpThread).start();
- SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
+// DevpThread devpThread = new SiemensDevpThread2(devp);
+// new Thread((Runnable) devpThread).start();
+// SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
}
// 鍒濆鍖栨彁鍗囨満
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 732b469..e184c27 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -177,7 +177,14 @@
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 88);
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ String barcode = null;
+ if (i == 8) {
+ barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,13, "UTF-8");
+ } else if (i == 9) {
+ barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8 + 6,13, "UTF-8");
+ } else {
+ barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ }
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 80560d9..5275b1f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -110,7 +110,7 @@
inSta[6]:
staNo: 346
backSta: 345
- barcode: ${wcs-slave.barcode[8].id}
+ barcode: ${wcs-slave.barcode[6].id}
led: ${wcs-slave.led[0].id}
liftNo: ${wcs-slave.lift[2].id}
# 绌烘澘鍏ュ簱鍙�1
@@ -159,7 +159,7 @@
emptyInSta[6]:
staNo: 346
backSta: 345
- barcode: ${wcs-slave.barcode[8].id}
+ barcode: ${wcs-slave.barcode[6].id}
led: ${wcs-slave.led[0].id}
liftNo: ${wcs-slave.lift[2].id}
# 鍑哄簱鍙�1
@@ -232,9 +232,15 @@
led: ${wcs-slave.led[0].id}
liftNo: ${wcs-slave.lift[2].id}
pickInSta[6]:
+ staNo: 341
+ backSta: 340
+ barcode: ${wcs-slave.barcode[7].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[2].id}
+ pickInSta[7]:
staNo: 346
backSta: 345
- barcode: ${wcs-slave.barcode[8].id}
+ barcode: ${wcs-slave.barcode[6].id}
led: ${wcs-slave.led[0].id}
liftNo: ${wcs-slave.lift[2].id}
# # 璐ф灦鍏ュ簱绔欑偣
@@ -293,13 +299,13 @@
# row: 4
# bay: 6
# lev: 6
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.58
- port: 102
- rack: 0
- slot: 0
+# # 杈撻�佺嚎2
+# devp[1]:
+# id: 2
+# ip: 10.10.10.58
+# port: 102
+# rack: 0
+# slot: 0
# 鏉＄爜鎵弿浠�
barcode[0]:
--
Gitblit v1.9.1