Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r36088 -r36105 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 36088) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 36105) @@ -12515,7 +12515,7 @@ if(CollectionUtils.isEmpty(tousseInstanceList)){ throw new SystemException("更新失败,未找到申请项关联的使用记录录入的器械包实例!"); } - if(tousseInstanceList.size() < tousseInstanceTousseItem.getAmount()){ + if(tousseInstanceList.size() > tousseInstanceTousseItem.getAmount()){ throw new SystemException("更新失败,申请数量小于使用记录录入包实例数量,请检查是否修改了申请单!"); } @@ -12550,6 +12550,11 @@ tousseInstanceTousseItem.setUrgentLevel(maxUrgentLevel.getName()); } tousseInstanceTousseItem.setUrgentAmount(urgentAmount); + if(urgentAmount != null + && tousseInstanceTousseItem.getAmount() != null + && urgentAmount.intValue() > tousseInstanceTousseItem.getAmount().intValue()){ + throw new SystemException("申请项加急数量不能大于申请数量!"); + } } /**