mes/nalinv-qms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(检验任務): 新增檢驗任務-關閉邏輯

Browse Source 
refs: #13821
This commit is contained in:
YiLiLin 2023-07-24 09:22:32 +08:00
parent da51c599ad
commit 6785f2132d
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qms-api/src/main/java/com/foreverwin/iep/qms/domain/InspecJob.java
View File

@ -28,4 +28,6 @@ public class InspecJob {
private String judgeRemark;
private String qcFreq;
private String remark;
}

7
qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java
View File

@ -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();
}
}

2
qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecJobService.java
View File

@ -35,4 +35,6 @@ public interface QmsInspecJobService extends IService<QmsInspecJob> {
List<NcBasis> getNc(String inspecJobBo);
void judge(InspecJob inspecJob);
void close(InspecJob inspecJob);
}

20
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
View File

@ -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();