From 45dd167e12e11af8dc7929ff1475623c80fc3578 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 30 十月 2024 13:59:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 196 ++++++++++++++++++++++++------------------------
1 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 06465ac..f73de83 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("璁㈠崟淇敼鎴愬姛");
@@ -956,15 +956,15 @@
Integer proSts = 0;
Row row = sheet.getRow(i);
//鍗曟嵁绫诲瀷
- String docName = dataFormatter.formatCellValue(row.getCell(0));
+ String docName = dataFormatter.formatCellValue(row.getCell(0)).trim();
//鍗曟嵁缂栧彿
- String uuid = dataFormatter.formatCellValue(row.getCell(1));
+ String uuid = dataFormatter.formatCellValue(row.getCell(1)).trim();
//鐗╂枡鍙�
- String matnr = dataFormatter.formatCellValue(row.getCell(2));
+ String matnr = dataFormatter.formatCellValue(row.getCell(2)).trim();
//閿�鍞崟鍙�
- String csocode = dataFormatter.formatCellValue(row.getCell(3));
+ String csocode = dataFormatter.formatCellValue(row.getCell(3)).trim();
//鑷敱椤�
- String isocode = dataFormatter.formatCellValue(row.getCell(4));
+ String isocode = dataFormatter.formatCellValue(row.getCell(4)).trim();
// 鏁伴噺
if(Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(5)))){
continue;
--
Gitblit v1.9.1