From ed37ef9be9a949203dcfc602892dee8bc27f3d27 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 31 十月 2024 08:54:57 +0800
Subject: [PATCH] #工作历史明细合并查询
---
src/main/java/com/zy/asrs/controller/OrderController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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..6e3047e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -419,7 +419,7 @@
}
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)) {
@@ -430,7 +430,7 @@
flowLog.setFid(String.valueOf(flowId));
flowLog.setOpType(2L);
flowLog.setOrderNo(param.getOrderNo());
- flowLog.setThreeCode(orderDetl.getThreeCode());
+ flowLog.setThreeCode(orderDetl.getThreeCode().trim());
flowLog.setMatnr(orderDetl.getMatnr());
flowLog.setMaktx(orderDetl.getMaktx());
flowLog.setOrderPrevious(anfme);
@@ -458,12 +458,12 @@
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.setThreeCode(orderDetl.getThreeCode().trim());
flowLog.setMatnr(orderDetl.getMatnr());
flowLog.setMaktx(orderDetl.getMaktx());
flowLog.setOrderPrevious(0.0D);
@@ -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("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟鏄庣粏妗ｅけ璐�");
@@ -612,12 +612,12 @@
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.setThreeCode(orderDetl.getThreeCode().trim());
flowLog.setMatnr(orderDetl.getMatnr());
flowLog.setMaktx(orderDetl.getMaktx());
flowLog.setOrderPrevious(0.0D);
@@ -674,18 +674,18 @@
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.setThreeCode(orderDetl.getThreeCode().trim());
flowLog.setMatnr(orderDetl.getMatnr());
flowLog.setMaktx(orderDetl.getMaktx());
flowLog.setOrderPrevious(anfme);
@@ -728,7 +728,7 @@
flowLog.setFid(String.valueOf(flowId));
flowLog.setOpType(2L);
flowLog.setOrderNo(param.getOrderNo());
- flowLog.setThreeCode(orderDetl.getThreeCode());
+ flowLog.setThreeCode(orderDetl.getThreeCode().trim());
flowLog.setMatnr(orderDetl.getMatnr());
flowLog.setMaktx(orderDetl.getMaktx());
flowLog.setOrderPrevious(0.0D);
@@ -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