From 93dfd54e4d0b6d5c17fd75014e3182f39d46d9bb Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Thu, 22 Aug 2024 15:09:10 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E6=A0=B9=E6=8D=AE=E6=AF=8D=E4=BB=B6?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=AD=90?=
 =?UTF-8?q?=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/service/impl/YysDayWorkServiceImpl.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java
index b0db4d4..965f8ed 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java
@@ -23,15 +23,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.logging.SimpleFormatter;
 import java.util.stream.Collectors;
 
 /**
@@ -505,7 +502,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
             }
             requisitionResult = yysRequisitionReportService.saveBatch(request.getRequisitionReportList());
         }
-        if ((prodResult && requisitionResult) || (packResult && requisitionResult)) {
+        if ((prodResult && requisitionResult)) {
             //修改是否完工状态
             CompletableFuture.runAsync(() -> {
                 YysDayWorkEntity entity = this.getById(request.getId());
@@ -515,6 +512,15 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
             });
             return "确认成功";
         }
+        if ((packResult && requisitionResult)) {
+            //修改是否完工状态
+            CompletableFuture.runAsync(() -> {
+                YysDayPackageEntity entity = yysDayPackageService.getById(request.getId());
+                entity.setIsConfirm("2");
+                yysDayPackageService.updateById(entity);
+            });
+            return "确认成功";
+        }
         return "确认失败";
     }