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

feat: 已使用檢驗項目，不可編輯

Browse Source 
refs: #16986
This commit is contained in:
YiLiLin 2023-09-20 14:55:18 +08:00
parent 43b6681269
commit 414a04a49f
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java
View File

@ -51,6 +51,9 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
return SpringUtil.getBean(QmsQcPlanDetailService.class); return SpringUtil.getBean(QmsQcPlanDetailService.class);
} }
private static final String UPD = "UPD";
private static final String DEL = "DEL";
@Override @Override
public QmsQcItem getOne(String site, String qcItem) { public QmsQcItem getOne(String site, String qcItem) {
QmsQcItem qmsQcItem = getOne(Wrappers.lambdaQuery(QmsQcItem.class) QmsQcItem qmsQcItem = getOne(Wrappers.lambdaQuery(QmsQcItem.class)
@ -87,6 +90,8 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
return; return;
} }
valida(qmsQcItem.getHandle(), UPD);
qmsQcItem.setCreator(oriQcItem.getCreator()); qmsQcItem.setCreator(oriQcItem.getCreator());
qmsQcItem.setDateCreate(oriQcItem.getDateCreate()); qmsQcItem.setDateCreate(oriQcItem.getDateCreate());
qmsQcItem.setDateUpdate(LocalDateTime.now()); qmsQcItem.setDateUpdate(LocalDateTime.now());
@ -99,14 +104,7 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
@Transactional @Transactional
@Override @Override
public void delete(String handle) { public void delete(String handle) {
QmsQcPlanDetail planDetail = getQmsQcPlanDetailService().getOne(Wrappers.lambdaQuery(QmsQcPlanDetail.class) valida(handle, DEL);
.eq(QmsQcPlanDetail::getQcItemBo, handle), false);
if (ObjectUtil.isNotNull(planDetail)) {
String qcPlan = HandleBoProcessor.trimHandle(planDetail.getQcPlanBo());
String qcItem = HandleBoProcessor.trimHandle(handle);
throw BusinessException.build(I18nUtil.getI18nText("qc.item.error2", qcPlan, qcItem));
}
syncSpc(super.getById(handle), 2); syncSpc(super.getById(handle), 2);
removeById(handle); removeById(handle);
qmsQcItemFactorService.remove(Wrappers.lambdaQuery(QmsQcItemFactor.class) qmsQcItemFactorService.remove(Wrappers.lambdaQuery(QmsQcItemFactor.class)
@ -126,9 +124,9 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
} }
//type : 1:save , 2:delete //type : 1:save , 2:delete
private void syncSpc(QmsQcItem qmsQcItem, int type){ private void syncSpc(QmsQcItem qmsQcItem, int type) {
String url = remoteParamService.getByKey("SPC_RESTFUL_URL", SecurityConstants.FROM_IN).getData(); String url = remoteParamService.getByKey("SPC_RESTFUL_URL", SecurityConstants.FROM_IN).getData();
if(StrUtil.isNotBlank(url) && StrUtil.isNotBlank(qmsQcItem.getChartControl())){ if (StrUtil.isNotBlank(url) && StrUtil.isNotBlank(qmsQcItem.getChartControl())) {
SystemTransactionLog log = new SystemTransactionLog(); SystemTransactionLog log = new SystemTransactionLog();
log.setSid(SidUtils.genSid()); log.setSid(SidUtils.genSid());
log.setFromSystem("IEP"); log.setFromSystem("IEP");
@ -136,10 +134,10 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
log.setKeyValue(qmsQcItem.getQcItem()); log.setKeyValue(qmsQcItem.getQcItem());
log.setDateCreate(LocalDateTime.now()); log.setDateCreate(LocalDateTime.now());
log.setCreator(SecurityUtils.getUserName()); log.setCreator(SecurityUtils.getUserName());
if(type == 1){ if (type == 1) {
log.setFunctionName("/targetTypeParams/save"); log.setFunctionName("/targetTypeParams/save");
log.setMethodName("QmsQcItemService.insertOrUpdate"); log.setMethodName("QmsQcItemService.insertOrUpdate");
}else { } else {
log.setFunctionName("/targetTypeParams/{qcItem}"); log.setFunctionName("/targetTypeParams/{qcItem}");
log.setMethodName("QmsQcItemService.delete"); log.setMethodName("QmsQcItemService.delete");
} }
@ -157,33 +155,46 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
spcExecuteRequest.setInspecType(qmsQcItem.getInspecType()); spcExecuteRequest.setInspecType(qmsQcItem.getInspecType());
HttpResponse response; HttpResponse response;
if(type == 1){ if (type == 1) {
response = TargetParamSync.save(spcExecuteRequest); response = TargetParamSync.save(spcExecuteRequest);
}else { } else {
response = TargetParamSync.delete(spcExecuteRequest); response = TargetParamSync.delete(spcExecuteRequest);
} }
if (response != null) { if (response != null) {
log.setRequest(response.getRequest()); log.setRequest(response.getRequest());
if(StrUtil.isBlank(response.getResponse())){ if (StrUtil.isBlank(response.getResponse())) {
log.setResponse("N/A"); log.setResponse("N/A");
}else { } else {
log.setResponse(response.getResponse()); log.setResponse(response.getResponse());
} }
if (response.getStatusCode() == 200) { if (response.getStatusCode() == 200) {
log.setResult("Success"); log.setResult("Success");
log.setMessage("作业成功"); log.setMessage("作业成功");
}else { } else {
log.setResult("Fail"); log.setResult("Fail");
log.setMessage(response.getResponse()); log.setMessage(response.getResponse());
} }
remoteSystemTransactionLogService.save(log); remoteSystemTransactionLogService.save(log);
if("Fail".equals(log.getResult())){ if ("Fail".equals(log.getResult())) {
throw BusinessException.build(I18nUtil.getI18nText("qms.spc.sync.msg", response.getResponse())); throw BusinessException.build(I18nUtil.getI18nText("qms.spc.sync.msg", response.getResponse()));
} }
} }
} }
}
private void valida(String handle, String type) {
QmsQcPlanDetail planDetail = getQmsQcPlanDetailService().getOne(Wrappers.lambdaQuery(QmsQcPlanDetail.class)
.eq(QmsQcPlanDetail::getQcItemBo, handle), false);
if (ObjectUtil.isNotNull(planDetail)) {
String qcPlan = HandleBoProcessor.trimHandle(planDetail.getQcPlanBo());
String qcItem = HandleBoProcessor.trimHandle(handle);
String key = "qc.item.error2";
if (UPD.equals(type)) {
key = "qc.item.error3";
}
throw BusinessException.build(I18nUtil.getI18nText(key, qcPlan, qcItem));
}
} }
} }

1
qms-core/src/main/resources/qms/i18n/messages.properties
View File

@ -13,6 +13,7 @@ qms.qc.plan.error3=\u68C0\u9A8C\u8BA1\u5212\u300E{0}\u300F\u6CA1\u6709\u5F53\u52
#QC Item #QC Item
qc.item.error1=\u300E{0}\u300F\u5DF2\u5B58\u5728 qc.item.error1=\u300E{0}\u300F\u5DF2\u5B58\u5728
qc.item.error2=\u68C0\u9A8C\u8BA1\u5212\u300E{0}\u300F\u4F7F\u7528\u68C0\u9A8C\u9879\u76EE\u7F16\u53F7\u300E{1}\u300F\u4E0D\u53EF\u5220\u9664 qc.item.error2=\u68C0\u9A8C\u8BA1\u5212\u300E{0}\u300F\u4F7F\u7528\u68C0\u9A8C\u9879\u76EE\u7F16\u53F7\u300E{1}\u300F\u4E0D\u53EF\u5220\u9664
qc.item.error3=\u68C0\u9A8C\u8BA1\u5212\u300E{0}\u300F\u4F7F\u7528\u68C0\u9A8C\u9879\u76EE\u7F16\u53F7\u300E{1}\u300F\u4E0D\u53EF\u7F16\u8F91
qms.inspec.job.error1=\u751F\u4EA7\u6279\u4E0D\u5B58\u5728 qms.inspec.job.error1=\u751F\u4EA7\u6279\u4E0D\u5B58\u5728
qms.inspec.job.error2=\u751F\u4EA7\u6279\u72B6\u6001\u4E0D\u7B26\u5408\uFF0C\u5FC5\u987B\u662F\u6392\u961F\u6216\u751F\u4EA7 qms.inspec.job.error2=\u751F\u4EA7\u6279\u72B6\u6001\u4E0D\u7B26\u5408\uFF0C\u5FC5\u987B\u662F\u6392\u961F\u6216\u751F\u4EA7