diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java index b9793b22..5db8d7bb 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java @@ -28,6 +28,6 @@ public interface AbnormalBillMapper extends BaseMapper { */ AbnormalBillDto findAllByAbnormalNoDevice(@Param("abnormalBill")AbnormalBill abnormalBill, @Param("language")String language); - + List findCountBySfc(@Param("site")String site,@Param("type")String type,@Param("sfc")String sfc,@Param("status")List status); } \ No newline at end of file diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index 61d45599..624e7312 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -186,12 +186,32 @@ public class AbnormalBillServiceImpl extends ServiceImpl ncByNG = ncCodeService.findNcByNG(abnormalBill.getMessageType(), abnormalBill.getNcCode()); // if(ncByNG == null || ncByNG.size() <= 0){ // throw BusinessException.build("该消息类型下没有该不良代码"); // } + this.saveOrUpdate(abnormalBill); abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); + if(!StringUtil.isBlank(abnormalBill.getSfc()) ){ + List status = new ArrayList<>(); + status.add(Constants.PROGRAM_CONFIRM); + status.add(Constants.CANCEL); + status.add(Constants.SHUT_DOWN); + List abnormalBillList = abnormalBillMapper.findCountBySfc(abnormalBill.getSite(), abnormalBill.getType(), abnormalBill.getSfc(), status); + + if(abnormalBillList.size() > 1 && !"更新成功".equals(message)){ + throw BusinessException.build("设备异常有未处理完成的sfc"); + }else if(abnormalBillList.size() > 1 ){ + throw BusinessException.build("设备异常有未处理完成的sfc"); + } + } + + + + return message; } @@ -485,9 +505,21 @@ public class AbnormalBillServiceImpl extends ServiceImpl abnormalBills = this.selectList(abnormalBill2); +// if(abnormalBills.size() > 0 && !"更新成功".equals(message)){ +// throw BusinessException.build("设备异常有未处理完成的sfc"); +// }else if(abnormalBills.size() > 1){ +// throw BusinessException.build("设备异常有未处理完成的sfc"); +// } +// } // if(StringUtil.isBlank(abnormalBill.getResrce())){ // throw BusinessException.build("设备编号不能为空"); // } diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index a20c99ff..a24e04ea 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -885,4 +885,27 @@ + +