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 { List 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