From 0fde674eccc26dd17601dac6e748aae8ab8f12dd Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 08 十月 2024 18:01:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 130 +++++++++++++++++++++++++------------------
src/main/resources/application.yml | 12 +++
2 files changed, 86 insertions(+), 56 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 506e3c6..48a5a39 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -121,45 +121,45 @@
&& !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999))
&& staProtocol.isPakMk()) {
- //20230201. 2鍙峰爢鍨涙満鏈夊嚭搴撲换鍔℃椂锛岀姝㈡柊鏉垮叆搴�
- if (staProtocol.getWorkNo() == 9995) {
- if ( inSta.getStaNo()==103 && devpThread.ioModeOf1F == IoModeType.PAKOUT_MODE) {
- //鏈夊嚭搴撲换鍔★紝閫�搴撳埌鍏ュ簱鍙�
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo((short)100);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- News.error("MainServiceImpl generateStoreWrkFile"+"103涓哄嚭搴撴ā寮忥紝绂佹鍏ュ簱锛岄��鍥炲叆搴撳彛銆傦紒锛侊紒");
- continue;
- }
- if ( inSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
- //鏈夊嚭搴撲换鍔★紝閫�搴撳埌鍏ュ簱鍙�
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo((short)200);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- News.error("MainServiceImpl generateStoreWrkFile"+"203涓哄嚭搴撴ā寮忥紝绂佹鍏ュ簱锛岄��鍥炲叆搴撳彛銆傦紒锛侊紒");
- continue;
- }
- if ( inSta.getStaNo()==113 && devpThread.ioModeOf3F == IoModeType.PAKOUT_MODE) {
- //鏈夊嚭搴撲换鍔★紝閫�搴撳埌鍏ュ簱鍙�
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo((short)114);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- News.error("MainServiceImpl generateStoreWrkFile"+"103涓哄嚭搴撴ā寮忥紝绂佹鍏ュ簱锛岄��鍥炲叆搴撳彛銆傦紒锛侊紒");
- continue;
- }
- if ( inSta.getStaNo()==213 && devpThread.ioModeOf4F == IoModeType.PAKOUT_MODE) {
- //鏈夊嚭搴撲换鍔★紝閫�搴撳埌鍏ュ簱鍙�
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo((short)214);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- News.error("MainServiceImpl generateStoreWrkFile"+"203涓哄嚭搴撴ā寮忥紝绂佹鍏ュ簱锛岄��鍥炲叆搴撳彛銆傦紒锛侊紒");
- continue;
- }
- }
+// //20230201. 2鍙峰爢鍨涙満鏈夊嚭搴撲换鍔℃椂锛岀姝㈡柊鏉垮叆搴�
+// if (staProtocol.getWorkNo() == 9995) {
+// if ( inSta.getStaNo()==103 && devpThread.ioModeOf1F == IoModeType.PAKOUT_MODE) {
+// //鏈夊嚭搴撲换鍔★紝閫�搴撳埌鍏ュ簱鍙�
+// staProtocol.setWorkNo((short) 9999);
+// staProtocol.setStaNo((short)100);
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// News.error("MainServiceImpl generateStoreWrkFile"+"103涓哄嚭搴撴ā寮忥紝绂佹鍏ュ簱锛岄��鍥炲叆搴撳彛銆傦紒锛侊紒");
+// continue;
+// }
+// if ( inSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
+// //鏈夊嚭搴撲换鍔★紝閫�搴撳埌鍏ュ簱鍙�
+// staProtocol.setWorkNo((short) 9999);
+// staProtocol.setStaNo((short)200);
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// News.error("MainServiceImpl generateStoreWrkFile"+"203涓哄嚭搴撴ā寮忥紝绂佹鍏ュ簱锛岄��鍥炲叆搴撳彛銆傦紒锛侊紒");
+// continue;
+// }
+// if ( inSta.getStaNo()==113 && devpThread.ioModeOf3F == IoModeType.PAKOUT_MODE) {
+// //鏈夊嚭搴撲换鍔★紝閫�搴撳埌鍏ュ簱鍙�
+// staProtocol.setWorkNo((short) 9999);
+// staProtocol.setStaNo((short)114);
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// News.error("MainServiceImpl generateStoreWrkFile"+"103涓哄嚭搴撴ā寮忥紝绂佹鍏ュ簱锛岄��鍥炲叆搴撳彛銆傦紒锛侊紒");
+// continue;
+// }
+// if ( inSta.getStaNo()==213 && devpThread.ioModeOf4F == IoModeType.PAKOUT_MODE) {
+// //鏈夊嚭搴撲换鍔★紝閫�搴撳埌鍏ュ簱鍙�
+// staProtocol.setWorkNo((short) 9999);
+// staProtocol.setStaNo((short)214);
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// News.error("MainServiceImpl generateStoreWrkFile"+"203涓哄嚭搴撴ā寮忥紝绂佹鍏ュ簱锛岄��鍥炲叆搴撳彛銆傦紒锛侊紒");
+// continue;
+// }
+// }
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
@@ -240,14 +240,14 @@
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
- } else if (code == 500){
- if (ledThread != null) {
- String errorMsg = jsonObject.getString("msg");
- if (!Cools.isEmpty(errorMsg)) {
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
- }
- }
- News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+// } else if (code == 500){
+// if (ledThread != null) {
+// String errorMsg = jsonObject.getString("msg");
+// if (!Cools.isEmpty(errorMsg)) {
+// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+// }
+// }
+// News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
} else if (code == 700) {
staProtocol.setWorkNo((short) 9995);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -260,21 +260,42 @@
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
} else if (code == 1000){
+ } else if (code == 500){
if (inSta.getStaNo().equals(103)){
staProtocol.setWorkNo((short)9996);
staProtocol.setStaNo((short)203);
- }else {
+ }
+ if (inSta.getStaNo().equals(203)){
staProtocol.setWorkNo((short)9996);
staProtocol.setStaNo((short)103);
+ }if (inSta.getStaNo().equals(113)){
+ staProtocol.setWorkNo((short)9995);
+ staProtocol.setStaNo((short)114);
+ }else if (inSta.getStaNo().equals(213)){
+ staProtocol.setWorkNo((short)9995);
+ staProtocol.setStaNo((short)214);
+ }else {
+ staProtocol.setWorkNo((short)9995);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
}
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-
- // led 寮傚父鏄剧ず
- if (ledThread != null) {
- String errorMsg = barcode + "闇�瑕佹崲鍏ュ簱绔欍�傜洰鏍囩珯锛�"+staProtocol.getStaNo();
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ String data = jsonObject.getString("data");
+ String msg = jsonObject.getString("msg");
+ if (code == 500){
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg ="鍏ュ簱绔欙細" + staProtocol.getStaNo() + "---" + barcode + "妫�绱㈠簱浣嶅け璐�,璇锋鏌ュ簱瀛樺墿浣欍��===>>" + data + "--" + msg;
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ }
+ } else if (code == 1000){
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg ="鍏ュ簱绔欙細" + staProtocol.getStaNo() + "---" + barcode + "闇�瑕佹崲鍏ュ簱绔欍��";
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ }
}
+
}
} catch (Exception e) {
e.printStackTrace();
@@ -1205,7 +1226,8 @@
}
}
if(flag){
- return false;
+ continue;
+// return false;
}
// 鍒ゆ柇鏄惁宸插瓨鍦ㄥ皬杞︾粦瀹氫换鍔�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 95e5285..f066bcd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -241,14 +241,18 @@
staNo: 113
barcode: ${wcs-slave.barcode[2].id}
backSta: 114
- led: ${wcs-slave.led[2].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 113
barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[3].id}
+
# 鍑哄簱鍙�1
outSta[0]:
staNo: 114
+ led: ${wcs-slave.led[3].id}
+
# 杈撻�佺嚎3
devp[2]:
id: 3
@@ -261,14 +265,18 @@
staNo: 213
barcode: ${wcs-slave.barcode[3].id}
backSta: 214
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[4].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 213
barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[4].id}
+
# 鍑哄簱鍙�1
outSta[0]:
staNo: 214
+ led: ${wcs-slave.led[4].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
--
Gitblit v1.9.1