From 9385556bb5e1b55977b230f1884ae127d5ab579b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 24 十二月 2024 14:31:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 1ad3354..b5c5d5f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -116,7 +116,7 @@
         try {
             List<DetlDto> detlDtos = new ArrayList<>();
             wrkDetls.forEach(wrkDetl -> {
-                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(), wrkDetl.getAnfme()));
             });
             String orderNo = "HAND" + snowflakeIdWorker.nextId();
             if (pakin) {
@@ -146,11 +146,11 @@
             }
             for (DetlDto detlDto : detlDtos) {
                 // 淇敼璁㈠崟鏄庣粏鏁伴噺
-                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
                 }
                 // 淇敼璁㈠崟浣滀笟鏁伴噺
-                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
                 }
             }
@@ -175,6 +175,11 @@
     }
 
     @Override
+    public List<Order> selectComplete1() {
+        return this.baseMapper.selectComplete1();
+    }
+
+    @Override
     public List<Order> selectComplete8() {
         return this.baseMapper.selectComplete8();
     }

--
Gitblit v1.9.1