From 6e2d3dd89b15508659c31996dcf340ade4938066 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 29 九月 2022 10:35:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
src/main/resources/application.yml | 6 +++---
3 files changed, 7 insertions(+), 7 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 e10f9a5..b6c44c7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -103,14 +103,14 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
for (DevpSlave.Sta inSta : devp.getInSta()) {
- inSta.setStaNo(102);
+// inSta.setStaNo(102);
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
if (barcodeThread == null) {
continue;
}
String barcode = barcodeThread.getBarcode();
- barcode="ILY0127 0001";
+// barcode="ILY0127 0001";
if(!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
@@ -167,7 +167,7 @@
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
- locTypeDto.setLocType1((short)1);
+// locTypeDto.setLocType1((short)1);
SearchLocParam param = new SearchLocParam();
param.setBarcode(barcode);
param.setIoType(1);
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 45c57c7..d5828c2 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -250,7 +250,7 @@
if (command.getAckFinish() == 0) {
short commandFinish = 1;
- result = siemensNet.Write("DB100.22", commandFinish);
+ result = siemensNet.Write("DB100.18", commandFinish);
}
try {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8bfb496..947ab5f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -58,7 +58,7 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 103
- row: 1
+ row: 2
bay: 1
lev: 1
crnInStn[1]:
@@ -71,7 +71,7 @@
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 107
- row: 2
+ row: 1
bay: 1
lev: 1
crnOutStn[1]:
@@ -111,7 +111,7 @@
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 172.28.15.220
+ ip: 172.28.15.235
port: 51236
# # LED1
# led[0]:
--
Gitblit v1.9.1