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/controller/OrderController.java | 180 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 6e3047e..0d7cb2b 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().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("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// 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().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("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// 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) {
@@ -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().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("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// 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("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}
@@ -681,24 +681,24 @@
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("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// 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().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("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// 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