|
|
@ -93,7 +93,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
// 保存加工异常记录(NC判断记录)
|
|
|
|
// 保存加工异常记录(NC判断记录)
|
|
|
|
saveProductResultException(reqBean, productionPsOutContextList, productionPartContextList, productResult);
|
|
|
|
saveProductResultException(reqBean, productionPsOutContextList, productionPartContextList, resultInt);
|
|
|
|
} catch (ImppBusiException e) {
|
|
|
|
} catch (ImppBusiException e) {
|
|
|
|
stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("加工[%s] NC信息保存失败: %s", MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(resultInt), e.getErrorDetail()));
|
|
|
|
stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("加工[%s] NC信息保存失败: %s", MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(resultInt), e.getErrorDetail()));
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
@ -111,7 +111,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
|
|
|
|
* @param reqBean
|
|
|
|
* @param reqBean
|
|
|
|
* @param productionPsOutContextList
|
|
|
|
* @param productionPsOutContextList
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private void saveProductResultException(StationRequestBean reqBean, List<MesProductionPsOutContext> productionPsOutContextList, List<MesProductionPartContext> productionPartContextList, String productResult) {
|
|
|
|
private void saveProductResultException(StationRequestBean reqBean, List<MesProductionPsOutContext> productionPsOutContextList, List<MesProductionPartContext> productionPartContextList, Integer productResult) {
|
|
|
|
String defectTypeCode = MesEnumUtil.DEFECT_TYPE_CODE.DETERMIND.getValue();
|
|
|
|
String defectTypeCode = MesEnumUtil.DEFECT_TYPE_CODE.DETERMIND.getValue();
|
|
|
|
productionPsOutContextList.forEach(mesProduceSn -> {
|
|
|
|
productionPsOutContextList.forEach(mesProduceSn -> {
|
|
|
|
String productVersion = null;
|
|
|
|
String productVersion = null;
|
|
|
@ -140,7 +140,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
|
|
|
|
partInspection.setDefectTypeCode(mesDefectType.getDefectTypeCode());
|
|
|
|
partInspection.setDefectTypeCode(mesDefectType.getDefectTypeCode());
|
|
|
|
partInspection.setInspectionDate(TimeTool.getToday());
|
|
|
|
partInspection.setInspectionDate(TimeTool.getToday());
|
|
|
|
partInspection.setLotNo(mesProduceSn.getLotNo());
|
|
|
|
partInspection.setLotNo(mesProduceSn.getLotNo());
|
|
|
|
if (Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_SCRAP.getValue(), productResult)) {
|
|
|
|
if (productResult.compareTo(MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.getValue()) == 0) {
|
|
|
|
partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());
|
|
|
|
partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.CREATE.getValue());
|
|
|
|
partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.CREATE.getValue());
|
|
|
@ -171,7 +171,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
|
|
|
|
|
|
|
|
|
|
|
|
model.setPart(mesPartSap);
|
|
|
|
model.setPart(mesPartSap);
|
|
|
|
model.setPartInspectionDetailList(Arrays.asList(mesPartInspectionDetail));
|
|
|
|
model.setPartInspectionDetailList(Arrays.asList(mesPartInspectionDetail));
|
|
|
|
if (Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_SCRAP.getValue(), productResult)) {
|
|
|
|
if (productResult.compareTo(MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.getValue()) == 0) {
|
|
|
|
ncProcessingService.saveNc(model, reqBean.getOrganizeCode(), true);
|
|
|
|
ncProcessingService.saveNc(model, reqBean.getOrganizeCode(), true);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
MesPartInspectionInputModel inspectModel = new MesPartInspectionInputModel();
|
|
|
|
MesPartInspectionInputModel inspectModel = new MesPartInspectionInputModel();
|
|
|
|