From d91d5f9459ed7b4ff1215c08089d33aaf43ae295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Mon, 9 Aug 2021 14:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=82=E5=B8=B8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AbnormalBillLogController.java   |  2 +-
 .../anomaly/service/AbnormalPlanService.java    |  4 ++++
 .../impl/AbnormalBillLogServiceImpl.java        | 10 ++++++----
 .../service/impl/AbnormalPlanServiceImpl.java   | 17 +++++++++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
index 368d81ad..8b69a27c 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
@@ -166,7 +166,7 @@ public class AbnormalBillLogController {
     }
 
 
-    @GetMapping("saveAndUpdate")
+    @GetMapping("/saveAndUpdate")
     public R saveAndUpdate(AbnormalBill abnormalBill,
                            AbnormalBillDispose abnormalBillDispose,
                            @RequestParam List<String> ncGroupAndNcCodes,
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 5dbe9d17..674daf00 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
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto;
 import com.foreverwin.mesnac.anomaly.dto.AbnormalPlanDto;
+import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
+import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import com.foreverwin.mesnac.anomaly.model.AbnormalPlan;
 import com.foreverwin.modular.core.util.FrontPage;
 
@@ -31,6 +33,8 @@ public interface AbnormalPlanService extends IService<AbnormalPlan> {
 
     void saveAbnormalPlan(AbnormalBillDisposeDto abnormalBillDisposeDto, LocalDateTime now);
 
+    void saveAbnormalPlan(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, LocalDateTime now);
+
     List<AbnormalPlanDto> findAbnormalPlan(AbnormalPlanDto abnormalPlanDto);
 
     void processes(List<AbnormalPlan> abnormalPlanList);
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
index aa3b9edb..82fe750d 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
@@ -9,10 +9,7 @@ import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillLog;
 import com.foreverwin.mesnac.anomaly.model.AbnormalNcCode;
-import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService;
-import com.foreverwin.mesnac.anomaly.service.AbnormalBillLogService;
-import com.foreverwin.mesnac.anomaly.service.AbnormalBillService;
-import com.foreverwin.mesnac.anomaly.service.AbnormalNcCodeService;
+import com.foreverwin.mesnac.anomaly.service.*;
 import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.StringUtil;
@@ -69,6 +66,9 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
     @Autowired
     private ShopOrderMapper shopOrderMapper;
 
+    @Autowired
+    private AbnormalPlanService abnormalPlanService;
+
     @Override
     public IPage<AbnormalBillLog> selectPage(FrontPage<AbnormalBillLog> frontPage, AbnormalBillLog abnormalBillLog) {
         QueryWrapper<AbnormalBillLog> queryWrapper = new QueryWrapper<>();
@@ -163,6 +163,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
             abnormalBillLog.setCreatedDataTime(now);
             abnormalBillLog.setModifiedUser(user);
             abnormalBillLog.setModifiedDateTime(now);
+
             this.save(abnormalBillLog);;
         }
 
@@ -170,6 +171,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
 
 
         if(Constants.ABNORMAL_QUALITY.equals(abnormalBill.getType())){
+            abnormalPlanService.saveAbnormalPlan(abnormalBill,abnormalBillDispose,now);
             abnormalBillService.anomalyReport(abnormalBill,abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType);
         }else if(Constants.ABNORMAL_OTHER.equals(abnormalBill.getType())){
             abnormalBillService.anomalyReportOther(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType);
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 e99f39a9..e89e2101 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
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto;
 import com.foreverwin.mesnac.anomaly.dto.AbnormalPlanDto;
 import com.foreverwin.mesnac.anomaly.mapper.AbnormalPlanMapper;
+import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
+import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import com.foreverwin.mesnac.anomaly.model.AbnormalPlan;
 import com.foreverwin.mesnac.anomaly.service.AbnormalPlanService;
 import com.foreverwin.mesnac.common.constant.Constants;
@@ -98,6 +100,21 @@ public class AbnormalPlanServiceImpl extends ServiceImpl<AbnormalPlanMapper, Abn
         this.saveOrUpdate(abnormalPlan);
     }
 
+    @Override
+    public void saveAbnormalPlan(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, LocalDateTime now) {
+        AbnormalBillDisposeDto abnormalBillDisposeDto = new AbnormalBillDisposeDto();
+        abnormalBillDisposeDto.setHandle(abnormalBill.getHandle());
+        abnormalBillDisposeDto.setAbnormalNo(abnormalBill.getAbnormalNo());
+        abnormalBillDisposeDto.setStatus(abnormalBill.getStatus());
+        abnormalBillDisposeDto.setWorkCenter(abnormalBill.getWorkCenter());
+        abnormalBillDisposeDto.setAbnormalMethod(abnormalBillDispose.getAbnormalMethod());
+        abnormalBillDisposeDto.setShopOrder(abnormalBill.getShopOrder());
+        abnormalBillDisposeDto.setResrce(abnormalBill.getResrce());
+        abnormalBillDisposeDto.setItem(abnormalBill.getItemBo());
+        abnormalBillDisposeDto.setNcQty(abnormalBill.getNcQty());
+        this.saveAbnormalPlan(abnormalBillDisposeDto,now);
+    }
+
     @Override
     public List<AbnormalPlanDto> findAbnormalPlan(AbnormalPlanDto abnormalPlanDto) {
         String site = CommonMethods.getSite();