From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/controller/OrderController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..0d7cb2b 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);
@@ -463,7 +463,7 @@
// 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("鐢熸垚鍗婃垚鍝佽皟鎷ㄥ崟鏄庣粏妗ｅけ璐�");
@@ -617,7 +617,7 @@
// 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,7 +674,7 @@
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)) {
@@ -685,7 +685,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);
@@ -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);
--
Gitblit v1.9.1