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

feat: 新增同步SPC檢驗計畫刪除

Browse Source 
refs: #16936
This commit is contained in:
YiLiLin 2023-09-20 11:58:27 +08:00
parent 414a04a49f
commit e3a334a5f0
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcPlanServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.iep.common.model.http.HttpResponse; import com.foreverwin.iep.common.model.http.HttpResponse;
import com.foreverwin.iep.common.model.spc.base.SpcExecuteRequest; import com.foreverwin.iep.common.model.spc.base.SpcExecuteRequest;
import com.foreverwin.iep.common.model.spc.plan.PlanItem; import com.foreverwin.iep.common.model.spc.plan.PlanItem;
import com.foreverwin.iep.common.spc.PlanDataDelSync;
import com.foreverwin.iep.common.spc.PlanDataSync; import com.foreverwin.iep.common.spc.PlanDataSync;
import com.foreverwin.iep.common.utils.SidUtils; import com.foreverwin.iep.common.utils.SidUtils;
import com.foreverwin.iep.qms.domain.UserGroup; import com.foreverwin.iep.qms.domain.UserGroup;
@ -156,17 +157,31 @@ public class QmsQcPlanServiceImpl extends ServiceImpl<QmsQcPlanMapper, QmsQcPlan
@Override @Override
@Transactional @Transactional
public void validateAndDelete(String handle) { public void validateAndDelete(String handle) {
String site = TenantContextHolder.getTenantId();
String[] handleSplit = handle.split(","); QmsQcPlan qcPlan = getById(handle);
if (getQmsInspecJobService().count(Wrappers.<QmsInspecJob>lambdaQuery() if (getQmsInspecJobService().count(Wrappers.<QmsInspecJob>lambdaQuery()
.eq(QmsInspecJob::getQcPlanBo, handle)) > 0) { .eq(QmsInspecJob::getQcPlanBo, handle)) > 0) {
throw BusinessException.build(I18nUtil.getI18nText("qms.qc.plan.error2", handleSplit[1])); throw BusinessException.build(I18nUtil.getI18nText("qms.qc.plan.error2", qcPlan.getQcPlan()));
} }
super.removeById(handle); super.removeById(handle);
qmsQcPlanDetailService.remove(Wrappers.<QmsQcPlanDetail>lambdaQuery() qmsQcPlanDetailService.remove(Wrappers.<QmsQcPlanDetail>lambdaQuery()
.eq(QmsQcPlanDetail::getQcPlanBo, handle)); .eq(QmsQcPlanDetail::getQcPlanBo, handle));
String url = remoteParamService.getByKey("SPC_RESTFUL_URL", SecurityConstants.FROM_IN).getData();
if (StrUtil.isNotBlank(url) && "1".equals(qcPlan.getToSpc())) {
SpcExecuteRequest spcExecuteRequest = new SpcExecuteRequest();
spcExecuteRequest.setUrl(url);
spcExecuteRequest.setSite(site);
spcExecuteRequest.setQcPlan(qcPlan.getQcPlan());
HttpResponse response = PlanDataDelSync.execute(spcExecuteRequest);
if (response != null) {
if (response.getStatusCode() != 200) {
throw BusinessException.build(I18nUtil.getI18nText("qms.spc.sync.msg", response.getResponse()));
}
}
}
} }
@Override @Override
@ -211,8 +226,6 @@ public class QmsQcPlanServiceImpl extends ServiceImpl<QmsQcPlanMapper, QmsQcPlan
} else if (type == 2) { } else if (type == 2) {
log.setFunctionName("/dc/planData/_sync"); log.setFunctionName("/dc/planData/_sync");
log.setMethodName("QmsQcPlanService.validateAndUpdate"); log.setMethodName("QmsQcPlanService.validateAndUpdate");
} else {
//delete
} }
SpcExecuteRequest spcExecuteRequest = new SpcExecuteRequest(); SpcExecuteRequest spcExecuteRequest = new SpcExecuteRequest();
@ -252,10 +265,7 @@ public class QmsQcPlanServiceImpl extends ServiceImpl<QmsQcPlanMapper, QmsQcPlan
}); });
spcExecuteRequest.setItems(items); spcExecuteRequest.setItems(items);
HttpResponse response; HttpResponse response = PlanDataSync.execute(spcExecuteRequest);
response = PlanDataSync.execute(spcExecuteRequest);
if (response != null) { if (response != null) {
log.setRequest(response.getRequest()); log.setRequest(response.getRequest());
log.setResponse(response.getResponse()); log.setResponse(response.getResponse());