puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

nc处理更新质检单的责任方

Browse Source
uat_temp_xw_2050619_nc
xiangwei.zhang 1 month ago
parent 20c3601ae9
commit 8245fb2112
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java
Unescape Escape View File

@ -732,8 +732,8 @@ public class MesNcProcessingService implements IMesNcProcessingService {
if (type == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue()) { if (type == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue()) {
model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue()); mesPartInspection.setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue());
model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue()); mesPartInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue());
ConvertBean.serviceModelUpdate(model.getPartInspection(), model.getUserName()); ConvertBean.serviceModelUpdate(model.getPartInspection(), model.getUserName());
String sourceValue = configService.getCfgValue(org, "UMLGO"); String sourceValue = configService.getCfgValue(org, "UMLGO");
@ -789,7 +789,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
DdlPreparedPack.getStringLikerPack(mesNcPersonModel.getOnlyPerson(), "responsibleParty", partyPackBean); DdlPreparedPack.getStringLikerPack(mesNcPersonModel.getOnlyPerson(), "responsibleParty", partyPackBean);
MesOrg mesOrg = mesOrgRDao.getByProperty(partyPackBean); MesOrg mesOrg = mesOrgRDao.getByProperty(partyPackBean);
mesPartInspectionPerson.setResponsibleParty(mesOrg.getResponsibleParty()); mesPartInspectionPerson.setResponsibleParty(mesNcPersonModel.getOnlyPerson());
ConvertBean.serviceModelInitialize(mesPartInspectionPerson, model.getUserName()); ConvertBean.serviceModelInitialize(mesPartInspectionPerson, model.getUserName());
personList.add(mesPartInspectionPerson); personList.add(mesPartInspectionPerson);
@ -826,8 +826,8 @@ public class MesNcProcessingService implements IMesNcProcessingService {
reworkTaskDetailRepository.saveAll(taskDetailList); reworkTaskDetailRepository.saveAll(taskDetailList);
//model.getPartInspection().setDefectTypeId(person.getId()); //model.getPartInspection().setDefectTypeId(person.getId());
model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.REWORK.getValue()); mesPartInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.REWORK.getValue());
model.getPartInspection().setReworkTaskId(reworkTask.getId()); mesPartInspection.setReworkTaskId(reworkTask.getId());
ConvertBean.serviceModelUpdate(model.getPartInspection(),model.getUserName()); ConvertBean.serviceModelUpdate(model.getPartInspection(),model.getUserName());
String sourceValue = configService.getCfgValue(org, "UMLGO"); String sourceValue = configService.getCfgValue(org, "UMLGO");
@ -843,7 +843,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
} else if (type == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue()) { } else if (type == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue()) {
//报废时设置责任人 //报废时设置责任人
model.getPartInspection().setResponsibleParty(mesNcPersonModel.getOnlyPerson()); mesPartInspection.setResponsibleParty(mesNcPersonModel.getOnlyPerson());
//model.getPartInspection().setDefectTypeId(person.getId()); //model.getPartInspection().setDefectTypeId(person.getId());
model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue()); model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());
model.getPartInspection().setRejectQty(model.getPartInspection().getQty()); model.getPartInspection().setRejectQty(model.getPartInspection().getQty());
@ -868,7 +868,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
if (mesOrg ==null) { if (mesOrg ==null) {
throw new ImppBusiException(String.format("责任人【%s】不存在", mesNcPersonModel.getOnlyPerson())); throw new ImppBusiException(String.format("责任人【%s】不存在", mesNcPersonModel.getOnlyPerson()));
} }
mesPartInspectionPerson.setResponsibleParty(mesOrg.getResponsibleParty()); mesPartInspectionPerson.setResponsibleParty(mesNcPersonModel.getOnlyPerson());
ConvertBean.serviceModelInitialize(mesPartInspectionPerson, model.getUserName()); ConvertBean.serviceModelInitialize(mesPartInspectionPerson, model.getUserName());
personList.add(mesPartInspectionPerson); personList.add(mesPartInspectionPerson);

Write Preview
Loading…
Cancel
Save