From c28c70ac1507df7a9e17e97474fd7d2c368fc673 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 09:22:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 8 +++++++-
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 6b12669..dda8c4c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -191,6 +191,7 @@
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
+
// wrapper.eq("orderNo",orderNo);
wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
@@ -205,7 +206,12 @@
if (Cools.isEmpty(floor)) {
agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
} else {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ // 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
+ if ("JG".equals(orderNo.substring(0,2))) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ } else {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ }
}
if (Cools.isEmpty(agvLocMast)) continue;
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 805f902..28cb552 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -114,7 +114,7 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- if (pakin.getDocId() != 33 && pakin.getDocId() != 34) {
+ if (pakin.getDocId() != 33 && pakin.getDocId() != 34 && pakin.getDocId() != 35) {
docIds.add(pakin.getDocId());
}
}
--
Gitblit v1.9.1