From 580949f09025aa71de5ecf1e56ebe4f731cf6b19 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 15:30:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 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 5c6a79b..a32f666 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -70,7 +70,7 @@
                 break;
             }
         }
-        if (complete) {
+        if (complete && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) == 0) {
             // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
             DocType docType = docTypeService.selectById(order.getDocType());
             if (null != docType && docType.getPakout() == 1) {
@@ -141,6 +141,10 @@
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
                 }
             }
+            // 宸ヤ綔妗f槑缁嗘洿鏂板崟鎹紪鍙�
+            for (WrkDetl wrkDetl : wrkDetls) {
+                wrkDetlService.updateOrderNo(orderNo, wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+            }
         } catch (Exception e) {
             log.error("", e);
             return false;
@@ -156,4 +160,9 @@
         orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
     }
 
+    @Override
+    public List<Order> selectComplete() {
+        return this.baseMapper.selectComplete();
+    }
+
 }

--
Gitblit v1.9.1