|
|
|
@ -141,6 +141,18 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
|
|
|
|
|
|
|
|
|
|
//校验点检单
|
|
|
|
|
checkSpotCheckOrder(model.getSpotCheckOrder());
|
|
|
|
|
|
|
|
|
|
if (MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.PROCESS_PARAMETER_INSPECTION.getValue() == model.getSpotCheckOrder().getSpotCheckOrderType() ||
|
|
|
|
|
MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.EQUIPMENT_INSPECTION.getValue() == model.getSpotCheckOrder().getSpotCheckOrderType()) {
|
|
|
|
|
MesEquipment mesEquipment = mesEquipmentExtService.getMesEquipment(org, model.getSpotCheckOrder().getEquipCode());
|
|
|
|
|
if (Objects.isNull(mesEquipment)) {
|
|
|
|
|
throw new ImppBusiException(String.format("点检单对应的设备【%s】信息不存在", model.getSpotCheckOrder().getEquipCode()));
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isEmpty(mesEquipment.getEquipId()) || !model.getProduceSn().equals(mesEquipment.getEquipId() + "")) {
|
|
|
|
|
throw new ImppBusiException(String.format("点检单对应的设备编号【%s】和扫描的设备编号【%s】不匹配,请检查数据", mesEquipment.getEquipId(), model.getProduceSn()));
|
|
|
|
|
}
|
|
|
|
|
return model;
|
|
|
|
|
} else {
|
|
|
|
|
//检查条码
|
|
|
|
|
MesProduceSn produceSn = checkProduceSn(model.getProduceSn(), org);
|
|
|
|
|
|
|
|
|
@ -160,6 +172,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
|
|
|
|
|
|
|
|
|
|
return model;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询点检数据
|
|
|
|
|