From f65bc0e7e638b4605088f80e36d8fb8a90d356b0 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Sun, 29 Jan 2023 16:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=82=E5=B8=B8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/anomaly/controller/AbnormalBillController.java | 2 +-
 .../mesnac/anomaly/service/AbnormalPlanService.java       | 2 +-
 .../anomaly/service/impl/AbnormalBillServiceImpl.java     | 2 +-
 .../anomaly/service/impl/AbnormalPlanServiceImpl.java     | 8 +++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 69ba9e11..cb794976 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -627,7 +627,7 @@ public class AbnormalBillController {
                 abnormalBillOld.setStatus(Constants.SHUT_DOWN);
                 String local = LocaleContextHolder.getLocale().getLanguage();
                 AbnormalBillDisposeDto abnormalBillDisposeDto = abnormalBillDisposeMapper.findAllByAbnormalNo(abnormalBill, local);
-                abnormalPlanService.saveAbnormalPlan(abnormalBillDisposeDto,now);
+                abnormalPlanService.saveAbnormalPlan(abnormalBillDisposeDto,now,"false");
                 abnormalBillService.saveOrUpdate(abnormalBillOld);
                 abnormalBillDisposes.get(0).setClosedUser(abnormalBillDispose.getClosedUser());
                 abnormalBillDisposes.get(0).setClosedDateTime(now);
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java
index 65d19b75..abb797fa 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalPlanService.java
@@ -31,7 +31,7 @@ public interface AbnormalPlanService extends IService<AbnormalPlan> {
 
     List<AbnormalPlan> selectList(AbnormalPlan abnormalPlan);
 
-    void saveAbnormalPlan(AbnormalBillDisposeDto abnormalBillDisposeDto, LocalDateTime now);
+    void saveAbnormalPlan(AbnormalBillDisposeDto abnormalBillDisposeDto, LocalDateTime now, String check);
 
     void saveAbnormalPlan(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, LocalDateTime now);
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index fc61d10b..d3dd4dad 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -786,7 +786,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         //保存到异常计划表
         if(Constants.ABNORMAL_QUALITY.equals(abnormalBill.getType())){
             AbnormalBillDisposeDto abnormalBillDisposeDto = abnormalBillDisposeMapper.findAllByAbnormalNo(abnormalBill, local);
-            abnormalPlanService.saveAbnormalPlan(abnormalBillDisposeDto,now);
+            abnormalPlanService.saveAbnormalPlan(abnormalBillDisposeDto,now,"false");
         }
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java
index 8c9259b1..1ecfa7a7 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java
@@ -130,7 +130,7 @@ public class AbnormalPlanServiceImpl extends ServiceImpl<AbnormalPlanMapper, Abn
 
 
     @Override
-    public void saveAbnormalPlan(AbnormalBillDisposeDto abnormalBillDisposeDto, LocalDateTime now) {
+    public void saveAbnormalPlan(AbnormalBillDisposeDto abnormalBillDisposeDto, LocalDateTime now, String check) {
         String site = CommonMethods.getSite();
         AbnormalPlan abnormalPlan = new AbnormalPlan();
         String user = CommonMethods.getUser();
@@ -139,7 +139,9 @@ public class AbnormalPlanServiceImpl extends ServiceImpl<AbnormalPlanMapper, Abn
         abnormalPlan.setSite(site);
         abnormalPlan.setAbnormalNo(abnormalBillDisposeDto.getAbnormalNo());
         //未处理
-       // abnormalPlan.setStatus(Constants.UNTREATED);
+        if (check.equals("true")){
+            abnormalPlan.setStatus(Constants.UNTREATED);
+        }
         abnormalPlan.setWorkCenter(abnormalBillDisposeDto.getWorkCenter());
         abnormalPlan.setAbnormalMethod(abnormalBillDisposeDto.getAbnormalMethod());
         abnormalPlan.setShopOrder(abnormalBillDisposeDto.getShopOrder());
@@ -170,7 +172,7 @@ public class AbnormalPlanServiceImpl extends ServiceImpl<AbnormalPlanMapper, Abn
         abnormalBillDisposeDto.setResrce(abnormalBill.getResrce());
         abnormalBillDisposeDto.setItemBo(abnormalBill.getItemBo());
         abnormalBillDisposeDto.setNcQty(abnormalBill.getNcQty());
-        this.saveAbnormalPlan(abnormalBillDisposeDto,now);
+        this.saveAbnormalPlan(abnormalBillDisposeDto,now,"true");
     }
 
     @Override