From 5701eb6693c654d53f1bba460eb3a417d495b344 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 11 六月 2025 17:31:53 +0800
Subject: [PATCH] bug修复；下发任务给rcs携带货架码
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 99 ++++++++++++++++++++++++++++++-------------------
1 files changed, 60 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 833e27d..bce6969 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -231,54 +231,63 @@
agvWrkMast.setWrkNo(-agvWrkMast.getWrkNo());
}
agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "FOUR"));
- if (config != null && config.getStatus() == 1 && config.getValue().equals("1") && processUseTiShengJi(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo())) {
- // TODO 鍥涙湡
- agvTaskCreateParam.setTaskTyp("F100");
- } else {
- switch (agvWrkMast.getIoType()) {
- case 114:
- case 108:
- case 12:
+ switch (agvWrkMast.getIoType()) {
+ case 114:
+ case 108:
+ case 12:
+ agvTaskCreateParam.setTaskTyp("F06");
+ break;
+ case 109:
+ if (agvWrkMast.getWrkSts() == 201) {
agvTaskCreateParam.setTaskTyp("F06");
- break;
- case 109:
- if (agvWrkMast.getWrkSts() == 201) {
+ } else {
+ agvTaskCreateParam.setTaskTyp("F01");
+ }
+ break;
+ case 1:
+ case 57:
+ // 鍏ュ簱浠诲姟鏄彧鏈� 鎺ラ┏浣� -- > 搴撲綅
+ AgvLocMast loc = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getLocNo()));
+ String locSub = loc.getLocNo().substring(loc.getLocNo().length() - 4).substring(0, 2).substring(0, 2);
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
+ if ("02".equals(locSub)) {
+ if (agvBasDevp.getFloor() == 4) {
+ agvTaskCreateParam.setTaskTyp("F01");
+ } else {
+ agvTaskCreateParam.setTaskTyp("F06");
+ }
+
+ } else {
+ // 鐩爣妤煎眰浣�1妤� 浣嗘簮搴撲綅锛堟帴椹充綅锛夊湪鍚稿浜屾ゼ
+ if (agvBasDevp.getFloor() == 4) {
agvTaskCreateParam.setTaskTyp("F06");
} else {
agvTaskCreateParam.setTaskTyp("F01");
}
- break;
- case 1:
- case 57:
- // 鍏ュ簱浠诲姟鏄彧鏈� 鎺ラ┏浣� -- > 搴撲綅
- AgvLocMast loc = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getLocNo()));
- String locSub = loc.getLocNo().substring(loc.getLocNo().length() - 4).substring(0, 2).substring(0, 2);
- AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
- if ("02".equals(locSub)) {
- if (agvBasDevp.getFloor() == 4) {
- agvTaskCreateParam.setTaskTyp("F01");
- } else {
- agvTaskCreateParam.setTaskTyp("F06");
- }
-
- } else {
- // 鐩爣妤煎眰浣�1妤� 浣嗘簮搴撲綅锛堟帴椹充綅锛夊湪鍚稿浜屾ゼ
- if (agvBasDevp.getFloor() == 4) {
- agvTaskCreateParam.setTaskTyp("F06");
- } else {
- agvTaskCreateParam.setTaskTyp("F01");
- }
- }
- break;
- default:
+ }
+ break;
+ default:
+ if (processUseTiShengJi(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo())) {
+ agvTaskCreateParam.setTaskTyp("F06");
+ } else {
agvTaskCreateParam.setTaskTyp("F01");
- break;
- }
+ }
+ break;
}
+ try {
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "BARCODE"));
+ boolean flag = false;
+ if (!Cools.isEmpty(config)) {
+ flag = config.getValue().equals("Y");
+ }
+ if (!Cools.isEmpty(agvWrkMast.getBarcode()) && flag) {
+ agvTaskCreateParam.setPodCode(agvWrkMast.getBarcode());
+ }
+ }catch (Exception e){
+ }
agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
}
@@ -287,7 +296,7 @@
private boolean processUseTiShengJi(String sourceLocNo, String locNo) {
// 鍒ゆ柇鏄惁鏄彁鍗囨満
if (sourceLocNo.startsWith("YZ")) {
- if (sourceLocNo.endsWith("01F2") && !locNo.startsWith("YZ") && locNo.endsWith("F4") ) {
+ if (sourceLocNo.endsWith("01F2") && !locNo.startsWith("YZ") && locNo.endsWith("F4")) {
// 浠庣敓浜т簩鍘傜殑搴撲綅鍒板惛濉戜簩鍘傜殑鐐逛綅涓�
return true;
} else if (sourceLocNo.endsWith("01F2") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
@@ -299,6 +308,12 @@
} else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F2")) {
// 鍚稿浜屾ゼ鐨勫簱浣嶅埌鐢熶骇浜屽巶鐨勭偣浣�
return true;
+ } else if (sourceLocNo.endsWith("01F1") && !locNo.startsWith("YZ") && locNo.endsWith("F4")) {
+ // 浠庡惛濉戜竴妤肩殑搴撲綅鍒板惛濉戜簩妤肩殑鐐逛綅涓�
+ return true;
+ } else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F1")) {
+ // 浠庡惛濉慹r妤肩殑kuwei鍒板惛濉戜竴妤肩殑dianwei
+ return true;
}
} else {
if (sourceLocNo.endsWith("F4") && locNo.startsWith("YZ") && locNo.endsWith("01F2")) {
@@ -307,6 +322,12 @@
} else if (sourceLocNo.endsWith("F2") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
// 浠庣敓浜т簩鍘傜殑鐐逛綅鍒板惛濉戜簩妤肩殑搴撲綅
return true;
+ } else if (sourceLocNo.endsWith("F4") && locNo.startsWith("YZ") && locNo.endsWith("01F1")) {
+ // 浠庡惛濉戜簩妤肩殑鐐逛綅鍒板惛濉戜竴妤肩殑搴撲綅
+ return true;
+ } else if (sourceLocNo.endsWith("F1") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
+ // 浠庡惛濉戜簩妤肩殑鐐逛綅鍒板惛濉戜竴妤肩殑搴撲綅
+ return true;
}
}
return false;
--
Gitblit v1.9.1