From efd08b1b4e4cbf8007096bee5d7912979e3e427a Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 10 二月 2025 12:44:12 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..0f417f3 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,22 @@
}
- 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");
-// }
+ if (type != null) {
+ if (type.equals(AsrsConstants.ERCHANG)){
+ wrapper.notLike("loc_no", "F3");
+ }else {
+ wrapper.notLike("loc_no", "F1");
+ }
+ }
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);
--
Gitblit v1.9.1