From b13b6baf03a0860d0aa7fe7536bf2313588bf8ae Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 02 三月 2025 16:54:53 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 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..763e2ae 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,19 @@
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
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");
+ wrapper.notLike("loc_no", "F1");
+ } 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 +190,7 @@
}
+
/*
鏇存柊搴撳瓨鏄庣粏
*/
@@ -203,6 +210,12 @@
}
@Override
+ public Double getSumAnfme2(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode);
+ }
+
+
+ @Override
public AgvLocDetl selectItem(String locNo, String matnr, String batch, String csocode, String isoCode) {
return this.baseMapper.selectItemByOrderNo(locNo, matnr, batch, csocode, isoCode);
}
@@ -218,11 +231,21 @@
}
@Override
+ public Double getSumAnfmeProcessed2(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnrProcessed2(matnr, threeCode);
+ }
+
+ @Override
public Double getSumAnfmeDb(String matnr, String threeCode, Integer floor) {
return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
}
@Override
+ public Double getSumAnfmeDb2(String matnr, String threeCode, Integer floor) {
+ return this.baseMapper.selectSumAnfmeByMatnr3(matnr, threeCode, floor);
+ }
+
+ @Override
public Double getSumAnfmeback(String matnr, String threeCode, Integer floor) {
return this.baseMapper.getSumAnfmeback(matnr, threeCode, floor);
}
--
Gitblit v1.9.1