From 2790d2558ef656ccddb4dbc94409decc8d227a1e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 九月 2024 10:10:02 +0800
Subject: [PATCH] #许可证

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   74 ++++++++++++++++++++++++++++++++----
 1 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 1a1379e..ce2a799 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -5,17 +5,12 @@
 import com.core.common.DateUtils;
 import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.entity.param.OpenOrderPakoutParam;
 import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.mapper.OrderMapper;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.zy.common.model.DetlDto;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +32,10 @@
     private SnowflakeIdWorker snowflakeIdWorker;
     @Autowired
     private OrderDetlService orderDetlService;
+    @Autowired
+    private DocTypeService docTypeService;
+    @Autowired
+    private WrkDetlService wrkDetlService;
 
     @Override
     public Order selectByNo(String orderNo) {
@@ -60,7 +59,7 @@
     @Override
     public void checkComplete(String orderNo) {
         Order order = this.selectByNo(orderNo);
-        if (order.getSettle() >= 4L) {
+        if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
             return;
         }
         List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -72,6 +71,30 @@
             }
         }
         if (complete) {
+            // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
+            DocType docType = docTypeService.selectById(order.getDocType());
+            if (null != docType && docType.getPakout() == 1) {
+                if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+                    throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+                }
+                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
+                for (WrkDetl wrkDetl : wrkDetls) {
+                    OrderDetl orderDetl = new OrderDetl();
+                    orderDetl.sync(wrkDetl);
+                    orderDetl.setQty(orderDetl.getAnfme());
+                    orderDetl.setOrderId(order.getId());
+                    orderDetl.setOrderNo(orderNo);
+                    orderDetl.setStatus(1);
+                    orderDetl.setCreateTime(order.getCreateTime());
+                    orderDetl.setCreateBy(order.getCreateBy());
+                    orderDetl.setUpdateTime(order.getUpdateTime());
+                    orderDetl.setUpdateBy(order.getUpdateBy());
+                    if (!orderDetlService.insert(orderDetl)) {
+                        throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+                    }
+                }
+            }
+
             if (!this.updateSettle(order.getId(), 4L, null)) {
                 throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
             }
@@ -117,9 +140,13 @@
                 if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
                 }
+                // 淇敼璁㈠崟浣滀笟鏁伴噺
+                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+                }
             }
         } catch (Exception e) {
-            log.error("", e);
+            log.error("saveHandlerOrder===>>", e);
             return false;
         }
         return true;
@@ -133,4 +160,33 @@
         orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
     }
 
+    @Override
+    public List<Order> selectComplete() {
+        return this.baseMapper.selectComplete();
+    }
+
+    @Override
+    public List<Order> selectComplete8() {
+        return this.baseMapper.selectComplete8();
+    }
+
+    @Override
+    public boolean addToLogTable(Order order) {
+        return this.baseMapper.addToLogTable(order) > 0;
+    }
+
+    @Override
+    public List<Order> selectorderNoL(String orderNo) {
+        return this.baseMapper.selectorderNoL(orderNo);
+    }
+
+    @Override
+    public Order selectOrderMoveStatus() {
+        return this.baseMapper.selectOrderMoveStatus();
+    }
+    @Override
+    public Order selectOrderMoveStatusInitial() {
+        return this.baseMapper.selectOrderMoveStatusInitial();
+    }
+
 }

--
Gitblit v1.9.1