diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 83e0316f..f5681292 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -40,6 +40,8 @@ import java.util.*; import java.util.regex.Pattern; import java.util.stream.Collectors; +import static org.apache.coyote.http11.Constants.a; + /** * @description: 质量管理业务层 * @author: fengyuan_yang @@ -2070,7 +2072,17 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void faiRecordDelete(QcFAIRecordData data) { + String state = data.getSubmitList().get(0).getState(); + // 判断状态是否一致 + boolean bool = data.getSubmitList().stream().anyMatch(a -> !state.equals(a.getState())); + if (bool) { + throw new RuntimeException("所选检验单状态不一致,请确认!"); + } for (QcFAIRecordData qcData : data.getSubmitList()){ + // 判断状态 + if ("已完成".equals(qcData.getState())) { + throw new RuntimeException("检验单已完成,不允许删除!"); + } // 删除检验记录 qcMapper.deleteFAIRecord(qcData); // 删除明细记录信息 @@ -2574,7 +2586,17 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void fqcRecordDelete(QcFAIRecordData data) { + String state = data.getSubmitList().get(0).getState(); + // 判断状态是否一致 + boolean bool = data.getSubmitList().stream().anyMatch(a -> !state.equals(a.getState())); + if (bool) { + throw new RuntimeException("所选检验单状态不一致,请确认!"); + } for (QcFAIRecordData qcData : data.getSubmitList()){ + // 判断状态 + if ("已完成".equals(qcData.getState())) { + throw new RuntimeException("检验单已完成,不允许删除!"); + } // 删除检验记录 qcMapper.deleteFQCRecord(qcData); // 删除明细记录信息 @@ -3120,7 +3142,17 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void ipqcRecordDelete(QcFAIRecordData data) { + String state = data.getSubmitList().get(0).getState(); + // 判断状态是否一致 + boolean bool = data.getSubmitList().stream().anyMatch(a -> !state.equals(a.getState())); + if (bool) { + throw new RuntimeException("所选检验单状态不一致,请确认!"); + } for (QcFAIRecordData qcData : data.getSubmitList()){ + // 判断状态 + if ("已完成".equals(qcData.getState())) { + throw new RuntimeException("检验单已完成,不允许删除!"); + } // 删除检验记录 qcMapper.deleteIPQCRecord(qcData); // 删除明细记录信息 @@ -3760,7 +3792,17 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void iqcRecordDelete(QcFAIRecordData data) { + String state = data.getSubmitList().get(0).getState(); + // 判断状态是否一致 + boolean bool = data.getSubmitList().stream().anyMatch(a -> !state.equals(a.getState())); + if (bool) { + throw new RuntimeException("所选检验单状态不一致,请确认!"); + } for (QcFAIRecordData qcData : data.getSubmitList()){ + // 判断状态 + if ("已完成".equals(qcData.getState())) { + throw new RuntimeException("检验单已完成,不允许删除!"); + } // 删除检验记录 qcMapper.deleteIQCRecord(qcData); // 删除明细记录信息