From c6aaa1357b688dc6867d2ff01316f89bf09a0e85 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 29 十月 2024 14:49:24 +0800
Subject: [PATCH] 暂停流水记录
---
src/main/java/com/zy/asrs/controller/OrderController.java | 186 +++++++++---------
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 52 ++--
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 318 +++++++++++++++---------------
3 files changed, 278 insertions(+), 278 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index e1f9782..33a4f1e 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -568,32 +568,32 @@
// 鏇存柊璁㈠崟
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(wrkMast.getSourceLocNo());
- flowLog.setSpare1(barcode);
- flowLog.setOpType(5L);
- flowLog.setOrderNo(orderDetl.getOrderNo());
- flowLog.setThreeCode(orderDetl.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(agvLocDetl.getAnfme());
- flowLog.setLocCurrent(0.0d);
- flowLog.setLocChanged(agvLocDetl.getAnfme());
- flowLog.setUserId(getUserId());
- 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(barcode);
+// flowLog.setOpType(5L);
+// flowLog.setOrderNo(orderDetl.getOrderNo());
+// flowLog.setThreeCode(orderDetl.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(agvLocDetl.getAnfme());
+// flowLog.setLocCurrent(0.0d);
+// flowLog.setLocChanged(agvLocDetl.getAnfme());
+// flowLog.setUserId(getUserId());
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 06465ac..bd12fb7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -426,24 +426,24 @@
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
// 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setOpType(2L);
- flowLog.setOrderNo(param.getOrderNo());
- flowLog.setThreeCode(orderDetl.getThreeCode());
- flowLog.setMatnr(orderDetl.getMatnr());
- flowLog.setMaktx(orderDetl.getMaktx());
- flowLog.setOrderPrevious(anfme);
- flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
- flowLog.setOrderChanged(orderDetl.getAnfme());
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty());
- flowLog.setQtyChanged(0.0D);
- flowLog.setUserId(getUserId());
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setOpType(2L);
+// flowLog.setOrderNo(param.getOrderNo());
+// flowLog.setThreeCode(orderDetl.getThreeCode());
+// flowLog.setMatnr(orderDetl.getMatnr());
+// flowLog.setMaktx(orderDetl.getMaktx());
+// flowLog.setOrderPrevious(anfme);
+// flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
+// flowLog.setOrderChanged(orderDetl.getAnfme());
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty());
+// flowLog.setQtyChanged(0.0D);
+// flowLog.setUserId(getUserId());
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
} else {
list.add(dto);
orderDetl.setOrderId(order.getId());
@@ -458,25 +458,25 @@
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
- // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setOpType(1L);
- flowLog.setOrderNo(param.getOrderNo());
- flowLog.setThreeCode(orderDetl.getThreeCode());
- flowLog.setMatnr(orderDetl.getMatnr());
- flowLog.setMaktx(orderDetl.getMaktx());
- flowLog.setOrderPrevious(0.0D);
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(orderDetl.getAnfme());
- flowLog.setQtyPrevious(0.0D);
- flowLog.setQtyCurrent(0.0D);
- flowLog.setQtyChanged(0.0D);
- flowLog.setUserId(getUserId());
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setOpType(1L);
+// flowLog.setOrderNo(param.getOrderNo());
+// flowLog.setThreeCode(orderDetl.getThreeCode());
+// flowLog.setMatnr(orderDetl.getMatnr());
+// flowLog.setMaktx(orderDetl.getMaktx());
+// flowLog.setOrderPrevious(0.0D);
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(orderDetl.getAnfme());
+// flowLog.setQtyPrevious(0.0D);
+// flowLog.setQtyCurrent(0.0D);
+// flowLog.setQtyChanged(0.0D);
+// flowLog.setUserId(getUserId());
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}
}
if (param.getDocType().intValue() == 32) {
@@ -612,25 +612,25 @@
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟鏄庣粏妗ｅけ璐�");
}
- // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setOpType(1L);
- flowLog.setOrderNo(param.getOrderNo());
- flowLog.setThreeCode(orderDetl.getThreeCode());
- flowLog.setMatnr(orderDetl.getMatnr());
- flowLog.setMaktx(orderDetl.getMaktx());
- flowLog.setOrderPrevious(0.0D);
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(orderDetl.getAnfme());
- flowLog.setQtyPrevious(0.0D);
- flowLog.setQtyCurrent(0.0D);
- flowLog.setQtyChanged(0.0D);
- flowLog.setUserId(getUserId());
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setOpType(1L);
+// flowLog.setOrderNo(param.getOrderNo());
+// flowLog.setThreeCode(orderDetl.getThreeCode());
+// flowLog.setMatnr(orderDetl.getMatnr());
+// flowLog.setMaktx(orderDetl.getMaktx());
+// flowLog.setOrderPrevious(0.0D);
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(orderDetl.getAnfme());
+// flowLog.setQtyPrevious(0.0D);
+// flowLog.setQtyCurrent(0.0D);
+// flowLog.setQtyChanged(0.0D);
+// flowLog.setUserId(getUserId());
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}
@@ -680,25 +680,25 @@
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
- // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setOpType(2L);
- flowLog.setOrderNo(param.getOrderNo());
- flowLog.setThreeCode(orderDetl.getThreeCode());
- flowLog.setMatnr(orderDetl.getMatnr());
- flowLog.setMaktx(orderDetl.getMaktx());
- flowLog.setOrderPrevious(anfme);
- flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
- flowLog.setOrderChanged(orderDetl.getAnfme());
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty());
- flowLog.setQtyChanged(0.0D);
- flowLog.setUserId(getUserId());
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setOpType(2L);
+// flowLog.setOrderNo(param.getOrderNo());
+// flowLog.setThreeCode(orderDetl.getThreeCode());
+// flowLog.setMatnr(orderDetl.getMatnr());
+// flowLog.setMaktx(orderDetl.getMaktx());
+// flowLog.setOrderPrevious(anfme);
+// flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
+// flowLog.setOrderChanged(orderDetl.getAnfme());
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty());
+// flowLog.setQtyChanged(0.0D);
+// flowLog.setUserId(getUserId());
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
} else {
if (docType == 35 && orderDetl.getProcessSts() == 1) {
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>()
@@ -724,24 +724,24 @@
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
// 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setOpType(2L);
- flowLog.setOrderNo(param.getOrderNo());
- flowLog.setThreeCode(orderDetl.getThreeCode());
- flowLog.setMatnr(orderDetl.getMatnr());
- flowLog.setMaktx(orderDetl.getMaktx());
- flowLog.setOrderPrevious(0.0D);
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(orderDetl.getAnfme());
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty());
- flowLog.setQtyChanged(0.0D);
- flowLog.setUserId(getUserId());
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setOpType(2L);
+// flowLog.setOrderNo(param.getOrderNo());
+// flowLog.setThreeCode(orderDetl.getThreeCode());
+// flowLog.setMatnr(orderDetl.getMatnr());
+// flowLog.setMaktx(orderDetl.getMaktx());
+// flowLog.setOrderPrevious(0.0D);
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(orderDetl.getAnfme());
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty());
+// flowLog.setQtyChanged(0.0D);
+// flowLog.setUserId(getUserId());
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}
}
return R.ok("璁㈠崟淇敼鎴愬姛");
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..5098403 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 -> {
@@ -584,32 +584,32 @@
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("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// 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");
@@ -928,33 +928,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 +986,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 {
@@ -1052,33 +1052,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