From e064028d87f0d9335d095c2f646a7ce7635e13f1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 18 十二月 2025 13:38:54 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 64 ++++++++++++--------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 94 +++++++++++++++++--------------
src/main/java/com/zy/core/MainProcess.java | 6 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 1
src/main/resources/application.yml | 6 +-
5 files changed, 97 insertions(+), 74 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 7f96993..2c2f6a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -369,6 +369,9 @@
if (wrkMast.getSourceStaNo()==145){
staNo = 147;
}
+ if (wrkMast.getSourceStaNo()==1908 || wrkMast.getSourceStaNo()==1901){
+ staNo = 1907;
+ }
staProtocol.setStaNo(staNo);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -2244,7 +2247,7 @@
*/
public synchronized void storeEmptyPlt() {
for (DevpSlave devp : slaveProperties.getDevp()) {
- if (devp.getId()==1) continue;
+// if (devp.getId()==1) continue;
// 閬嶅巻绌烘澘鍏ュ簱鍙�
for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
// 鑾峰彇绌烘澘鍏ュ簱绔欎俊鎭�
@@ -2259,27 +2262,34 @@
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
&& staProtocol.isEmptyMk() && ((staProtocol.getWorkNo() > 32222 && staProtocol.getWorkNo() <= 63333) || staProtocol.getWorkNo()==0) && staProtocol.isPakMk()) {
-
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
-
SearchLocParam param = new SearchLocParam();
param.setIoType(10);
param.setSourceStaNo(emptyInSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
+ String path = "/rpc/pakin/loc/v1";
+
+ if (staProtocol.getStaNo()==1908){
+ param.setRgvNo(1);
+ path = "/rpc/pakin/empty/loc/v1";
+ }
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
- .setPath("/rpc/pakin/loc/v1")
+ .setPath(path)
.setJson(JSON.toJSONString(param))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
+ Integer staNo = dto.getStaNo();
+ if (staProtocol.getStaNo()==1908){
+ staNo = 1907;
+ }
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(dto.getWorkNo());
- staProtocol.setStaNo(dto.getStaNo());
+ staProtocol.setStaNo(staNo);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
@@ -2297,42 +2307,42 @@
}
}
- /**
- * 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
- */
- public synchronized void storeEmptyPlt2() {
- for (DevpSlave devp : slaveProperties.getDevp()) {
- if (devp.getId()==2) continue;
- // 閬嶅巻绌烘澘鍏ュ簱鍙�
- for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
- // 鑾峰彇绌烘澘鍏ュ簱绔欎俊鎭�
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(emptyInSta.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
-
- // 绔欑偣鏉′欢鍒ゆ柇
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
- && staProtocol.isEmptyMk() && ((staProtocol.getWorkNo() > 32222 && staProtocol.getWorkNo() <= 63333) || staProtocol.getWorkNo()==0) && staProtocol.isPakMk()) {
- try {
- WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNo(staProtocol.getSiteId() + 19999L);
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staProtocol.getSiteId());
- wrkMastSta1.setType(2);
- wrkMastSta1.setWrkType(1);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
- wrkMastStaMapper.insert(wrkMastSta1);
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
- }
- }
- }
+// /**
+// * 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
+// */
+// public synchronized void storeEmptyPlt2() {
+// for (DevpSlave devp : slaveProperties.getDevp()) {
+// if (devp.getId()==2) continue;
+// // 閬嶅巻绌烘澘鍏ュ簱鍙�
+// for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
+// // 鑾峰彇绌烘澘鍏ュ簱绔欎俊鎭�
+// SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+// StaProtocol staProtocol = devpThread.getStation().get(emptyInSta.getStaNo());
+// if (staProtocol == null) {
+// continue;
+// } else {
+// staProtocol = staProtocol.clone();
+// }
+//
+// // 绔欑偣鏉′欢鍒ゆ柇
+// if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
+// && staProtocol.isEmptyMk() && ((staProtocol.getWorkNo() > 32222 && staProtocol.getWorkNo() <= 63333) || staProtocol.getWorkNo()==0) && staProtocol.isPakMk()) {
+// try {
+// WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNo(staProtocol.getSiteId() + 19999L);
+// if (Cools.isEmpty(wrkMastSta)){
+// WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),staProtocol.getSiteId());
+// wrkMastSta1.setType(2);
+// wrkMastSta1.setWrkType(1);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+// wrkMastStaMapper.insert(wrkMastSta1);
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// }
+// }
+// }
+// }
+// }
/**
* 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index c89d2b5..c5567bd 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -465,44 +465,49 @@
case 2:
return 102;
case 3:
+ return 1907;
case 4:
- return 122;
case 5:
case 6:
- return 105;
+ return 104;
case 7:
case 8:
+ return 105;
case 9:
- return 118;
+ return 122;
case 10:
case 11:
- return 119;
case 12:
+ return 107;
case 13:
case 14:
- return 110;
+ return 118;
case 15:
- return 120;
+ return 108;
case 16:
case 17:
case 18:
- return 111;
+ return 110;
case 19:
- return 121;
+ return 120;
case 20:
case 21:
case 22:
- return 113;
+ return 111;
case 23:
+ return 121;
case 24:
- return 123;
case 25:
- return 114;
case 26:
+ return 113;
case 27:
- return 1142;
case 28:
- return 116;
+ return 123;
+ case 29:
+ return 114;
+ case 30:
+ case 31:
+ return 1142;
default:
return 1142;
}
@@ -511,46 +516,53 @@
public static short RgvPosStaTwo(Short posId){
switch (posId.intValue()){
case 1:
- return 116;
- case 28:
case 2:
- return 1142;
+ return 116;
case 3:
case 4:
- return 114;
+ return 171;
case 5:
- return 123;
case 6:
+ return 114;
case 7:
+ return 123;
case 8:
- return 113;
case 9:
case 10:
- return 121;
+ return 113;
case 11:
case 12:
+ return 121;
case 13:
+ return 111;
case 14:
- return 120;
case 15:
case 16:
- return 110;
+ return 120;
case 17:
+ return 110;
case 18:
- return 119;
case 19:
- return 108;
case 20:
+ return 108;
case 21:
+ return 118;
case 22:
- return 107;
case 23:
case 24:
- return 105;
+ return 107;
case 25:
case 26:
+ return 122;
case 27:
+ return 105;
+ case 28:
+ case 29:
+ case 30:
return 104;
+ case 31:
+ case 32:
+ return 1901;
default:
return 104;
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2db0872..dcf9cdc 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -66,7 +66,7 @@
// 寮傚父淇℃伅璁板綍
mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� 2妤�
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
mainService.storeEmptyPlt();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
@@ -129,7 +129,7 @@
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
mainService.storeEmptyPlt3();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
- mainService.storeEmptyPlt2();
+// mainService.storeEmptyPlt2();
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃� 绌烘澘鍙犵洏
mainService.storeEmptyPlt4();
//鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 鍑哄簱鑷虫湀鍙板嚭搴撳彛
@@ -137,7 +137,7 @@
//鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 杩愯閫斾腑鑷姩閬胯绌烘澘
mainService.stackingCompletionDriveTray4();
//閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
- mainService.stackingCompletionDriveTrayOk3();
+// mainService.stackingCompletionDriveTrayOk3();
} catch (Exception e) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 356307c..e09fe00 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -60,6 +60,7 @@
add(152);add(153);
add(170);
add(171);
+ add(1901);add(1902);add(1904);add(1905);add(1906);add(1907);add(1908);
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(200);add(201);add(202);add(203);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index aabb667..1558559 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -356,10 +356,10 @@
slot: 0
# WMS鍏ュ簱鍙�1
inWmsSta[0]:
- staNo: 145
+ staNo: 1901
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 122
+ staNo: 1908
# 鎷嗗灈鍙犵洏鍙�1
emptyInSta2[0]:
staNo: 118
@@ -374,7 +374,7 @@
staNo: 121
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 122
+ staNo: 1901
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta2[0]:
staNo: 118
--
Gitblit v1.9.1