对账订单列表筛选条件增加排除订单ids

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -236,7 +236,7 @@ public class KwOrderService {
             Long entId = LoginUserHolder.getEntId();
             Criteria criteria = new Criteria();
             String topEnt = Objects.equals(params.getOrderType(), 1) ? "procureTopEntId" : "supplyTopEntId";
-            criteria.and("tOrderId").in(ids).and(topEnt).is(entId).and("delFlag").is(0);
+            criteria.and("_id").in(ids).and(topEnt).is(entId).and("delFlag").is(0);
             query.addCriteria(criteria);
         } else {
             query = getQuery(params, false);
@@ -282,6 +282,11 @@ public class KwOrderService {
         Criteria criteria = new Criteria();
         String topEnt = Objects.equals(params.getOrderType(), 1) ? "procureTopEntId" : "supplyTopEntId";
         criteria.and(topEnt).is(entId).and("status").is(Integer.valueOf(DictEnum.TORDER_STATUS_5.getValue())).and("delFlag").is(0);
+        //排除订单ids
+        if (StringUtils.isNotBlank(params.getExcludeIds())) {
+            List<Long> ids = StringUtils.splitStrToList(params.getExcludeIds(), ",", Long.class);
+            criteria.and("_id").nin(ids);
+        }
         //采购企业
         if (Objects.nonNull(params.getProcureEntId())) {
             criteria.and("procureEntId").is(params.getProcureEntId());

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/TradeOrderStatementList.java

@@ -58,4 +58,9 @@ public class TradeOrderStatementList extends PageRequest {
      * 商品名称
      */
     private String goodsName;
+
+    /**
+     * 排除订单ids
+     */
+    private String excludeIds;
 }