From b3fef2cc88d960cd603747293eaeeab4c413b6fa Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 十二月 2023 22:05:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4
src/main/resources/application.yml | 124 +++++++++++++++++++++--------------------
2 files changed, 65 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3a5eaa5..3798ac7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -77,7 +77,7 @@
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 4;
+ private int barcodeSize = 2;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -201,7 +201,7 @@
if(slave.getId() == 1) {
Thread.sleep(200);
OperateResultExOne<byte[]> result2 = null;
- result2 = siemensS7Net.Read("DB101.840.0", (short) (barcodeSize * 8));
+ result2 = siemensS7Net.Read("DB101.208.0", (short) (barcodeSize * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 691b09e..1ffca59 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=mdqdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8080/mdqdwms
+ url: localhost:8081/mdqdwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -47,7 +47,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.110
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
@@ -67,7 +67,7 @@
staNo: 1022
row: 3
bay: 1
- lev: 3
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -85,7 +85,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.111
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
@@ -123,19 +123,19 @@
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 10.10.10.1
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 1003
+ staNo: 1002
barcode: ${wcs-slave.barcode[0].id}
backSta: 1001
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 1013
+ staNo: 1012
barcode: ${wcs-slave.barcode[1].id}
backSta: 1011
led: ${wcs-slave.led[3].id}
@@ -153,7 +153,9 @@
led: ${wcs-slave.led[5].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 102
+ staNo: 1002
+ emptyInSta[1]:
+ staNo: 1012
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 1003
@@ -180,66 +182,66 @@
led: ${wcs-slave.led[5].id}
# RGV1
- rgv[0]:
- id: 1
- ip: 10.10.10.120
- port: 102
- rack: 0
- slot: 0
- inStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 2401
- inStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 2114
- outStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 1014
- outStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 1017
- # RGV2
- rgv[1]:
- id: 2
- ip: 10.10.10.121
- port: 102
- rack: 0
- slot: 0
- inStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 3001
- outStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 2402
- # RGV1
- rgv[2]:
- id: 3
- ip: 10.10.10.122
- port: 102
- rack: 0
- slot: 0
- inStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 2102
- inStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 4007
- inStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 4016
- outStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- sourceStaNo: 2003
+# rgv[0]:
+# id: 1
+# ip: 10.10.10.120
+# port: 102
+# rack: 0
+# slot: 0
+# inStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2401
+# inStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2114
+# outStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 1014
+# outStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 1017
+# # RGV2
+# rgv[1]:
+# id: 2
+# ip: 10.10.10.121
+# port: 102
+# rack: 0
+# slot: 0
+# inStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 3001
+# outStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2402
+# # RGV1
+# rgv[2]:
+# id: 3
+# ip: 10.10.10.122
+# port: 102
+# rack: 0
+# slot: 0
+# inStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2102
+# inStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 4007
+# inStn[2]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 4016
+# outStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# sourceStaNo: 2003
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.3
+ ip: 10.10.10.5
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.3
+ ip: 10.10.10.6
port: 51236
# 鏉＄爜鎵弿浠�3
barcode[2]:
--
Gitblit v1.9.1