From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 165605d..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());
--
Gitblit v1.9.1