From 2ab7f44a672f4af86d8ad8409b3b0a6685a8c4d9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 15 九月 2025 19:59:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 4 ++--
src/main/java/com/zy/common/constant/AgvSiteConstant.java | 10 ++++++++++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 37db305..7d1b453 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -67,7 +67,7 @@
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+// RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 52c88b4..9eed6a8 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -425,13 +425,13 @@
}
public boolean Judge101or103(LocDto locDto,List<LocDto> locDtos){
List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_No", locDto.getLocNo()));
- List<LocDto> dtos = locDtos.stream().filter(item -> !Cools.isEmpty(item.getLocNo()) && item.getLocNo().equals(locDto.getLocNo())).collect(Collectors.toList());
+ List<LocDto> dtos = locDtos.stream().filter(item -> !Cools.isEmpty(item.getLocNo()) && item.getLocNo().equals(locDto.getLocNo()) ).collect(Collectors.toList());
if (locDetlList.size() != dtos.size()){
return false;
}
boolean is = true;
for (LocDto locDto1 :dtos){
- List<LocDetl> list = locDetlList.stream().filter(item -> item.getLocNo().equals(locDto1.getLocNo()) && item.getBatch().equals(locDto1.getBatch())).collect(Collectors.toList());
+ List<LocDetl> list = locDetlList.stream().filter(item -> item.getLocNo().equals(locDto1.getLocNo()) && item.getMatnr().equals(locDto.getMatnr()) && item.getBatch().equals(locDto1.getBatch())).collect(Collectors.toList());
if (list.size() != 1){
throw new CoolException("鍒ゆ柇绔欑偣鏁版嵁閿欒");
}
diff --git a/src/main/java/com/zy/common/constant/AgvSiteConstant.java b/src/main/java/com/zy/common/constant/AgvSiteConstant.java
index f5b6ed5..9d1a207 100644
--- a/src/main/java/com/zy/common/constant/AgvSiteConstant.java
+++ b/src/main/java/com/zy/common/constant/AgvSiteConstant.java
@@ -375,6 +375,16 @@
put("d85","840085EE501013");
+ put("e43","300042EE501013");
+ put("e44","300043EE501013");
+ put("e45","300044EE501013");
+ put("e46","300045EE501013");
+ put("e47","300046EE501013");
+ put("a54","700053EB501013");
+ put("a55","700054EB501013");
+ put("a56","700055EB501013");
+ put("a57","700056EB501013");
+ put("a58","700057EB501013");
}};
--
Gitblit v1.9.1