From 7299282e6d9bfb7cf008477c2af888b3930bd716 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 20 二月 2025 10:46:49 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index f0925a4..f7791fb 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -100,13 +100,17 @@
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
if (type != null) {
- if (type.equals(AsrsConstants.ERCHANG)){
+ if (type.equals(AsrsConstants.ERCHANG)) {
wrapper.notLike("loc_no", "F3");
- }else {
- wrapper.notLike("loc_no", "F1");
+ } else {
+ if (matnr.startsWith("401") || matnr.startsWith("402")) {
+ //wrapper.notLike("loc_no", "F3");
+ } else {
+ wrapper.notLike("loc_no", "F1");
+ }
}
}
- //涓�鑷存湁PE甯︽壒娆″瓧娈靛鑷达紝鏃犳硶鍑哄簱锛屽氨娉ㄩ噴鎺�
+ //涓�鐩存湁PE甯︽壒娆″瓧娈靛鑷达紝鏃犳硶鍑哄簱锛屽氨娉ㄩ噴鎺�
//wapperSetCondition(wrapper, "batch", batch);
wapperSetCondition(wrapper, "three_code", csocode);
//wapperSetCondition(wrapper, "dead_time", isoseq);
@@ -185,6 +189,7 @@
}
+
/*
鏇存柊搴撳瓨鏄庣粏
*/
--
Gitblit v1.9.1