From d350136e80016d9559f608710de65e827936771d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 30 十月 2024 15:35:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 188 +++++++++++++++++++++++-----------------------
1 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index f73de83..6e3047e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -419,31 +419,31 @@
}
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode().trim(),orderDetl.getDeadTime());
Double anfme = item.getAnfme();
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
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().trim());
+ 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());
@@ -459,24 +459,24 @@
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().trim());
+ 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) {
@@ -523,7 +523,7 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(dbList, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode().trim(),orderDetl.getDeadTime());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟鏄庣粏妗ｅけ璐�");
@@ -593,7 +593,7 @@
if (orderDetl.getProcessSts() != 1) continue;
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(dbList, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode().trim(),orderDetl.getDeadTime());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟鏄庣粏妗ｅけ璐�");
@@ -613,24 +613,24 @@
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().trim());
+ 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("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+ }
}
@@ -674,31 +674,31 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getAnfme(), orderDetl.getProcessSts());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode().trim(),orderDetl.getDeadTime());
Double anfme = item.getAnfme();
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
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().trim());
+ 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().trim());
+ 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("璁㈠崟淇敼鎴愬姛");
--
Gitblit v1.9.1