From 21c5a9fcb8d9643fb9b5a96676dba2603d633805 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 23 八月 2024 15:20:08 +0800
Subject: [PATCH] 捡料出库bug

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 a2dea81..53b9cea 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -59,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()));
@@ -74,6 +74,7 @@
             // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
             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() + "銆戞槑缁嗗け璐�");
                 }
@@ -166,8 +167,27 @@
     }
 
     @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