From cc66587e80da55e97978275f87b3b6f325751ade Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 31 三月 2025 14:36:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 453ab36..4b28cff 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -444,7 +444,7 @@
// return R.error("褰撳墠搴撲綅涓嶄负鍦ㄥ簱锛屾垨鑰呯┖璐ф灦锛屼笉鏀寔绉诲簱");
// 鏍￠獙妤煎眰
- if (agvLocMast.getLocType1() != 3) { // 涓嶄负绠卞３鍖哄煙
+ if (agvLocMast.getLocType1() != 3 && agvLocMast.getLocType1() != 6) { // 涓嶄负绠卞３鍖哄煙
if (agvLocMast.getFloor() != floor) {
throw new CoolException("褰撳墠搴撲綅涓嶆敮鎸佽法妤煎眰杞Щ");
} else {
@@ -456,12 +456,16 @@
throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍗曡皟鎷紒");
} else if ((agvLocMast.getFloor() == 2 || agvLocMast.getFloor() == 3) && (floor == 1 || floor == 4)) {
throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍥炴祦鍗曞洖閫�锛�");
+ } else if (agvLocMast.getFloor() == 1 && agvLocMast.getLev1() == 2 && floor == 4) {
+ ioType = 11;
} else {
ioType = 12;
}
} else {
if (agvLocMast.getFloor() == 1) {
if (agvLocMast.getLev1() == 1 && floor == 1) {
+ ioType = 11;
+ } else if (agvLocMast.getLev1() == 2 && floor == 4) {
ioType = 11;
} else {
ioType = 12;
@@ -516,7 +520,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
mast.setAppeUser(userId);
mast.setAppeTime(now);
@@ -864,7 +868,7 @@
// TODO: 鍥涙湡
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("supp_code", param.getBarcode()));
String factory = param.getFactory();
- AgvLocMast newLocMast = agvCommonService.getLocByLocRule(3, 1, factory,false);
+ AgvLocMast newLocMast = agvCommonService.getLocByLocRule20(3, 1, factory, false);
if (newLocMast == null) {
throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
}
@@ -876,13 +880,13 @@
agvWrkMast.setModiTime(now);
agvWrkMast.setIoTime(now);
// 鎵撴爣璁帮紝鑻ュ簱浣嶄笉澶燂紝鍏ュ簱鍒板埆鐨勬ゼ灞傦紝閭ｄ箞闇�瑕佽法灞傜Щ搴�
- if (!Cools.isEmpty(factory)) {
- if (newLocMast.getLev1() == 1 && !factory.equals(AsrsConstants.SANCHANG)) {
- agvWrkMast.setCtnNo("1");
- } else if (newLocMast.getLev1() == 2 && !factory.equals(AsrsConstants.ERCHANG)) {
- agvWrkMast.setCtnNo("2");
- }
- }
+// if (!Cools.isEmpty(factory)) {
+// if (newLocMast.getLev1() == 1 && factory.equals(AsrsConstants.ERCHANG)) {
+// agvWrkMast.setCtnNo("2");
+// } else if (newLocMast.getLev1() == 2 && factory.equals(AsrsConstants.SANCHANG)) {
+// agvWrkMast.setCtnNo("1");
+// }
+// }
if (!agvWrkMastService.update(agvWrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", agvWrkMast.getWrkNo()))) {
throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�");
}
--
Gitblit v1.9.1