From d43b2b81ccc729e0ec214565c1811eefdbcf1974 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 14 七月 2025 15:20:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 a01cb80..ea35956 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -11,12 +11,12 @@
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkDetl;
-import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.AgvLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.DataFormatter;
@@ -52,6 +52,8 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private FlowLogService flowLogService;
+ @Autowired
+ private ConfigService configService;
public void addLocDetlInfo(String locNo, int taskCode) {
Date now = new Date();
@@ -108,7 +110,13 @@
if (type.equals(AsrsConstants.ERCHANG)) {
wrapper.notLike("loc_no", "F3");
} else {
- if (matnr.startsWith("401") || matnr.startsWith("402")) {
+ boolean flag = false;
+ for (String s : configService.getMatCode()) {
+ if (matnr.startsWith(s)) {
+ flag = true;
+ }
+ }
+ if (flag) {
//wrapper.notLike("loc_no", "F3");
wrapper.notLike("loc_no", "F1");
} else {
@@ -199,10 +207,10 @@
/*
鏇存柊搴撳瓨鏄庣粏
*/
- public void updateStock(String sourceLoc, String targetLoc,Long userId) {
- if (Cools.isEmpty(userId)){
+ public void updateStock(String sourceLoc, String targetLoc, Long userId) {
+ if (Cools.isEmpty(userId)) {
this.baseMapper.updateStock(sourceLoc, targetLoc);
- }else {
+ } else {
this.baseMapper.updateStock2(sourceLoc, targetLoc, userId);
}
}
--
Gitblit v1.9.1