电子化检验问题修复

tags/yfai-pcn-ext-v2.3
jun 8 months ago
parent f297e1c4c5
commit 4d80911aef

@ -100,7 +100,7 @@ public class MesNcProcessingController {
} }
if (CollectionUtils.isEmpty(model.getPartInspectionDetailList())) { if (CollectionUtils.isEmpty(model.getPartInspectionDetailList())) {
throw new ImppBusiException(String.format("不存在可疑信息,请检查数据", model.getType())); throw new ImppBusiException("不存在可疑信息,请检查数据");
} }
ncProcessingService.saveNc(model, !StringUtils.isEmpty(model.getOrganizeCode())? model.getOrganizeCode() : AuthUtil.getOrganizeCode(), false); ncProcessingService.saveNc(model, !StringUtils.isEmpty(model.getOrganizeCode())? model.getOrganizeCode() : AuthUtil.getOrganizeCode(), false);
return ResultBean.success("NC处理成功"); return ResultBean.success("NC处理成功");

@ -243,7 +243,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
model.getPartInspection().setQmsSync(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); model.getPartInspection().setQmsSync(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
} }
if(!Objects.isNull(model.getPart())){ if(!Objects.isNull(model.getPart())){
model.setPart(mesPartService.getMesPartSapByPartNo(model.getPart().getPartNo(), model.getOrganizeCode())); model.setPart(mesPartService.getMesPartSapByPartNo(model.getPart().getPartNo(), org));
} }
//零件检测详情为空,则代表本次校验为合格。 //零件检测详情为空,则代表本次校验为合格。
if (CollectionUtils.isEmpty(model.getPartInspectionDetailList())) { if (CollectionUtils.isEmpty(model.getPartInspectionDetailList())) {

@ -187,7 +187,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
@Override @Override
public void saveNc(MesNcProcessingInputModel model, String org, boolean isOrder) { public void saveNc(MesNcProcessingInputModel model, String org, boolean isOrder) {
if(!Objects.isNull(model.getPart())){ if(!Objects.isNull(model.getPart())){
model.setPart(mesPartService.getMesPartSapByPartNo(model.getPart().getPartNo(), model.getOrganizeCode())); model.setPart(mesPartService.getMesPartSapByPartNo(model.getPart().getPartNo(), org));
} }
if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) { if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
Integer type = model.getType(); Integer type = model.getType();

Loading…
Cancel
Save