From 431f88fdade07a22b636714f1690cee3a55668d0 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 30 十月 2024 13:35:56 +0800
Subject: [PATCH] 完善
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 106 +++++++++++++++++++---------------------------------
1 files changed, 39 insertions(+), 67 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
index ce49ffb..88468c7 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -90,44 +90,31 @@
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
List<GenerateOrderMatParam> mats = param.getMats();
+ orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo, order.getOrderNo()));
for (GenerateOrderMatParam matParam : mats) {
Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matParam.getMatnr()).eq(Mat::getHostId, param.getHostId()));
if (Cools.isEmpty(mat)) {
+ orderService.remove(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, order.getOrderNo()));
throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetl orderDetl1 = orderDetlService.getOne(new LambdaQueryWrapper<OrderDetl>()
- .eq(OrderDetl::getOrderNo, order.getOrderNo())
- .eq(OrderDetl::getThreeCode, matParam.getWarehouse()).eq(OrderDetl::getSupp,matParam.getOrigin())
- );
- if (Cools.isEmpty(orderDetl1)){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(matParam.getBatch());
- orderDetl.setAnfme(matParam.getAnfme());
- orderDetl.setUnit(matParam.getUnit());
- orderDetl.setThreeCode(matParam.getWarehouse());//浠撳簱鍙�
- orderDetl.setSupp(matParam.getOrigin());//鏉ユ簮鍗曞彿
- orderDetl.setSuppCode(matParam.getOriginNo());//鏉ユ簮搴忓彿
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- } else {
- orderDetl1.setAnfme(matParam.getAnfme());
- orderDetl1.setUpdateBy(9527L);
- orderDetl1.setUpdateTime(now);
- orderDetl1.setStatus(1);
- orderDetl1.setQty(0.0D);
- if (!orderDetlService.updateById(orderDetl1)) {
- throw new CoolException("鏇存柊鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(matParam.getBatch());
+ orderDetl.setAnfme(matParam.getAnfme());
+ orderDetl.setUnit(matParam.getUnit());
+ orderDetl.setThreeCode(matParam.getWarehouse());//浠撳簱鍙�
+ orderDetl.setSupp(matParam.getOrigin());//鏉ユ簮鍗曞彿
+ orderDetl.setSuppCode(matParam.getOriginNo());//鏉ユ簮搴忓彿
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.save(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -190,46 +177,31 @@
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
List<GenerateOrderMatParam> mats = param.getMats();
+ orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo, order.getOrderNo()));
for (GenerateOrderMatParam matParam : mats) {
Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matParam.getMatnr()).eq(Mat::getHostId, param.getHostId()));
if (Cools.isEmpty(mat)) {
throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetl orderDetl1 = orderDetlService.getOne(new LambdaQueryWrapper<OrderDetl>()
- .eq(OrderDetl::getOrderNo, order.getOrderNo())
- .eq(OrderDetl::getThreeCode, matParam.getWarehouse()).eq(OrderDetl::getSupp,matParam.getOrigin())
- );
- if (Cools.isEmpty(orderDetl1)){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(matParam.getBatch());
- orderDetl.setAnfme(matParam.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setThreeCode(matParam.getWarehouse());//浠撳簱鍙�
- orderDetl.setSupp(matParam.getOrigin());//鏉ユ簮鍗曞彿
- orderDetl.setSuppCode(matParam.getOriginNo());//鏉ユ簮搴忓彿
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- orderDetl.setHostId(param.getHostId());
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- } else {
- orderDetl1.setAnfme(matParam.getAnfme());
- orderDetl1.setUpdateBy(9527L);
- orderDetl1.setUpdateTime(now);
- orderDetl1.setStatus(1);
- orderDetl1.setQty(0.0D);
- if (!orderDetlService.save(orderDetl1)) {
- throw new CoolException("鏇存柊鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(matParam.getBatch());
+ orderDetl.setAnfme(matParam.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setThreeCode(matParam.getWarehouse());//浠撳簱鍙�
+ orderDetl.setSupp(matParam.getOrigin());//鏉ユ簮鍗曞彿
+ orderDetl.setSuppCode(matParam.getOriginNo());//鏉ユ簮搴忓彿
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ orderDetl.setHostId(param.getHostId());
+ if (!orderDetlService.save(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
-
}
}
--
Gitblit v1.9.1