From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 25 十一月 2024 13:14:11 +0800
Subject: [PATCH] #优化地图
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 339 ++++++++++++++++++++++++++++---------------------------
1 files changed, 172 insertions(+), 167 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 59d0999..c714da8 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 -> {
@@ -353,12 +353,21 @@
String locNo = agvWrkMast.getLocNo();
agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo());
agvWrkMast.setSourceLocNo(locNo);
- agvWrkMast.setModiTime(new Date());
+ agvWrkMast.setModiTime(now);
agvWrkMast.setIoTime(now);
agvWrkMast.setLogErrMemo("createWaitPainWrkMastStart");
agvWrkMastService.updateById(agvWrkMast);
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {
+ agvWrkDetl.setIoTime(now);
+ 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()));
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(agvWrkMast.getSourceLocNo());
@@ -582,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");
@@ -708,6 +689,7 @@
adjDetl.setLocNo(locDetl.getLocNo());
adjDetl.setMatnr(locDetl.getMatnr());
adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(locDetl.getAnfme());
adjDetl.setAdjQty(adjust.getCount());
adjDetl.setModiTime(now);
@@ -739,6 +721,7 @@
adjDetl.setLocNo(locDetl.getLocNo());
adjDetl.setMatnr(locDetl.getMatnr());
adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(locDetl.getAnfme());
adjDetl.setAdjQty(0.0D);
adjDetl.setModiTime(now);
@@ -775,6 +758,7 @@
adjDetl.setLocNo(locMast.getLocNo());
adjDetl.setMatnr(adjust.getMatnr());
adjDetl.setBatch(adjust.getBatch());
+ adjDetl.setMaktx(locDetl.getMaktx());
adjDetl.setOriQty(0.0D);
adjDetl.setAdjQty(adjust.getCount());
adjDetl.setModiTime(now);
@@ -928,33 +912,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("鍏ュ簱閫氱煡妗ｅ彇娑堝け璐�");
@@ -986,33 +970,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 {
@@ -1027,15 +1011,15 @@
String locNo = wrkMast.getSourceLocNo();
// 鐩爣搴撲綅
String targetLocNo = wrkMast.getLocNo();
- agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo),"",(short)0);
+ agvLocMastService.updateLocStsByLocNo(locNo, "F", wrkMast.getBarcode(), (short) getContainerTypeByloc(locNo), "", (short) 0);
if (wrkMast.getIoType() == 108) {
if (wrkMast.getWrkSts() != 22) {
- agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ agvLocMastService.updateLocStsByLocNo(targetLocNo, "O", "", null);
}
} else {
if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) {
if (wrkMast.getWrkSts() != 22) {
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo, "O", "", wrkMast.getWhsType().shortValue());
}
} else {
throw new CoolException("褰撳墠浣滀笟涓嶈兘鍙栨秷锛�");
@@ -1047,37 +1031,58 @@
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
// 鏇存柊璁㈠崟
for (AgvLocDetl agvLocDetl : agvLocDetls) {
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
- 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());
+ 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 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.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 if (wrkMast.getIoType() == 114) {
+ //婧愬簱浣�
+ String locNo = wrkMast.getSourceLocNo();
+ // 鐩爣搴撲綅
+ String targetLocNo = wrkMast.getLocNo();
+ agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
+ agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
+ // 婧愬簱浣� 搴撲綅涓绘。
+ AgvLocMast sourceLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", targetLocNo));
+ // 褰撳墠浠诲姟鏄法灞傜Щ搴� 涓旂洰鏍囨ゼ灞傛槸1妤肩殑 鍥炴粴璋冩嫧鍗�
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 17));
+ orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
+ if (!orderDetlService.updateById(orderDetl)) {
+ throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
}
}
//鍑哄簱鍙栨秷
@@ -1123,7 +1128,7 @@
}
- if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
+ if(wrkMast.getIoType() != 114 && wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10 && wrkMast.getIoType()!=111 && wrkMast.getIoType()!=108 && wrkMast.getIoType() != 12 && wrkMast.getIoType() != 11){
//璁㈠崟鍥炴粴
//List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
--
Gitblit v1.9.1