Browse Source

2025-11-12

qc优化
master
fengyuan_yang 2 months ago
parent
commit
93080f419f
  1. 1
      src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
  2. 1
      src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
  3. 35
      src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java

1
src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java

@ -52,5 +52,6 @@ public class SoReceiveCasesData extends SoReceiveCases {

1
src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java

@ -195,5 +195,6 @@ public class SoReceiveCases {

35
src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java

@ -1643,13 +1643,14 @@ public class QcServiceImpl implements QcService {
// 发送邮件 // 发送邮件
if ("不合格".equals(recordData.getInspectionResult())) { if ("不合格".equals(recordData.getInspectionResult())) {
// 更新"收货入库任务"的状态为"已完成" // 更新"收货入库任务"的状态为"已完成"
try {
List<QcFAIRecordData> list = qcMapper.iqcDetailSearch(recordData);
recordData.setItemList(list);
sendMailIQC(recordData, "IQC");
} catch (Exception e) {
logger.info(e.getMessage());
}
qcMapper.updateInboundNotificationStatus(recordData.getSite(), recordData.getBuNo(), recordData.getDocumentNo(), "已完成");
// try {
// List<QcFAIRecordData> list = qcMapper.iqcDetailSearch(recordData);
// recordData.setItemList(list);
// sendMailIQC(recordData, "IQC");
// } catch (Exception e) {
// logger.info(e.getMessage());
// }
} }
} }
} }
@ -1661,14 +1662,14 @@ public class QcServiceImpl implements QcService {
@Transactional @Transactional
public void cancelApproval(QcFAIRecordData data) { public void cancelApproval(QcFAIRecordData data) {
for (QcFAIRecordData qcData : data.getSubmitList()) { for (QcFAIRecordData qcData : data.getSubmitList()) {
// 物料的controlMes为G的不允许取消审核
List<QcFAIRecordData> partInformationList = qcMapper.getPartInformation(qcData);
if (partInformationList.isEmpty()) {
throw new RuntimeException("未查到该物料数据!");
}
if ("G".equals(partInformationList.get(0).getControlMes())) {
throw new RuntimeException("检验单物料的管控类型为不适用,不允许取消审核 {" + qcData.getInspectionNo() + "} !");
}
// // 物料的controlMes为G的不允许取消审核
// List<QcFAIRecordData> partInformationList = qcMapper.getPartInformation(qcData);
// if (partInformationList.isEmpty()) {
// throw new RuntimeException("未查到该物料数据!");
// }
// if ("G".equals(partInformationList.get(0).getControlMes())) {
// throw new RuntimeException("检验单物料的管控类型为不适用,不允许取消审核 {" + qcData.getInspectionNo() + "} !");
// }
// po_order_roll_no里如果有数据则不允许取消审核 // po_order_roll_no里如果有数据则不允许取消审核
List<PoOrderRollNoData> rollNos = qcMapper.selectInfoByInspectionNo(qcData); List<PoOrderRollNoData> rollNos = qcMapper.selectInfoByInspectionNo(qcData);
if (!rollNos.isEmpty()) { if (!rollNos.isEmpty()) {
@ -1678,8 +1679,8 @@ public class QcServiceImpl implements QcService {
qcMapper.updateIQCMasterSubmitFlag2(qcData); qcMapper.updateIQCMasterSubmitFlag2(qcData);
qcMapper.updateIQCDetailSubmitFlag2(qcData); qcMapper.updateIQCDetailSubmitFlag2(qcData);
qcMapper.updateIQCSubDetailSubmitFlag2(qcData); qcMapper.updateIQCSubDetailSubmitFlag2(qcData);
// 删除相应task表的数据
qcMapper.deleteReceivingTaskByInspectionNo(qcData);
// // 删除相应task表的数据
// qcMapper.deleteReceivingTaskByInspectionNo(qcData);
} }
} }

Loading…
Cancel
Save