|
|
@ -3905,7 +3905,7 @@ public class QcServiceImpl implements QcService { |
|
|
qcMapper.updateIQCSubDetailSubmitFlag(recordData); |
|
|
qcMapper.updateIQCSubDetailSubmitFlag(recordData); |
|
|
|
|
|
|
|
|
// 判断检验结论是否合格 |
|
|
// 判断检验结论是否合格 |
|
|
if ("合格".equals(recordData.getInspectionResult()) || "让步接收".equals(recordData.getDisposalMeasures()) || "挑选使用".equals(recordData.getDisposalMeasures())) { |
|
|
|
|
|
|
|
|
/*if ("合格".equals(recordData.getInspectionResult()) || "让步接收".equals(recordData.getDisposalMeasures()) || "挑选使用".equals(recordData.getDisposalMeasures())) { |
|
|
// 根据 site、po_orderNo、po_itemNo 从 view_po_order 中查出数据 |
|
|
// 根据 site、po_orderNo、po_itemNo 从 view_po_order 中查出数据 |
|
|
List<PoOrderData> poOrderData = qcMapper.queryDataFromViewPoOrder(recordData); |
|
|
List<PoOrderData> poOrderData = qcMapper.queryDataFromViewPoOrder(recordData); |
|
|
if (!poOrderData.isEmpty() && poOrderData.get(0) != null) { |
|
|
if (!poOrderData.isEmpty() && poOrderData.get(0) != null) { |
|
|
@ -3977,7 +3977,7 @@ public class QcServiceImpl implements QcService { |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.info(e.getMessage()); |
|
|
logger.info(e.getMessage()); |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
}*/ |
|
|
if (StringUtils.isNotBlank(recordData.getRefInfo1()) && StringUtils.isNotBlank(recordData.getRefInfo2())){ |
|
|
if (StringUtils.isNotBlank(recordData.getRefInfo1()) && StringUtils.isNotBlank(recordData.getRefInfo2())){ |
|
|
inspectService.inspectForQMS(recordData.getSite(), recordData.getRefInfo1(), Integer.parseInt(recordData.getRefInfo2()), "submit", getQmsInspectResult(recordData), recordData.getInspectionRemark(), currentUser.getUsername()); |
|
|
inspectService.inspectForQMS(recordData.getSite(), recordData.getRefInfo1(), Integer.parseInt(recordData.getRefInfo2()), "submit", getQmsInspectResult(recordData), recordData.getInspectionRemark(), currentUser.getUsername()); |
|
|
} |
|
|
} |
|
|
|