From 323d014b95241cd42dfa01227dd4a15575f58a2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 16 九月 2025 11:01:33 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 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 57823ab..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();
@@ -69,7 +71,7 @@
//log.info("zc娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
this.insert(agvLocDetl);
// 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
+ //OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
// FlowLog flowLog = new FlowLog();
// flowLog.setFid(String.valueOf(flowId));
// flowLog.setSpare2(String.valueOf(taskCode));
@@ -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,8 +207,12 @@
/*
鏇存柊搴撳瓨鏄庣粏
*/
- public void updateStock(String sourceLoc, String targetLoc) {
- this.baseMapper.updateStock(sourceLoc, targetLoc);
+ public void updateStock(String sourceLoc, String targetLoc, Long userId) {
+ if (Cools.isEmpty(userId)) {
+ this.baseMapper.updateStock(sourceLoc, targetLoc);
+ } else {
+ this.baseMapper.updateStock2(sourceLoc, targetLoc, userId);
+ }
}
public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
--
Gitblit v1.9.1