From 6785f2132d848a1e1f9e0efa14d538c8a4d6b93f Mon Sep 17 00:00:00 2001
From: YiLiLin <Yili_Lin@fw-mes.com>
Date: Mon, 24 Jul 2023 09:22:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8B=99):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=AA=A2=E9=A9=97=E4=BB=BB=E5=8B=99-?=
 =?UTF-8?q?=E9=97=9C=E9=96=89=E9=82=8F=E8=BC=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs: #13821
---
 .../foreverwin/iep/qms/domain/InspecJob.java  |  2 ++
 .../controller/QmsInspecJobController.java    |  7 +++++++
 .../iep/qms/service/QmsInspecJobService.java  |  2 ++
 .../service/impl/QmsInspecJobServiceImpl.java | 20 +++++++++++++++++++
 4 files changed, 31 insertions(+)

diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/domain/InspecJob.java b/qms-api/src/main/java/com/foreverwin/iep/qms/domain/InspecJob.java
index 28ec402..a4ac9dc 100644
--- a/qms-api/src/main/java/com/foreverwin/iep/qms/domain/InspecJob.java
+++ b/qms-api/src/main/java/com/foreverwin/iep/qms/domain/InspecJob.java
@@ -28,4 +28,6 @@ public class InspecJob {
     private String judgeRemark;
 
     private String qcFreq;
+
+    private String remark;
 }
diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java
index c578e6e..7ef0a39 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java
@@ -98,4 +98,11 @@ public class QmsInspecJobController {
         qmsInspecJobService.judge(inspecJob);
         return R.ok();
     }
+
+    @ApiOperation(value = "檢驗任務-關閉", notes = "檢驗任務-關閉")
+    @PutMapping("/close")
+    public R close(@RequestBody InspecJob inspecJob) {
+        qmsInspecJobService.close(inspecJob);
+        return R.ok();
+    }
 }
diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecJobService.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecJobService.java
index b4a9603..d205898 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecJobService.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecJobService.java
@@ -35,4 +35,6 @@ public interface QmsInspecJobService extends IService<QmsInspecJob> {
     List<NcBasis> getNc(String inspecJobBo);
 
     void judge(InspecJob inspecJob);
+
+    void close(InspecJob inspecJob);
 }
diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
index 63d7039..f5d5c24 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
@@ -215,6 +215,7 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
         create(inspecJob);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public QmsInspecJob operate(InspecJob inspecJob) {
         String site = TenantContextHolder.getTenantId();
@@ -321,6 +322,25 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void close(InspecJob inspecJob) {
+        String site = TenantContextHolder.getTenantId();
+        String user = SecurityUtils.getUserName();
+        LocalDateTime now = LocalDateTime.now();
+
+        String jobNo = inspecJob.getJobNo();
+        String inspecJobBo = QmsInspecJob.genHandle(site, jobNo);
+        String remark = inspecJob.getRemark();
+
+        update(Wrappers.lambdaUpdate(QmsInspecJob.class)
+                       .set(QmsInspecJob::getStatus, "4")
+                       .set(QmsInspecJob::getCompleteUser, user)
+                       .set(QmsInspecJob::getCompleteDateTime, now)
+                       .set(QmsInspecJob::getCompleteRemark, remark)
+                       .eq(QmsInspecJob::getHandle, inspecJobBo));
+    }
+
     private LotState validation(InspecJob inspecJob) {
         String lotNo = inspecJob.getLotNo();