From c9647257d0b789f94c14977dfa767c47d61cb566 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 12 十二月 2024 13:16:20 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5d8970a..f3b6c85 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -12,13 +12,18 @@
 import com.zy.asrs.mapper.TagMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.OrderInAndOutUtil;
 import com.zy.common.model.DetlDto;
+import com.zy.common.model.enumUtils.OrderEnumVo;
+import com.zy.common.model.enumUtils.OrderInAndOutType;
+import com.zy.common.model.enumUtils.OrderMethodVo;
 import com.zy.common.utils.NodeUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -52,14 +57,17 @@
     @Override
     @Transactional
     public void pakinOrderCreate(OpenOrderPakinParam param) {
-        Order order = orderService.selectByNo(param.getOrderNo());
-        if (!Cools.isEmpty(order)) {
-            throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+
+        try{
+            OrderInAndOutUtil.query(Boolean.TRUE,OrderMethodVo.QUERY,param.getOrderNo());
+        } catch (Exception e) {
+            throw new CoolException(e.getMessage());
         }
+
         DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
         Date now = new Date();
         // 鍗曟嵁涓绘。
-        order = new Order(
+        Order order = new Order(
                 String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
                 param.getOrderNo(),    // 璁㈠崟缂栧彿
                 DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
@@ -95,8 +103,10 @@
                 now,    // 淇敼鏃堕棿
                 null    // 澶囨敞
         );
-        if (!orderService.insert(order)) {
-            throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+        try{
+            OrderInAndOutUtil.insertOrder(Boolean.TRUE,OrderMethodVo.INSERT_ORDER,order);
+        } catch (Exception e) {
+            throw new CoolException(e.getMessage());
         }
         // 鍗曟嵁鏄庣粏妗�
         List<DetlDto> list = new ArrayList<>();
@@ -128,8 +138,10 @@
             orderDetl.setUpdateTime(now);
             orderDetl.setStatus(1);
             orderDetl.setQty(0.0D);
-            if (!orderDetlService.insert(orderDetl)) {
-                throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+            try{
+                OrderInAndOutUtil.insertOrderDetl(Boolean.TRUE,OrderMethodVo.INSERT_ORDERDETL,order,orderDetl);
+            } catch (Exception e) {
+                throw new CoolException(e.getMessage());
             }
         }
     }
@@ -140,22 +152,28 @@
         List<OpenOrderCompeteResult> results = new ArrayList<>();
         if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
             // 鎸囧畾璁㈠崟
-            Order order = orderService.selectByNo(param.getOrderNo());
+//            Order order = orderService.selectByNo(param.getOrderNo());
+
+            Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE,OrderMethodVo.SELECT_BY_NO,param.getOrderNo());
+
             if (null != order) {
                 OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                 results.add(result);
                 result.setOrderNo(order.getOrderNo());
                 result.setOrderTime(order.getOrderTime());
                 result.setOrderType(order.getDocType$());
-                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+                List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.TRUE, OrderMethodVo.SELECT_BY_NO, order.getId());
+
                 for (OrderDetl orderDetl : orderDetls) {
                     result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
                 }
                 if (order.getSettle() == 4L) {
                     // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                    }
+//                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
+//                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+//                    }
+                    OrderInAndOutUtil.updateOrder(Boolean.TRUE, OrderMethodVo.SELECT_BY_NO,order.getId(), 6L, null);
                 }
             }
         } else {

--
Gitblit v1.9.1