From cfc4421af2ba05a786300e70e21c779ddbd39836 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 08:37:34 +0800
Subject: [PATCH] 工作档查询条件
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 ececff1..9af4f46 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(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
mast.setAppeUser(userId);
mast.setAppeTime(now);
@@ -666,7 +670,7 @@
throw new CoolException("闈炴墜鍔ㄨ皟鎷ㄤ换鍔★紝涓嶆敮鎸佹鍔熻兘");
}
if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
- throw new CoolException("褰撳墠璐ф灦鐮佷换鏈夋簮搴撲綅锛岃纭");
+ throw new CoolException("褰撳墠璐ф灦鐮佹湁婧愬簱浣嶏紝璇风‘璁�");
}
AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(param.getDevNo());
if (Cools.isEmpty(agvWrkMast)) {
@@ -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);
+ AgvLocMast newLocMast = agvCommonService.getLocByLocRule20(3, 1, factory, false);
if (newLocMast == null) {
throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
}
--
Gitblit v1.9.1