From 9e53b59e30bba2149900aa2cc9f22ad0ab445edd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 22 九月 2025 13:47:27 +0800
Subject: [PATCH] u8单据对接开发完成

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 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..e5ac684 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;
@@ -24,6 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Service("orderService")
@@ -37,6 +33,10 @@
     private SnowflakeIdWorker snowflakeIdWorker;
     @Autowired
     private OrderDetlService orderDetlService;
+    @Autowired
+    private DocTypeService docTypeService;
+    @Autowired
+    private WrkDetlService wrkDetlService;
 
     @Override
     public Order selectByNo(String orderNo) {
@@ -60,7 +60,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()));
@@ -69,6 +69,16 @@
             if (orderDetl.getAnfme() > orderDetl.getQty()) {
                 complete = false;
                 break;
+            }
+        }
+        //褰撹璁㈠崟鏄庣粏鏁伴噺==瀹屾垚鏁伴噺涓�>涓婃姤鏁伴噺锛屼笂鎶ョ姸鎬佷负 鍚� 鎴栬�� 鏄� 鏃堕兘鏀规垚绛夊緟涓婃姤锛屽畾鏃跺櫒杞绛夊緟涓婃姤杩涜涓婃姤
+        for (OrderDetl orderDetl : orderDetls) {
+            if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())&&
+                    orderDetl.getQty()>orderDetl.getUnits()
+                    &&orderDetl.getInspect()<2) {
+
+                    orderDetl.setInspect(2);//绛夊緟涓婃姤
+                    orderDetlService.updateById(orderDetl);
             }
         }
         if (complete) {
@@ -117,9 +127,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 +147,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