From 65cc55a45a7235ee3736dcc8f4bdee30fdbfb9a7 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 21 二月 2025 08:25:40 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 14 ++++++++++----
1 files changed, 10 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 0f417f3..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,18 @@
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
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");
+ }
}
}
- wapperSetCondition(wrapper, "batch", batch);
+ //涓�鐩存湁PE甯︽壒娆″瓧娈靛鑷达紝鏃犳硶鍑哄簱锛屽氨娉ㄩ噴鎺�
+ //wapperSetCondition(wrapper, "batch", batch);
wapperSetCondition(wrapper, "three_code", csocode);
//wapperSetCondition(wrapper, "dead_time", isoseq);
@@ -184,6 +189,7 @@
}
+
/*
鏇存柊搴撳瓨鏄庣粏
*/
--
Gitblit v1.9.1