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 |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 324e562..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,15 +90,21 @@
             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 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);
@@ -110,6 +116,7 @@
             if (!orderDetlService.save(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
             }
+
         }
     }
 
@@ -170,6 +177,7 @@
             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)) {
@@ -181,6 +189,9 @@
             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);

--
Gitblit v1.9.1