Merge branch 'master' of ssh://10.10.101.21/source/platform-b2b into hejq-feature-201847

src/main/java/com/uas/platform/b2b/service/impl/ErpProdIODetailServiceImpl.java

@@ -260,6 +260,8 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         if (null != keyword.getTaxRate()) {
             pageInfo.filter("taxrate", keyword.getTaxRate());
         }
+        pageInfo.expression(PredicateUtils.ne("apCheck.checkStatus", "不同意", true));
+        pageInfo.expression(PredicateUtils.ne("apCheck.checkStatus", "已作废", true));
         return apCheckItemInfoDao.findAll((Root<PurchaseApCheckItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) ->
             query.where(pageInfo.getPredicates(root, query, builder)).getRestriction());
     }