parent
da51c599ad
commit
6785f2132d
@ -28,4 +28,6 @@ public class InspecJob {
|
|||||||
private String judgeRemark;
|
private String judgeRemark;
|
||||||
|
|
||||||
private String qcFreq;
|
private String qcFreq;
|
||||||
|
|
||||||
|
private String remark;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -98,4 +98,11 @@ public class QmsInspecJobController {
|
|||||||
qmsInspecJobService.judge(inspecJob);
|
qmsInspecJobService.judge(inspecJob);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "檢驗任務-關閉", notes = "檢驗任務-關閉")
|
||||||
|
@PutMapping("/close")
|
||||||
|
public R close(@RequestBody InspecJob inspecJob) {
|
||||||
|
qmsInspecJobService.close(inspecJob);
|
||||||
|
return R.ok();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,4 +35,6 @@ public interface QmsInspecJobService extends IService<QmsInspecJob> {
|
|||||||
List<NcBasis> getNc(String inspecJobBo);
|
List<NcBasis> getNc(String inspecJobBo);
|
||||||
|
|
||||||
void judge(InspecJob inspecJob);
|
void judge(InspecJob inspecJob);
|
||||||
|
|
||||||
|
void close(InspecJob inspecJob);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -215,6 +215,7 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
|
|||||||
create(inspecJob);
|
create(inspecJob);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
@Override
|
@Override
|
||||||
public QmsInspecJob operate(InspecJob inspecJob) {
|
public QmsInspecJob operate(InspecJob inspecJob) {
|
||||||
String site = TenantContextHolder.getTenantId();
|
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) {
|
private LotState validation(InspecJob inspecJob) {
|
||||||
String lotNo = inspecJob.getLotNo();
|
String lotNo = inspecJob.getLotNo();
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user