From 4bebcda1c8c9f9344d25d2f06c90f84bd045534e Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 28 二月 2023 14:48:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
src/main/resources/application.yml | 34 +++++++++++++++++-----------------
3 files changed, 19 insertions(+), 19 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 0297324..25427ac 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -666,7 +666,7 @@
// 搴撲綅绉昏浆
// this.locToLoc(crn, crnProtocol);
// 婕旂ず
- this.steMoveDemo(crn, crnProtocol);
+// this.steMoveDemo(crn, crnProtocol);
}
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2c5e152..4fc1742 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -150,7 +150,7 @@
//璇绘潯鐮�
Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0",(short)31);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.150",(short)31);
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*16,15, "UTF-8");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f9395e9..d3cbd80 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -35,7 +35,7 @@
enable: false
wms:
- url: localhost:8080/ynwms
+ url: localhost:8081/szfzwms
erp:
db:
@@ -53,7 +53,7 @@
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 2
# 绌挎杞﹂�氶亾搴撲綅
- channel: '0200201'
+ channel: '0100101'
# 鍫嗗灈鏈�1
crn[0]:
id: 1
@@ -68,42 +68,42 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
- row: 5
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 202
- row: 5
+ row: 4
bay: 1
lev: 2
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 302
- row: 5
+ row: 4
bay: 1
lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
- row: 5
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 202
- row: 5
+ row: 4
bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 302
- row: 5
+ row: 4
bay: 1
lev: 3
# 绌挎杞�1
@@ -122,33 +122,33 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
backSta: 100
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�1
inSta[1]:
- staNo: 201
+ staNo: 202
barcode: ${wcs-slave.barcode[1].id}
backSta: 200
led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�1
inSta[2]:
- staNo: 301
+ staNo: 302
barcode: ${wcs-slave.barcode[2].id}
backSta: 300
led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 201
+ staNo: 202
barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[2]:
- staNo: 301
+ staNo: 302
barcode: ${wcs-slave.barcode[2].id}
# 鍑哄簱鍙�1
outSta[0]:
@@ -168,17 +168,17 @@
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 10.10.10.51
+ ip: 10.10.10.104
port: 51236
# 鏉＄爜鎵弿浠�
barcode[1]:
id: 2
- ip: 10.10.10.54
+ ip: 10.10.10.105
port: 51236
# 鏉＄爜鎵弿浠�
barcode[2]:
id: 3
- ip: 10.10.10.54
+ ip: 10.10.10.106
port: 51236
# LED1
led[0]:
--
Gitblit v1.9.1