From 78bb4bd47e4d492ff75cc407c574ff75db199afe Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 15 八月 2024 09:28:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 ++++-
src/main/java/com/zy/asrs/entity/WrkMast.java | 2 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 45 ++++++++++++++--------
src/main/resources/application.yml | 8 ++--
4 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 81b31be..0b30c4c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -391,6 +391,7 @@
case 3:
return 211;
}
+ break;
case 214:
switch (crnNo){
case 1:
@@ -400,6 +401,7 @@
case 3:
return 214;
}
+ break;
}
return this.staNo;
}
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 1bec270..bd49c1f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -854,7 +854,9 @@
continue;
}
WrkMast onlyWrkNo = wrkMastMapper.selectByOnlyWrkNo(crnProtocol.getTaskNo().intValue());
- if (Cools.isEmpty(onlyWrkNo)){
+ if (Cools.isEmpty(onlyWrkNo) ||
+ (onlyWrkNo.getStaNo()!=114 && onlyWrkNo.getStaNo()!=214 &&
+ onlyWrkNo.getSourceStaNo()!=114 && onlyWrkNo.getSourceStaNo()!=214)){
continue;
}
// 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
@@ -864,6 +866,8 @@
&& crnProtocol.getBay().equals(crnStn.getBay().shortValue()) && crnProtocol.getLevel().equals(crnStn.getLev().shortValue())) {
News.info("鍫嗗灈鏈烘帴椹充换鍔″畬鎴愶紝宸ヤ綔鍙凤細"+crnProtocol.getTaskNo()+"锛涙墽琛屽爢鍨涙満鍙凤細"+crnSlave.getId()+"锛涙帴椹虫斁璐т綅锛�"+crnStn.getStaNo()+"锛涙帴椹宠璧扮洰鏍囩珯锛�"+Utils.getStaNoConvertCentreOther2(crnStn.getStaNo()));
// 涓嬪彂绔欑偣淇℃伅
+ News.error("new867===>"+crnProtocol.getTaskNo());
+ News.error("new867===>"+Utils.getStaNoConvertCentreOther2(crnStn.getStaNo()).toString());
staProtocol.setWorkNo(crnProtocol.getTaskNo());
staProtocol.setStaNo(Utils.getStaNoConvertCentreOther2(crnStn.getStaNo()).shortValue());
if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
@@ -875,7 +879,7 @@
}
}
} catch (Exception e){
- News.info("鍫嗗灈鏈烘帴椹充换鍔″畬鎴愶紝涓�鍦猴細"+e.getMessage());
+ News.info("鍫嗗灈鏈烘帴椹充换鍔″畬鎴愶紝寮傚父锛�"+e.getMessage());
}
continue;
}
@@ -899,6 +903,8 @@
// 涓嬪彂绔欑偣淇℃伅
staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ News.error("new902===>"+crnProtocol.getCrnNo().toString());
+ News.error("new902===>"+wrkMast.getStaNoConvert(crnProtocol.getCrnNo()).toString());
staProtocol.setStaNo(wrkMast.getStaNoConvert(crnProtocol.getCrnNo()).shortValue());
if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
continue;
@@ -1040,7 +1046,7 @@
}
continue;
} catch (Exception e){
- News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝涓�鍦猴細"+e.getMessage());
+ News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝寮傚父锛�"+e.getMessage());
}
continue;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1236dc9..1f3dd61 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -56,7 +56,7 @@
add(112);add(113);add(114);
}};
public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
- add(212);add(214);add(213);
+ add(212);add(213);add(214);
}};
public boolean charge0;
@@ -211,26 +211,37 @@
//璇绘潯鐮�
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(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");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ if (slave.getId()==1){
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(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");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
+
+ }
+
+ // 鍏呯數淇″彿浣�
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
+ if (result3.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
+ charge0 = status[0];
+ charge1 = status[1];
+ charge2 = status[2];
+ }
+ } else {
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(8));
+ if (result2.IsSuccess) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId()+1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
}
-
- }
-
- // 鍏呯數淇″彿浣�
- Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
- if (result3.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
- charge0 = status[0];
- charge1 = status[1];
- charge2 = status[2];
}
if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d1a507e..8c9d61f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -224,13 +224,13 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 114
+ staNo: 113
barcode: ${wcs-slave.barcode[2].id}
backSta: 100
led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 114
+ staNo: 113
barcode: ${wcs-slave.barcode[2].id}
# 鍑哄簱鍙�1
outSta[0]:
@@ -244,13 +244,13 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 214
+ staNo: 213
barcode: ${wcs-slave.barcode[3].id}
backSta: 100
led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 214
+ staNo: 213
barcode: ${wcs-slave.barcode[3].id}
# 鍑哄簱鍙�1
outSta[0]:
--
Gitblit v1.9.1