|
|
|
@ -3799,17 +3799,28 @@ public class QcServiceImpl implements QcService { |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<EamObjectInData> getFQCItemObjectList(EamObjectInData data) { |
|
|
|
List<EamObjectInData> itemList = qcMapper.getFQCInspectionDetail(data); |
|
|
|
for (EamObjectInData eamObjectInData : itemList) { |
|
|
|
List<EamObjectInData> list = qcMapper.getObjectList2(eamObjectInData); |
|
|
|
List<EamObjectInData> list2 = list.stream().filter(a -> "Y".equals(a.getDefaultFlag())).collect(Collectors.toList()); |
|
|
|
if (!list2.isEmpty()) { |
|
|
|
eamObjectInData.setEquipmentNo(list2.get(0).getObjectID()); |
|
|
|
return getStartInspectionItemEquipment(qcMapper.getFQCInspectionDetail(data)); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<EamObjectInData> getOQCItemObjectList(QcFAIRecordData data) { |
|
|
|
data.setFlag("oqc"); |
|
|
|
return getStartInspectionItemEquipment(qcMapper.listInspectionAcquisitionItems(data)); |
|
|
|
} |
|
|
|
|
|
|
|
private List<EamObjectInData> getStartInspectionItemEquipment(List<EamObjectInData> items) { |
|
|
|
List<EamObjectInData> itemsWithEquipment = new ArrayList<>(); |
|
|
|
for (EamObjectInData item : items) { |
|
|
|
List<EamObjectInData> equipment = qcMapper.getObjectList2(item); |
|
|
|
if (equipment.isEmpty()) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
eamObjectInData.setObjectList(list); |
|
|
|
equipment.stream().filter(option -> "Y".equals(option.getDefaultFlag())).findFirst() |
|
|
|
.ifPresent(option -> item.setEquipmentNo(option.getObjectID())); |
|
|
|
item.setObjectList(equipment); |
|
|
|
itemsWithEquipment.add(item); |
|
|
|
} |
|
|
|
List<EamObjectInData> collect = itemList.stream().filter(a -> !a.getObjectList().isEmpty()).collect(Collectors.toList()); |
|
|
|
return collect; |
|
|
|
return itemsWithEquipment; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -5221,11 +5232,13 @@ public class QcServiceImpl implements QcService { |
|
|
|
@Override |
|
|
|
@Transactional |
|
|
|
public void actionFQASInspection(QcFAIRecordData data) { |
|
|
|
QcFAIRecordData currentRecord = qcMapper.getFQASRecordStatus(data); |
|
|
|
if (currentRecord == null || !"未开始".equals(currentRecord.getState()) || "Y".equals(currentRecord.getSubmitFlag())) { |
|
|
|
if (qcMapper.actionFQASInspection(data) == 0) { |
|
|
|
throw new RuntimeException(pmsI18nHelper.text("pms.error.inspection.status.noStart", null, "该检验单当前状态不允许开始检验,请刷新页面后重试!")); |
|
|
|
} |
|
|
|
qcMapper.actionFQASInspection(data); |
|
|
|
if (data.getEquipmentCollectList() != null && !data.getEquipmentCollectList().isEmpty()) { |
|
|
|
data.setFlag("oqc"); |
|
|
|
saveInspectionAcquisitionEquipment(data); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|