|
|
@ -346,11 +346,14 @@ public class MesNcProcessingService implements IMesNcProcessingService {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (type == MesExtEnumUtil.NC_TYPE.NORMAL.getValue()) {
|
|
|
|
if (type == MesExtEnumUtil.NC_TYPE.NORMAL.getValue()) {
|
|
|
|
checkProduceSn(sn, model.getSn());
|
|
|
|
//批次不需要校验条码
|
|
|
|
//更新条码质量状态
|
|
|
|
if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
|
|
|
|
sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS_TO_QUALIFIED.getValue());
|
|
|
|
checkProduceSn(sn, model.getSn());
|
|
|
|
ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser());
|
|
|
|
//更新条码质量状态
|
|
|
|
produceSnExtService.update(sn);
|
|
|
|
sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS_TO_QUALIFIED.getValue());
|
|
|
|
|
|
|
|
ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser());
|
|
|
|
|
|
|
|
produceSnExtService.update(sn);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//更新检验单
|
|
|
|
//更新检验单
|
|
|
|
if (model.getType() != 10 && model.getType() != 40) {
|
|
|
|
if (model.getType() != 10 && model.getType() != 40) {
|
|
|
@ -448,11 +451,14 @@ public class MesNcProcessingService implements IMesNcProcessingService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
} else if (type == MesExtEnumUtil.NC_TYPE.RELEASE.getValue()) {
|
|
|
|
} else if (type == MesExtEnumUtil.NC_TYPE.RELEASE.getValue()) {
|
|
|
|
checkProduceSn(sn, model.getSn());
|
|
|
|
//批次不需要校验条码
|
|
|
|
//更新条码质量状态
|
|
|
|
if (model.getPartInspection().getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
|
|
|
|
sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
|
|
|
|
checkProduceSn(sn, model.getSn());
|
|
|
|
ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser());
|
|
|
|
//更新条码质量状态
|
|
|
|
produceSnExtService.update(sn);
|
|
|
|
sn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
|
|
|
|
|
|
|
|
ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser());
|
|
|
|
|
|
|
|
produceSnExtService.update(sn);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//更新检验单
|
|
|
|
//更新检验单
|
|
|
|
if (model.getType() != 10 && model.getType() != 40) {
|
|
|
|
if (model.getType() != 10 && model.getType() != 40) {
|
|
|
|