From 6ffb8e752717f0408ce01682343cfff1947f7cef Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 19 九月 2024 09:35:33 +0800
Subject: [PATCH] #

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java |   52 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 14 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..a1db44c 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
@@ -95,21 +95,42 @@
             if (Cools.isEmpty(mat)) {
                 throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
             }
-            OrderDetl orderDetl = new OrderDetl();
-            orderDetl.sync(mat);
-            orderDetl.setBatch(matParam.getBatch());
-            orderDetl.setAnfme(matParam.getAnfme());
-            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("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
+            OrderDetl orderDetl1 = orderDetlService.getOne(new LambdaQueryWrapper<OrderDetl>()
+                    .eq(OrderDetl::getOrderNo, order.getOrderNo()).eq(OrderDetl::getBatch,matParam.getBatch())
+                    .eq(OrderDetl::getThreeCode, matParam.getWarehouse()).eq(OrderDetl::getSupp,matParam.getOrigin())
+                    .eq(OrderDetl::getSuppCode, matParam.getOriginNo()).eq(OrderDetl::getUnit,matParam.getUnit())
+            );
+            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("鏇存柊鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
+                }
             }
+
         }
     }
 
@@ -181,6 +202,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