From 0a7eeda078e85194992c4dbc543815ea977970a6 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 28 十一月 2024 09:33:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 155 +++++++++++++++++++-------------------
src/main/webapp/static/js/console.map21.js | 12 +-
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/core/thread/ScaleThread.java | 28 +++++-
src/main/resources/application.yml | 8 +
5 files changed, 116 insertions(+), 89 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 b58a285..92b7426 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -898,40 +898,40 @@
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
- } else if (jsonObject.getInteger("code").equals(700)){
- SearchLocParam param2 = new SearchLocParam();
- param2.setBarcode(barcode);
- param2.setSourceStaNo(inSta.getStaNo());
- param2.setLocType1(locTypeDto.getLocType1());
- String response2 = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/pakin/yx/loc/v33")
- .setJson(JSON.toJSONString(param2))
- .build()
- .doPost();
- JSONObject jsonObject2 = JSON.parseObject(response2);
- if (jsonObject2.getInteger("code").equals(200)) {
- log.info("澶ф枡绠辫嚜鍔ㄧ粍鎵樻垚鍔燂紒锛�");
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
-
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
-
- if (ledThread != null) {
- ErrMsg errMsg1 = new ErrMsg();
- errMsg1.setErrMsg("鍏ュ簱澶辫触!绔欑偣鍙凤細"+inSta.getStaNo());
- errMsg1.setArea("1");
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
- }
- }
+// } else if (jsonObject.getInteger("code").equals(700)){
+// SearchLocParam param2 = new SearchLocParam();
+// param2.setBarcode(barcode);
+// param2.setSourceStaNo(inSta.getStaNo());
+// param2.setLocType1(locTypeDto.getLocType1());
+// String response2 = new HttpHandler.Builder()
+// .setUri(wmsUrl)
+// .setPath("/rpc/pakin/yx/loc/v33")
+// .setJson(JSON.toJSONString(param2))
+// .build()
+// .doPost();
+// JSONObject jsonObject2 = JSON.parseObject(response2);
+// if (jsonObject2.getInteger("code").equals(200)) {
+// log.info("澶ф枡绠辫嚜鍔ㄧ粍鎵樻垚鍔燂紒锛�");
+// } else {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+//
+// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+//
+// if (ledThread != null) {
+// ErrMsg errMsg1 = new ErrMsg();
+// errMsg1.setErrMsg("鍏ュ簱澶辫触!绔欑偣鍙凤細"+inSta.getStaNo());
+// errMsg1.setArea("1");
+// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
+// }
+// }
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
-
+ String msg = jsonObject.getString("msg");
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
if (ledThread != null) {
ErrMsg errMsg1 = new ErrMsg();
- errMsg1.setErrMsg("鍏ュ簱澶辫触!绔欑偣鍙凤細"+inSta.getStaNo());
+ errMsg1.setErrMsg("鍏ュ簱澶辫触!绔欑偣鍙凤細"+inSta.getStaNo()+"==銆嬪け璐ュ師鍥狅細"+msg);
errMsg1.setArea("1");
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errMsg1));
}
@@ -2183,6 +2183,7 @@
log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNoOther());
continue;
}
+ boolean signStanOther81 = false;
if (staProtocolOther.getWorkNo()!=0){
WrkMast wrkMastOther = wrkMastMapper.selectPakInStep3(staProtocolOther.getWorkNo());
if (Cools.isEmpty(wrkMastOther)){
@@ -2284,29 +2285,33 @@
return;
}
}
+ return;
}
- return;
+ signStanOther81 = true;
+ crnStation=2;
}
- StaProtocol staProtocolOther1 = devpThread.getStation().get(crnStn.getStaNoOther1());
- if (staProtocolOther1 == null) {
- continue;
- } else {
- staProtocolOther1 = staProtocolOther1.clone();
- }
+ if (!signStanOther81){
+ StaProtocol staProtocolOther1 = devpThread.getStation().get(crnStn.getStaNoOther1());
+ if (staProtocolOther1 == null) {
+ continue;
+ } else {
+ staProtocolOther1 = staProtocolOther1.clone();
+ }
- if (staProtocolOther1.isAutoing() && staProtocolOther1.getWorkNo()!=0){
- return;
- }
+ if (staProtocolOther1.isAutoing() || staProtocolOther1.getWorkNo()!=0){
+ return;
+ }
- StaProtocol staProtocolOther2 = devpThread.getStation().get(crnStn.getStaNoOther2());
- if (staProtocolOther2 == null) {
- continue;
- } else {
- staProtocolOther2 = staProtocolOther2.clone();
- }
- if (staProtocolOther2.isAutoing() && staProtocolOther2.getWorkNo()!=0){
- return;
+ StaProtocol staProtocolOther2 = devpThread.getStation().get(crnStn.getStaNoOther2());
+ if (staProtocolOther2 == null) {
+ continue;
+ } else {
+ staProtocolOther2 = staProtocolOther2.clone();
+ }
+ if (staProtocolOther2.isAutoing() || staProtocolOther2.getWorkNo()!=0){
+ return;
+ }
}
crnStation = 2;
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -8723,36 +8728,34 @@
}
}
- try{
- for (int idi = 1;idi<5;idi++){
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, idi);
-
- if (ledThread != null) {
- ErrMsg errMsg1 = new ErrMsg();
- errMsg1.setErrMsg("娴嬭瘯锛�"+idi);
- errMsg1.setArea("1");
- MessageQueue.offer(SlaveType.Led, idi, new Task(5, errMsg1));
- } try {
- Thread.sleep(500);
- } catch (Exception e){
-
- }
- }
- LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);
-
- if (ledThread3 != null) {
- ErrMsg errMsg1 = new ErrMsg();
- errMsg1.setErrMsg("娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯锛�"+3);
- errMsg1.setArea("1");
- MessageQueue.offer(SlaveType.Led, 3, new Task(5, errMsg1));
- } try {
- Thread.sleep(500);
- } catch (Exception e){
-
- }
- } catch (Exception e){
-
- }
+// try{
+// for (int idi = 1;idi<5;idi++){
+// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, idi);
+//
+// if (ledThread != null) {
+// ErrMsg errMsg1 = new ErrMsg();
+// errMsg1.setErrMsg("娴嬭瘯锛�"+idi);
+// errMsg1.setArea("1");
+// MessageQueue.offer(SlaveType.Led, idi, new Task(5, errMsg1));
+// } try {
+// Thread.sleep(500);
+// } catch (Exception e){
+//
+// }
+// }
+// LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);
+//
+// if (ledThread3 != null) {
+// ErrMsg errMsg1 = new ErrMsg();
+// errMsg1.setErrMsg("娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯娴嬭瘯锛�"+3);
+// errMsg1.setArea("1");
+// MessageQueue.offer(SlaveType.Led, 3, new Task(5, errMsg1));
+// } try {
+// Thread.sleep(500);
+// } catch (Exception e){
+//
+// }
+// } catch (Exception e){ }
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a8c5214..8149982 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -48,7 +48,7 @@
// 闂撮殧
- Thread.sleep(200);
+ Thread.sleep(1000);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 073d7e4..70c4978 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -52,14 +52,32 @@
String substring = s.substring(1);
String s1 = new StringBuilder(substring).reverse().toString();
scale = Double.parseDouble(s1);//50.8 67.6
- if (slave.getId()>3){
- scale = scale - 50.8;
- } else {
- scale = scale - 74.0;
+ if (scale>60){
+ switch (slave.getId()){
+ case 1:
+ scale = scale - 60;
+ break;
+ case 2:
+ scale = scale - 52;
+ break;
+ case 3:
+ scale = scale - 74.0;
+ break;
+ case 4:
+ scale = scale - 50.8;
+ break;
+ default:
+ scale = scale - 74.0;
+ }
}
+// if (slave.getId()>3){
+// scale = scale - 50.8;
+// } else {
+// scale = scale - 74.0;
+// }
//灏嗙О閲嶉噸閲忓啓鍏ヨ澶囧熀纭�鏁版嵁涓殑gross_wt瀛楁
- if(scale > 20) {
+ if(scale > 5) {
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = basDevpService.selectById(slave.getStaNo());
if(!Cools.isEmpty(basDevp)) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a7198eb..9ebb7e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -252,6 +252,8 @@
inSingleSta[0]:
staNo: 173
barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+
# 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInSingleSta[0]:
staNo: 104
@@ -268,10 +270,14 @@
inLargeSta[0]:
staNo: 292
barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[2].id}
+
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
inLargeSta[1]:
staNo: 281
barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[2].id}
+
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInLargeSta[0]:
staNo: 292
@@ -752,7 +758,7 @@
ip: 10.10.10.222
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 281
+ staArr: 222
# LED4 瀵嗙偧鍖�
led[3]:
id: 4
diff --git a/src/main/webapp/static/js/console.map21.js b/src/main/webapp/static/js/console.map21.js
index f1171d4..65f7b79 100644
--- a/src/main/webapp/static/js/console.map21.js
+++ b/src/main/webapp/static/js/console.map21.js
@@ -87,7 +87,7 @@
"width": 1117,
"height": 22,
"minBayNo": 2,
- "maxBayNo": 62
+ "maxBayNo": 82
}, {
"type": "rack",
"id": "rack10",
@@ -96,7 +96,7 @@
"width": 1117,
"height": 22,
"minBayNo": 2,
- "maxBayNo": 62
+ "maxBayNo": 82
},{
"type": "rack",
"id": "rack11",
@@ -105,7 +105,7 @@
"width": 1117,
"height": 22,
"minBayNo": 2,
- "maxBayNo": 62
+ "maxBayNo": 82
}, {
"type": "rack",
"id": "rack12",
@@ -114,7 +114,7 @@
"width": 1117,
"height": 22,
"minBayNo": 2,
- "maxBayNo": 62
+ "maxBayNo": 82
}, {
"type": "rack",
"id": "rack13",
@@ -123,7 +123,7 @@
"width": 1117,
"height": 22,
"minBayNo": 2,
- "maxBayNo": 62
+ "maxBayNo": 82
}, {
"type": "rack",
"id": "rack14",
@@ -132,7 +132,7 @@
"width": 1117,
"height": 22,
"minBayNo": 2,
- "maxBayNo": 62
+ "maxBayNo": 82
}],
"rackDescs": [{
"type": "rackDescs",
--
Gitblit v1.9.1