From 9ed4cb53a2c643b879f993537f5a2793fba56ba1 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 31 三月 2025 07:57:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 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 5aa3083..a150f56 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -58,14 +58,18 @@
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
long flowId = snowflakeIdWorker.nextId();
agvWrkDetls.stream().map(agvWrkDetl -> {
- AgvLocDetl agvLocDetl = new AgvLocDetl();
- //log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
- BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
- agvLocDetl.setLocNo(locNo);
- //log.info("zc娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
- this.insert(agvLocDetl);
- // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
+ AgvLocDetl agvLocDetl = this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("matnr", agvWrkDetl.getMatnr()).eq("three_code", agvWrkDetl.getThreeCode()));
+ if (agvLocDetl != null) {
+ this.updateAnfme(agvLocDetl.getAnfme() + agvWrkDetl.getAnfme(), agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
+ } else {
+ agvLocDetl = new AgvLocDetl();
+ //log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
+ BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
+ agvLocDetl.setLocNo(locNo);
+ //log.info("zc娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
+ this.insert(agvLocDetl);
+ // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
+ //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));
@@ -91,6 +95,7 @@
// if (!flowLogService.insert(flowLog)) {
// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
// }
+ }
return agvLocDetl;
}).collect(Collectors.toList());
@@ -221,6 +226,11 @@
}
@Override
+ public List<AgvLocDetl> selectItem2(String locNo, String matnr, String batch, String csocode, String isoCode) {
+ return this.baseMapper.selectItemByOrderNo2(locNo, matnr, batch, csocode, isoCode);
+ }
+
+ @Override
public Double getSumAnfmeProcess(String matnr, String threeCode) {
return this.baseMapper.selectSumAnfmeByMatnrProcess(matnr, threeCode);
}
@@ -237,7 +247,12 @@
@Override
public Double getSumAnfmeDb(String matnr, String threeCode, Integer floor) {
- return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
+ return this.baseMapper.selectSumAnfmeByMatnr22(matnr, threeCode, floor);
+ }
+
+ @Override
+ public Double getSumAnfmeDb2(String matnr, String threeCode, Integer floor) {
+ return this.baseMapper.selectSumAnfmeByMatnr3(matnr, threeCode, floor);
}
@Override
--
Gitblit v1.9.1