From 9de70a6856dd8095ba17d04b01a9363782225ae2 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 01 十一月 2024 20:11:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 301 +++++++++++++++++++++++---------------------------
1 files changed, 139 insertions(+), 162 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index d7986dd..f40d65e 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -168,32 +168,32 @@
OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
// 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(wrkMast.getSourceLocNo());
- flowLog.setSpare1(containerCode);
- flowLog.setOpType(4L);
- flowLog.setOrderNo(locDto.getOrderNo());
- flowLog.setThreeCode(locDto.getCsocode());
- flowLog.setMatnr(locDto.getMatnr());
- flowLog.setMaktx(locDto.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
- flowLog.setQtyChanged(locDto.getAnfme());
-
- flowLog.setLocPrevious(locDetl.getAnfme());
- flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
- flowLog.setLocChanged(locDto.getAnfme());
- flowLog.setUserId(userId);
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(wrkMast.getSourceLocNo());
+// flowLog.setSpare1(containerCode);
+// flowLog.setOpType(4L);
+// flowLog.setOrderNo(locDto.getOrderNo());
+// flowLog.setThreeCode(locDto.getCsocode());
+// flowLog.setMatnr(locDto.getMatnr());
+// flowLog.setMaktx(locDto.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
+// flowLog.setQtyChanged(locDto.getAnfme());
+//
+// flowLog.setLocPrevious(locDetl.getAnfme());
+// flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
+// flowLog.setLocChanged(locDto.getAnfme());
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}else {
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
@@ -274,32 +274,32 @@
OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(wrkMast.getSourceLocNo());
- flowLog.setSpare1(containerCode);
- flowLog.setOpType(6L);
- flowLog.setOrderNo(locDto.getOrderNo());
- flowLog.setThreeCode(locDto.getCsocode());
- flowLog.setMatnr(locDto.getMatnr());
- flowLog.setMaktx(locDto.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
- flowLog.setQtyChanged(locDto.getAnfme());
-
- flowLog.setLocPrevious(locDetl.getAnfme());
- flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
- flowLog.setLocChanged(locDto.getAnfme());
- flowLog.setUserId(userId);
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(wrkMast.getSourceLocNo());
+// flowLog.setSpare1(containerCode);
+// flowLog.setOpType(6L);
+// flowLog.setOrderNo(locDto.getOrderNo());
+// flowLog.setThreeCode(locDto.getCsocode());
+// flowLog.setMatnr(locDto.getMatnr());
+// flowLog.setMaktx(locDto.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
+// flowLog.setQtyChanged(locDto.getAnfme());
+//
+// flowLog.setLocPrevious(locDetl.getAnfme());
+// flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
+// flowLog.setLocChanged(locDto.getAnfme());
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}else {
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
orderDtoList.forEach(orderDto -> {
@@ -361,7 +361,12 @@
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {
agvWrkDetl.setIoTime(now);
- agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+ boolean bl = agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>()
+ .eq("wrk_no", agvWrkDetl.getWrkNo())
+ .eq("matnr",agvWrkDetl.getMatnr())
+ .eq("order_no",agvWrkDetl.getOrderNo())
+ .eq("three_code",agvWrkDetl.getThreeCode()));
+// .eq("dead_time",agvWrkDetl.getDeadTime()));
}
AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
//List<AgvLocDetl> agvLocDetlList = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocMast.getLocNo()));
@@ -586,34 +591,6 @@
long flowId = snowflakeIdWorker.nextId();
agvWaitPakinList.forEach(wp -> {
createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
- // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(), wp.getThreeCode());
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(locNo);
- flowLog.setSpare1(containerCode);
- flowLog.setOpType(3L);
- flowLog.setOrderNo(wp.getOrderNo());
- flowLog.setThreeCode(wp.getThreeCode());
- flowLog.setMatnr(wp.getMatnr());
- flowLog.setMaktx(wp.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
- flowLog.setQtyPrevious(orderDetl.getQty()-wp.getAnfme());
- flowLog.setQtyCurrent(orderDetl.getQty());
- flowLog.setQtyChanged(wp.getAnfme());
-
- flowLog.setLocPrevious(0.0D);
- flowLog.setLocCurrent(wp.getAnfme());
- flowLog.setLocChanged(wp.getAnfme());
-
- flowLog.setUserId(userId);
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
});
//淇敼鍏ュ簱閫氱煡妗ｇ姸鎬�
agvWaitPakinService.updateIoStatus(containerCode,"Y");
@@ -932,33 +909,33 @@
if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("璁㈠崟鍥炴粴澶辫触");
}
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(locNo);
- flowLog.setSpare1(wrkMast.getBarcode());
- flowLog.setOpType(3L);
- flowLog.setOrderNo(agvWaitPakin.getOrderNo());
- flowLog.setThreeCode(agvWaitPakin.getThreeCode());
- flowLog.setMatnr(agvWaitPakin.getMatnr());
- flowLog.setMaktx(agvWaitPakin.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty()-agvWaitPakin.getAnfme());
- flowLog.setQtyChanged(-agvWaitPakin.getAnfme());
-
- flowLog.setLocPrevious(0.0);
- flowLog.setLocCurrent(0.0);
- flowLog.setLocChanged(-agvWaitPakin.getAnfme());
-
- flowLog.setUserId(userId);
- flowLog.setAppeTime(new Date());
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(locNo);
+// flowLog.setSpare1(wrkMast.getBarcode());
+// flowLog.setOpType(3L);
+// flowLog.setOrderNo(agvWaitPakin.getOrderNo());
+// flowLog.setThreeCode(agvWaitPakin.getThreeCode());
+// flowLog.setMatnr(agvWaitPakin.getMatnr());
+// flowLog.setMaktx(agvWaitPakin.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty()-agvWaitPakin.getAnfme());
+// flowLog.setQtyChanged(-agvWaitPakin.getAnfme());
+//
+// flowLog.setLocPrevious(0.0);
+// flowLog.setLocCurrent(0.0);
+// flowLog.setLocChanged(-agvWaitPakin.getAnfme());
+//
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(new Date());
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
// 鍒犻櫎缁勬墭妗�
if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSuppCode()).eq("matnr",agvWaitPakin.getMatnr()).eq("three_code",agvWaitPakin.getThreeCode()))) {
throw new CoolException("鍏ュ簱閫氱煡妗ｅ彇娑堝け璐�");
@@ -990,33 +967,33 @@
if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
}
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(locNo);
- flowLog.setSpare1(wrkMast.getBarcode());
- flowLog.setOpType(8L);
- flowLog.setOrderNo(agvLocDetl.getOrderNo());
- flowLog.setThreeCode(agvLocDetl.getThreeCode());
- flowLog.setMatnr(agvLocDetl.getMatnr());
- flowLog.setMaktx(agvLocDetl.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
- flowLog.setQtyChanged(-agvLocDetl.getAnfme());
-
- flowLog.setLocPrevious(0.0);
- flowLog.setLocCurrent(agvLocDetl.getAnfme());
- flowLog.setLocChanged(agvLocDetl.getAnfme());
-
- flowLog.setUserId(userId);
- flowLog.setAppeTime(new Date());
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(locNo);
+// flowLog.setSpare1(wrkMast.getBarcode());
+// flowLog.setOpType(8L);
+// flowLog.setOrderNo(agvLocDetl.getOrderNo());
+// flowLog.setThreeCode(agvLocDetl.getThreeCode());
+// flowLog.setMatnr(agvLocDetl.getMatnr());
+// flowLog.setMaktx(agvLocDetl.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
+// flowLog.setQtyChanged(-agvLocDetl.getAnfme());
+//
+// flowLog.setLocPrevious(0.0);
+// flowLog.setLocCurrent(agvLocDetl.getAnfme());
+// flowLog.setLocChanged(agvLocDetl.getAnfme());
+//
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(new Date());
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}
} else {
@@ -1056,33 +1033,33 @@
if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
}
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(locNo);
- flowLog.setSpare1(wrkMast.getBarcode());
- flowLog.setOpType(9L);
- flowLog.setOrderNo(agvLocDetl.getOrderNo());
- flowLog.setThreeCode(agvLocDetl.getThreeCode());
- flowLog.setMatnr(agvLocDetl.getMatnr());
- flowLog.setMaktx(agvLocDetl.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty() - agvLocDetl.getAnfme());
- flowLog.setQtyChanged(- agvLocDetl.getAnfme());
-
- flowLog.setLocPrevious(0.0);
- flowLog.setLocCurrent(agvLocDetl.getAnfme());
- flowLog.setLocChanged(agvLocDetl.getAnfme());
-
- flowLog.setUserId(userId);
- flowLog.setAppeTime(new Date());
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(locNo);
+// flowLog.setSpare1(wrkMast.getBarcode());
+// flowLog.setOpType(9L);
+// flowLog.setOrderNo(agvLocDetl.getOrderNo());
+// flowLog.setThreeCode(agvLocDetl.getThreeCode());
+// flowLog.setMatnr(agvLocDetl.getMatnr());
+// flowLog.setMaktx(agvLocDetl.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() - agvLocDetl.getAnfme());
+// flowLog.setQtyChanged(- agvLocDetl.getAnfme());
+//
+// flowLog.setLocPrevious(0.0);
+// flowLog.setLocCurrent(agvLocDetl.getAnfme());
+// flowLog.setLocChanged(agvLocDetl.getAnfme());
+//
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(new Date());
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}
//鍑哄簱鍙栨秷
} else {
--
Gitblit v1.9.1