From e1b5026d8ebdc365beb30de96d809c4fde35c42c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 25 二月 2025 14:14:08 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 d702e36..c3d2871 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
+import com.zy.asrs.constant.AsrsConstants;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkDetl;
@@ -95,20 +96,27 @@
}
- public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type2) {
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type) {
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
-// if (type != null) {
-// wrapper.notLike("loc_no", "F1");
-// }
- wapperSetCondition(wrapper, "batch", batch);
+ if (type != null) {
+ if (type.equals(AsrsConstants.ERCHANG)) {
+ wrapper.notLike("loc_no", "F3");
+ } else {
+ if (matnr.startsWith("401") || matnr.startsWith("402")) {
+ //wrapper.notLike("loc_no", "F3");
+ } else {
+ wrapper.notLike("loc_no", "F1");
+ }
+ }
+ }
+ //涓�鐩存湁PE甯︽壒娆″瓧娈靛鑷达紝鏃犳硶鍑哄簱锛屽氨娉ㄩ噴鎺�
+ //wapperSetCondition(wrapper, "batch", batch);
wapperSetCondition(wrapper, "three_code", csocode);
//wapperSetCondition(wrapper, "dead_time", isoseq);
if ("JG".equals(orderNo.substring(0, 2))) {
wapperSetCondition(wrapper, "process_sts", "1");
- } else {
- wrapper.ne("process_sts", "1");
}
List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
@@ -181,6 +189,7 @@
}
+
/*
鏇存柊搴撳瓨鏄庣粏
*/
@@ -215,6 +224,11 @@
}
@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);
}
--
Gitblit v1.9.1