fix:第二版财务,应收款,应付款审核界面的内部编号筛选

chenhang4442024
1 parent 334d3881
Showing 8 changed files with 210 additions and 250 deletions
src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderQueryVO.java
src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillOrderQueryVO.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
src/main/resources/application-test.yml
src/main/resources/application.yml
src/main/resources/mapper/InvoiceBillOrderMapper.xml
@@ -23,6 +23,7 @@ public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable 
     private List<Long> ids;
     private Long id;
+    private List<Long> orderId;
     /**
      * 发票单号
@@ -47,22 +48,22 @@ public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable 
     /**
      * order订单的客户编码
      */
-    private String customerCode;
+    private List<String> customerCode;
     /**
      * order订单的项目号
      */
-    private String projectNo;
+    private List<String> projectNo;
     /**
      * order订单的生产科
      */
-    private String productionDepartment;
+    private List<String> productionDepartment;
     /**
      * order订单的内部编号
      */
-    private String innerNo;
+    private List<String> innerNo;
     /**
      * order订单的客户po号
@@ -23,7 +23,7 @@ public class ProducePaymentCheckBillOrderQueryVO extends BasePageVO implements S
     private List<Long> ids;
-
+    private List<Long> orderIds;
     private Long id;
     /**
      * 生产科对账单
@@ -97,140 +97,6 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         //例如:查询基本信息中项目号为A01-C2409,并且invoice状态为已通过,那么就先去基本信息中查找A01-C2409,然后找到对应的invoice,判断A01-C2409对应的订单集合是否有invoice,有的话,就查找已通过的invocie。
         //要是查询invoice为67,并且订单HOD时间小于2024-12-25,那么就先去invoice中查找是否有checkNo为67的订单,然后查找对应orderId,使用orderId去查找对应订单基本信息,查看是否有HOD小于2024-12-25的单子。
-
-       /* RoleEnum role = dataScope.getRole();
-        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
-        //跟单也只能看到自己创建的   业务只能看到自己的
-        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())){
-            queryWrapper.eq(InvoiceBillOrderDO::getTrackerUser, dataScope.getLoginUserName());
-        }
-        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())){
-            queryWrapper.eq(InvoiceBillOrderDO::getBusinesPerson, dataScope.getLoginUserName());
-        }
-        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
-        IPage<InvoiceBillOrderDO> iPage = page(page, queryWrapper);
-        //创建另一个page,包含订单基本信息与invoice,然后一起返回。
-        return ServerResult.success(iPage);*/
-
-        //一个条件也没有。
-//        if(true) {
-//            Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
-//            IPage<OrderBaseInfoDO> iPage = orderBaseInfoService.page(page, new LambdaQueryWrapper<OrderBaseInfoDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).orderByDesc(OrderBaseInfoDO::getId));
-//            List<OrderBaseInfoDO> orderList = iPage.getRecords();
-//            //获取关联的信息。
-//            List<FinanceOrderResultVO> financeOrderResultVOList = null;
-//            if (CollectionUtils.isNotEmpty(orderList)) {
-//                List<Long> orderIds = orderList.stream().filter(Objects::nonNull).map(item -> item.getId()).collect(Collectors.toList());
-//                List<InvoiceBillOrderDO> invoiceBillOrderDOList = list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
-//                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillOrderDO::getOrderId, orderIds));
-//                List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = producePaymentCheckBillOrderService.list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
-//                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(ProducePaymentCheckBillOrderDO::getOrderId, orderIds));
-//                Map<Long, InvoiceBillOrderDO> invoiceBillOrderDOMap = invoiceBillOrderDOList.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
-//                Map<Long, ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOMap = producePaymentCheckBillOrderDOList.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
-//                financeOrderResultVOList = orderList.stream().filter(Objects::nonNull).map(x -> {
-//                    FinanceOrderResultVO financeOrderResultVO = new FinanceOrderResultVO();
-//                    BeanUtils.copyProperties(x, financeOrderResultVO);
-//                    if (invoiceBillOrderDOMap.containsKey(x.getId())) {
-//                        InvoiceBillOrderDO invoiceBillOrderDO = invoiceBillOrderDOMap.get(x.getId());
-//                        financeOrderResultVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
-//                    }
-//                    if (producePaymentCheckBillOrderDOMap.containsKey(x.getId())) {
-//                        ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDO = producePaymentCheckBillOrderDOMap.get(x.getId());
-//                        financeOrderResultVO.setProducePaymentCheckBillOrderDO(producePaymentCheckBillOrderDO);
-//                    }
-//                    return financeOrderResultVO;
-//                }).collect(Collectors.toList());
-//            }
-//            IPage<FinanceOrderResultVO> financeOrderResultVOIPage = new Page<>();
-//            financeOrderResultVOIPage.setRecords(financeOrderResultVOList);
-//            BeanUtils.copyProperties(iPage, financeOrderResultVOIPage, "records");
-//            return ServerResult.success(financeOrderResultVOIPage);
-//        }
-//        else{
-       /* //上面单独再写一个if判断,要是一个条件都没有,就直接进行分页查询(只做一下权限)。   唯一问题:这里一下子需要查询多条数据。
-        RoleEnum role = dataScope.getRole();
-        List<OrderBaseInfoDO> orderBaseInfoDOList = ByOrderGetOrderId(queryVO, role);
-        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
-            return ServerResult.success();
-        }
-        List<InvoiceBillOrderDO> invoiceBillOrderDOS = ByInvoiceGetOrderId(queryVO, orderBaseInfoDOList);
-        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = ByCheckGetOrderId(queryVO, orderBaseInfoDOList);
-
-        //取交集
-
-        //取交集。
-        // 获取每个集合的 id 列表，如果集合为空则返回空集合
-        Set<Long> orderIds1 = orderBaseInfoDOList != null
-                ? orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet())
-                : Collections.emptySet();
-
-        Set<Long> orderIds2 = invoiceBillOrderDOS != null
-                ? invoiceBillOrderDOS.stream().map(InvoiceBillOrderDO::getOrderId).collect(Collectors.toSet())
-                : Collections.emptySet();
-
-        Set<Long> orderIds3 = producePaymentCheckBillOrderDOS != null
-                ? producePaymentCheckBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getOrderId).collect(Collectors.toSet())
-                : Collections.emptySet();
-
-        Set<Long> intersection = Stream.of(orderIds1, orderIds2, orderIds3)
-                .filter(CollectionUtils::isNotEmpty) // 过滤掉空集合
-                .reduce((set1, set2) -> {
-                    set1.retainAll(set2); // 取交集
-                    return set1;
-                })
-                .orElse(Collections.emptySet()); // 如果结果为空则返回空集合
-        if (CollectionUtils.isEmpty(intersection)) {
-            return ServerResult.success();
-        }
-
-        //返回交集的订单数据。 todo
-        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
-        IPage<OrderBaseInfoDO> iPage = orderBaseInfoService.page(page, new LambdaQueryWrapper<OrderBaseInfoDO>().in(OrderBaseInfoDO::getId, intersection));
-        List<OrderBaseInfoDO> orderList = iPage.getRecords();
-
-
-        //去对应的invoice中查找。
-        List<InvoiceBillOrderDO> invoiceBillOrderDOList = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillOrderDO::getOrderId, intersection));
-        //去对应的check中查找。
-        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = producePaymentCheckBillOrderService.list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(ProducePaymentCheckBillOrderDO::getOrderId, intersection));
-
-        List<FinanceOrderResultVO> financeOrderResultVOS = null;
-        if (CollectionUtils.isNotEmpty(orderList)) {
-            // 将 Map 提升到方法范围内
-            Map<Long, InvoiceBillOrderDO> invoiceBillOrderDOMap = CollectionUtils.isNotEmpty(invoiceBillOrderDOList)
-                    ? invoiceBillOrderDOList.stream().collect(Collectors.toMap(
-                    InvoiceBillOrderDO::getOrderId,
-                    Function.identity(),
-                    (existing, replacement) -> existing))
-                    : Collections.emptyMap();
-            Map<Long, ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOMap = CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)
-                    ? producePaymentCheckBillOrderDOList.stream().collect(Collectors.toMap(
-                    ProducePaymentCheckBillOrderDO::getOrderId,
-                    Function.identity(),
-                    (existing, replacement) -> existing))
-                    : Collections.emptyMap();
-            financeOrderResultVOS = orderList.stream().map(result -> {
-                //到这复制订单基本信息。   一个整体包含订单基本信息,invoice信息,生产科对账单号信息。
-                FinanceOrderResultVO financeOrderResultVO = new FinanceOrderResultVO();
-                BeanUtils.copyProperties(result, financeOrderResultVO);
-                // 访问 invoiceBillOrderDOMap
-                if (invoiceBillOrderDOMap.containsKey(result.getId())) {
-                    // 对 invoice 进行处理,填充到整体中,需要orderId一致。
-                    financeOrderResultVO.setInvoiceBillOrderDO(invoiceBillOrderDOMap.get(result.getId()));
-                }
-                if (producePaymentCheckBillOrderDOMap.containsKey(result.getId())) {
-                    // 对 check 进行处理,填充到整体中,需要orderId一致。
-                    financeOrderResultVO.setProducePaymentCheckBillOrderDO(producePaymentCheckBillOrderDOMap.get(result.getId()));
-                }
-                return financeOrderResultVO;
-            }).collect(Collectors.toList());
-        }
-        IPage<FinanceOrderResultVO> finVoPage = new Page<>();
-        finVoPage.setRecords(financeOrderResultVOS);
-        BeanUtils.copyProperties(iPage, finVoPage, "records");
-        System.out.println("交集 ID 集合：" + intersection);
-        //返回所有的订单数据。 todo  没有筛选的情况。
-        return ServerResult.success(finVoPage);*/
             RoleEnum role = dataScope.getRole();
             Page<FinanceOrderResultVO> page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
             if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())) {
@@ -247,54 +113,6 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
             return ServerResult.success(financeOrderResultVOIPage);
         }
 //    }
-
-
-
-
-    private List<OrderBaseInfoDO> ByOrderGetOrderId(InvoiceBillOrderQueryVO queryVO,RoleEnum role){
-        LambdaQueryWrapper<OrderBaseInfoDO> lambdawrapper = new LambdaQueryWrapper<OrderBaseInfoDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
-                .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
-                .eq(StringUtils.isNotBlank(queryVO.getCustomerPo()), OrderBaseInfoDO::getCustomerPo, queryVO.getCustomerPo())
-                .eq(StringUtils.isNotBlank(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
-                .eq(StringUtils.isNotBlank(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo())
-                .ge(StringUtils.isNotBlank(queryVO.getCreateStartTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateStartTime())
-                .le(StringUtils.isNotBlank(queryVO.getCreateEndTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateEndTime())
-                .ge(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignStartTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignStartTime())
-                .le(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignEndTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignEndTime())
-                .ge(StringUtils.isNotBlank(queryVO.getOrderHodStartTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodStartTime())
-                .le(StringUtils.isNotBlank(queryVO.getOrderHodEndTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodEndTime());
-        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())) {
-            lambdawrapper.eq(OrderBaseInfoDO::getCreateBy, dataScope.getLoginUserName());
-        }
-        if (Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())) {
-                lambdawrapper.eq(OrderBaseInfoDO::getBusinessPerson, dataScope.getLoginUserName());
-        }
-        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(lambdawrapper);
-        return orderBaseInfoDOList;
-    }
-    private List<InvoiceBillOrderDO> ByInvoiceGetOrderId(InvoiceBillOrderQueryVO queryVO,List<OrderBaseInfoDO> orderBaseInfoDOList){
-        LambdaQueryWrapper<InvoiceBillOrderDO> LambdaQueryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
-                .eq(Objects.nonNull(queryVO.getInvoiceStatus()), InvoiceBillOrderDO::getStatus, queryVO.getInvoiceStatus())
-                .ge(StringUtils.isNotBlank(queryVO.getInvoiceStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getInvoiceStartTime())
-                .le(StringUtils.isNotBlank(queryVO.getInvoiceEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getInvoiceEndTime());
-        if(CollectionUtils.isNotEmpty(orderBaseInfoDOList)){
-            LambdaQueryWrapper.in(InvoiceBillOrderDO::getOrderId, orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList()));
-        }
-        return list(LambdaQueryWrapper);
-    }
-    private List<ProducePaymentCheckBillOrderDO> ByCheckGetOrderId(InvoiceBillOrderQueryVO queryVO,List<OrderBaseInfoDO> orderBaseInfoDOList){
-        LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> wrapper = new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), ProducePaymentCheckBillOrderDO::getCheckNo, queryVO.getCheckNo())
-                .eq(Objects.nonNull(queryVO.getInvoiceStatus()), ProducePaymentCheckBillOrderDO::getStatus, queryVO.getCheckNoStatus())
-                .ge(StringUtils.isNotBlank(queryVO.getCheckStartTime()), ProducePaymentCheckBillOrderDO::getCreateTime, queryVO.getCheckStartTime())
-                .le(StringUtils.isNotBlank(queryVO.getCheckEndTime()), ProducePaymentCheckBillOrderDO::getCreateTime, queryVO.getCheckEndTime());
-        if(CollectionUtils.isNotEmpty(orderBaseInfoDOList)){
-            wrapper.in(ProducePaymentCheckBillOrderDO::getOrderId, orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList()));
-        }
-        return producePaymentCheckBillOrderService.list(wrapper);
-    }
     /**
      * @param queryVO
      * @return
@@ -504,13 +322,83 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (CollectionUtils.isEmpty(invoiceBillOrderDOS)) {
             return null;
         }
-//        List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getInvoiceBillId, ids));
-//        if (CollectionUtils.isEmpty(invoiceBillMappingDOS)) {
-//            return null;
-//        }
      Map<Long, InvoiceBillOrderDO> invoiceBillOrderDOMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
-  //第一版,上面为第二版 Map<Long, InvoiceBillMappingDO> orderBillMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
         List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(invoiceBillOrderDOMap);
+      /*  //得到里面的orderId,这个里面的orderId一定是有对应invocie,不然也不会查出来。然后得到前端传来的orderIds,筛选出没有invoice的orderId。
+        List<Long> existOrderIds = invoiceBillOrderDOS.stream().map(InvoiceBillOrderDO::getOrderId).collect(Collectors.toList());
+        List<Long> notExistOrderIds = queryVO.getOrderIds().stream().filter(x -> !existOrderIds.contains(x)).collect(Collectors.toList());
+        //得到没有invoice的orderIds之后,订单信息,查询利润信息。
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag,Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId,notExistOrderIds));
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(notExistOrderIds);
+        //根据客户编码进行分类,计算形同客户编码的利润信息,然后累加。
+        Map<String, List<OrderBaseInfoDO>> groupedByCustomerCode = orderBaseInfoDOList.stream()
+                .collect(Collectors.groupingBy(OrderBaseInfoDO::getCustomerCode));
+        //得到客户编码相同的利润信息。  计算客户编码相同的利润信息的总和。  需要遍历这个map集合,然后把每一次值中的id集合收集起来,每一次遍历代表不同的客户编码。然后得到对应利润信息。
+        HashMap<String, BigDecimal> hashMap = new HashMap<>();
+        for(Map.Entry<String, List<OrderBaseInfoDO>> entry: groupedByCustomerCode.entrySet()){
+          List<OrderBaseInfoDO> entryValue = entry.getValue();
+          List<Long> orderids = entryValue.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
+          List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                  .in(OrderProfitAnalysisDO::getOrderId, orderids));
+          BigDecimal totalCustomerPrice = orderProfitAnalysisDOS.stream()
+                  .map(OrderProfitAnalysisDO::getCustomerTotalPrice) // 提取每个元素的 customerTotalPrice（double 类型）
+                  .filter(Objects::nonNull)                          // 过滤掉 null 值
+                  .map(BigDecimal::valueOf)                          // 转换为 BigDecimal 类型
+                  .reduce(BigDecimal.ZERO, BigDecimal::add);
+          // 累加,其中key为客户编码。
+            hashMap.put(entry.getKey(),totalCustomerPrice);
+      }*/
+
+        List<Long> existOrderIds = invoiceBillOrderDOS.stream()
+                .map(InvoiceBillOrderDO::getOrderId)
+                .collect(Collectors.toList());
+
+        List<Long> notExistOrderIds = queryVO.getOrderId().stream()
+                .filter(orderId -> !existOrderIds.contains(orderId))
+                .collect(Collectors.toList());
+
+// 查询没有 invoice 的订单信息和利润信息
+  /*      List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(
+                new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(OrderProfitAnalysisDO::getOrderId, notExistOrderIds));*/
+        Map<String, BigDecimal> customerProfitMap=null;
+        if(CollectionUtils.isNotEmpty(notExistOrderIds)) {
+
+            List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(notExistOrderIds);
+
+// 根据客户编码进行分类
+            Map<String, List<OrderBaseInfoDO>> groupedByCustomerCode = orderBaseInfoDOList.stream()
+                    .collect(Collectors.groupingBy(OrderBaseInfoDO::getCustomerCode));
+
+// 计算每个客户编码的总利润
+             customerProfitMap = groupedByCustomerCode.entrySet().stream()
+                    .collect(Collectors.toMap(
+                            Map.Entry::getKey,
+                            entry -> {
+                                List<Long> orderIds = entry.getValue().stream()
+                                        .map(OrderBaseInfoDO::getId)
+                                        .collect(Collectors.toList());
+
+                                List<OrderProfitAnalysisDO> filteredProfitAnalysisDOS = profitAnalysisService.list(
+                                        new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                                                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                                                .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+
+                                return filteredProfitAnalysisDOS.stream()
+                                        .map(OrderProfitAnalysisDO::getCustomerTotalPrice)
+                                        .filter(Objects::nonNull)
+                                        .map(BigDecimal::valueOf)
+                                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                            }
+                    ));
+
+        }
+        // 这样得到了没有invoice的基础信息,利润信息,然后根据客户编码进行分类,然后相同客户编码的就进行累加。下一步,就是去excel表格中找到与自己相同的客户编码,
+         //       然后放在下面。
+
 //第一版,上面为第二版   List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(orderBillMap);
         //这里出问题了。
 //        Map<String, InvoiceBillOrderDO> invoiceBillMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getInvoiceNo, Function.identity(), (x, y) -> x));
@@ -565,7 +453,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
                         }
                 ));
         Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap = itemVOS.stream().collect(Collectors.groupingBy(InvoiceOrderBaseItemVO::getInvoiceCode));
-        List<InvoiceBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(invoiceBillMap, baseItemMap);
+        List<InvoiceBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(invoiceBillMap, baseItemMap,customerProfitMap);
         return wrapperAnalysisResultVO(exportVOS);
     }
@@ -630,18 +518,37 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @param baseItemMap
      * @return
      */
-    private List<InvoiceBillAnalysisExportVO> wrapperAnalysisExport(Map<String, InvoiceBillOrderDO> invoiceBillOrderDOMap, Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap) {
+    private List<InvoiceBillAnalysisExportVO> wrapperAnalysisExport(Map<String, InvoiceBillOrderDO> invoiceBillOrderDOMap, Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap,Map<String,BigDecimal> hashMap) {
         if (CollectionUtils.isEmpty(invoiceBillOrderDOMap)) {
             return Collections.emptyList();
         }
         List<InvoiceBillAnalysisExportVO> results = new ArrayList<>();
         for (Map.Entry<String, InvoiceBillOrderDO> entry : invoiceBillOrderDOMap.entrySet()) {
             InvoiceBillOrderDO invoiceBillOrderDO = entry.getValue();
+            //invoiceBillOrderDOMap就是总的,而baseItemMap。 例如:invoiceBillOrderMap就是多个A01的累加值。而baseItemMap就是相同的invoice中散的A01。
             List<InvoiceBillAnalysisExportVO> exportVOS = transfer2analysisExportVO(invoiceBillOrderDO, baseItemMap);
             if (CollectionUtils.isNotEmpty(exportVOS)) {
                 results.addAll(exportVOS);
             }
         }
+        if(CollectionUtils.isNotEmpty(hashMap)){
+        for(Map.Entry<String,BigDecimal> entryk : hashMap.entrySet()){
+            //这里注释取消了只有勾选的订单中包含穿了invoice的订单才会在excel中展示,现在是不管这个订单有没有创建invoice的，直接展示。
+          /*  if(results.stream()
+                    .map(InvoiceBillAnalysisExportVO::getCustomerCode)
+                    .anyMatch(customerCode -> customerCode.equals(entryk.getKey()))){*/
+                InvoiceBillAnalysisExportVO exportVOy = new InvoiceBillAnalysisExportVO();
+                exportVOy.setCustomerCode(entryk.getKey());
+                exportVOy.setCustomerTotalPrice(entryk.getValue().setScale(2, BigDecimal.ROUND_HALF_UP));
+                exportVOy.setDeductAmount(BigDecimal.ZERO);
+                exportVOy.setActualReceivableAmount(entryk.getValue().setScale(2, BigDecimal.ROUND_HALF_UP));
+                exportVOy.setActualPayedAmount(BigDecimal.ZERO);
+                exportVOy.setOtherAmount(BigDecimal.ZERO);
+                exportVOy.setOtherTotalAmount(entryk.getValue().setScale(2, BigDecimal.ROUND_HALF_UP));
+                results.add(exportVOy);
+            /*}*/
+        }
+        }
         return results;
     }
@@ -659,6 +566,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
             for (Map.Entry<String, List<InvoiceOrderBaseItemVO>> entry : listMap.entrySet()) {
                 String customerCode = entry.getKey();
                 List<InvoiceOrderBaseItemVO> itemVOS = entry.getValue();
+                //invoiceBillOrderDO就是相同客户编码的总的集合。  例如：多个A01相加的值,里面的客户总价等多个A01都是累加的。
                 InvoiceBillAnalysisExportVO exportVO = buildAnalysisExportVO(invoiceBillOrderDO);
                 exportVO.setCustomerCode(customerCode);
                 if (CollectionUtils.isEmpty(itemVOS)) {
@@ -668,11 +576,33 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
                     for (InvoiceOrderBaseItemVO itemVO : itemVOS) {
                         customerTotalPrice = customerTotalPrice.add(Objects.nonNull(itemVO.getCustomerTotalPrice()) ? itemVO.getCustomerTotalPrice() : new BigDecimal(Constant.ZERO));
                     }
+                    //这里设置相同客户编码的客户总价总的价钱。
                     exportVO.setCustomerTotalPrice(customerTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
                 }
                 results.add(exportVO);
+                //感觉在这里加上,如果客户编码一致就加上。
+              /*  for(Map.Entry<String,BigDecimal> entryk : hashMap.entrySet()){
+                    if(customerCode.equals(entryk.getKey())){
+                        InvoiceBillAnalysisExportVO exportVOy = new InvoiceBillAnalysisExportVO();
+                        exportVOy.setCustomerCode(entryk.getKey());
+                        exportVOy.setCustomerTotalPrice(entryk.getValue());
+                        results.add(exportVOy);
+                    }
+                }*/
             }
+            /*for(Map.Entry<String,BigDecimal> entryk : hashMap.entrySet()){
+                if(results.stream()
+                        .map(InvoiceBillAnalysisExportVO::getCustomerCode)
+                        .anyMatch(customerCode -> customerCode.equals(entryk.getKey()))){
+                    InvoiceBillAnalysisExportVO exportVOy = new InvoiceBillAnalysisExportVO();
+                    exportVOy.setCustomerCode(entryk.getKey());
+                    exportVOy.setCustomerTotalPrice(entryk.getValue());
+                    results.add(exportVOy);
+                }
+            }*/
+            //如果没有对的上的客户编码,就在这里加上。
         }
+        //这个results集合里面存储的就是不同客户编码的累加值。   667-7878
         return results;
     }
@@ -780,19 +710,19 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      */
     private List<Long> filterOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
         Boolean flag = false;
-        if (StringUtils.isNotBlank(queryVO.getCustomerCode())) {
+        if (CollectionUtils.isNotEmpty(queryVO.getCustomerCode())) {
             flag = flag | true;
         }
-        if (StringUtils.isNotBlank(queryVO.getProductionDepartment())) {
+        if (CollectionUtils.isNotEmpty(queryVO.getProductionDepartment())) {
             flag = flag | true;
         }
         if (StringUtils.isNotBlank(queryVO.getCustomerPo())) {
             flag = flag | true;
         }
-        if (StringUtils.isNotBlank(queryVO.getInnerNo())) {
+        if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
             flag = flag | true;
         }
-        if (StringUtils.isNotBlank(queryVO.getProjectNo())) {
+        if (CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
             flag = flag | true;
         }
         if(StringUtils.isNotBlank(queryVO.getCreateStartTime())){
@@ -818,11 +748,11 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         }
         LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
                 .eq(OrderBaseInfoDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
-                .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
+                .in(CollectionUtils.isNotEmpty(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                .in(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
                 .eq(StringUtils.isNotBlank(queryVO.getCustomerPo()), OrderBaseInfoDO::getCustomerPo, queryVO.getCustomerPo())
-                .eq(StringUtils.isNotBlank(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
-                .eq(StringUtils.isNotBlank(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo())
+                .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
+                .in(CollectionUtils.isNotEmpty(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo())
                 .ge(StringUtils.isNotBlank(queryVO.getCreateStartTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateStartTime())
                 .le(StringUtils.isNotBlank(queryVO.getCreateEndTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateEndTime())
                 .ge(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignStartTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignStartTime())
@@ -137,30 +137,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                         resultVO.setFieldInfos(fieldVO);
                     }
                     if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())) {
-                        // 解决待审批列表中的应收款要显示内部编码。 这里开始
                         OrderLockFieldVO orderLockFieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
-                      /*  if(Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && StringUtils.isNotBlank(orderLockFieldVO.getInvoiceFieldVO().getInvoiceNo())){
-                        *//*    List<InvoiceBillMappingDO> invoiceBillMappingDOList= invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
-                                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                                    .eq(InvoiceBillMappingDO::getInvoiceNo, orderLockFieldVO.getInvoiceBillOrderDO().getInvoiceNo()));*//*
-                            List<InvoiceBillOrderDO> invoiceBillMappingDOList = invoiceBillOrderService.list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                                    .eq(InvoiceBillOrderDO::getInvoiceNo, orderLockFieldVO.getInvoiceFieldVO().getInvoiceNo()));
-                            if(CollectionUtils.isNotEmpty(invoiceBillMappingDOList)){
-                                Set<Long> orderIds = invoiceBillMappingDOList.stream().map(InvoiceBillOrderDO::getOrderId).filter(Objects::nonNull).collect(Collectors.toSet());
-                                if(CollectionUtils.isNotEmpty(orderIds)){
-                                    List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
-                                    if(CollectionUtils.isNotEmpty(orderBaseInfoDOList)){
-                                        Set<String> innerNoList = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getInnerNo).filter(Objects::nonNull).collect(Collectors.toSet());
-                                        if(CollectionUtils.isNotEmpty(innerNoList)){
-                                            OrderBaseInfoVO orderBaseInfoVO = new OrderBaseInfoVO();
-                                            resultVO.setOrderBaseInfo(orderBaseInfoVO);
-                                            orderBaseInfoVO.setInnerNo(resultVO.getOrderBaseInfo().getInnerNo().join(",", innerNoList));
-                                        }
-                                    }
-                                }
-                            }
-                        }*/ //这里结束  上述为待审核列表中应收款要显示内部编码。     这部分不需要了,内部编码放在里面了。
-                        //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
                         if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
                             if(Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && orderLockFieldVO.getInvoiceFieldVO().getBusinesPerson().equals(loginUserName)){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
@@ -426,33 +403,35 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus())
                 .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList())
                 .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
-        //这里应该加上应收款待审核,应付款待审核,应付款已审核,应收款已审核已审核的一个条件。
+        //这里应该加上应收款待审核,应付款待审核,应付款已审核,应收款已审核已审核的一个条件。  目前只支持单个字符串搜索,不支持多个。
         if(Objects.nonNull(queryVO.getType())){
+            //发票,应付款审核。
             if(Constant.FOUR == String.valueOf(queryVO.getType()).length()){
                 int firstTwoDigits = queryVO.getType() / 100;
                 int lastTwoDigits = queryVO.getType() % 100;
                 queryWrapper.in(OrderFieldLockApplyDO::getType,firstTwoDigits,lastTwoDigits);
+                //目前是只能通过内部编号查询出应付款审核,无法查询出发票信息。
                 if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
-                    String innerNoList = queryVO.getInnerNo().stream()
-                            .map(innerNo -> "'" + innerNo + "'") // 包装为单引号
-                            .collect(Collectors.joining(","));
+                    String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                     queryWrapper.apply(
-                            "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.innerNo')) in (" + innerNoList + ")"
+                            "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo')) = {0}",
+                            queryInnerNo
                     );
                 }
             }else{
+                //应收款审核。
                 if(Objects.nonNull(queryVO.getType()) && queryVO.getType().equals(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())){
                     queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
                     //这个内部编号单独针对于应付款申请设置的。
                     if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
-                        String innerNoList = queryVO.getInnerNo().stream()
-                                .map(innerNo -> "'" + innerNo + "'") // 包装为单引号
-                                .collect(Collectors.joining(","));
+                        String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                         queryWrapper.apply(
-                                "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo')) in (" + innerNoList + ")"
+                                "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.innerNo')) = {0}",
+                                queryInnerNo
                         );
                     }
                 }
+                //其他审核类型。
                 queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
             }
         }
@@ -173,6 +173,32 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
 //            Map<Long, CheckBillMappingDO> orderBillMap = checkBillMappingDOS.stream().collect(Collectors.toMap(CheckBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
         List<CheckOrderBaseItemVO> itemVOS = getCheckOrderBaseItems(orderBillMap);
+            List<Long> existOrderIds = checkBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getOrderId).collect(Collectors.toList());
+            List<Long> notExistOrderIds = queryVO.getOrderIds().stream().filter(orderId -> !existOrderIds.contains(orderId))
+                    .collect(Collectors.toList());
+            Map<String, BigDecimal> productionDepartmentProfitMap=null;
+            if(CollectionUtils.isNotEmpty(notExistOrderIds)){
+            List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(notExistOrderIds);
+            Map<String, List<OrderBaseInfoDO>> groupedByProductionDepartMent = orderBaseInfoDOList.stream().collect(Collectors.groupingBy(OrderBaseInfoDO::getProductionDepartment));
+             productionDepartmentProfitMap = groupedByProductionDepartMent.entrySet().stream()
+                    .collect(Collectors.toMap(
+                            Map.Entry::getKey,
+                            entry -> {
+                                List<Long> orderIds = entry.getValue().stream()
+                                        .map(OrderBaseInfoDO::getId)
+                                        .collect(Collectors.toList());
+                                List<OrderProfitAnalysisDO> filteredProfitAnalysisDOS = profitAnalysisService.list(
+                                        new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                                                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                                                .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+                                return filteredProfitAnalysisDOS.stream()
+                                        .map(OrderProfitAnalysisDO::getProductionDepartmentTotalPrice)
+                                        .filter(Objects::nonNull)
+                                        .map(BigDecimal::valueOf)
+                                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                            }
+                    ));
+            }
 //        Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap = checkBillOrderDOS.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getCheckNo, Function.identity(), (x, y) -> x));
             Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap = checkBillOrderDOS.stream()
                     .collect(Collectors.toMap(
@@ -209,7 +235,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                             }
                     ));
         Map<String, List<CheckOrderBaseItemVO>> baseItemMap = itemVOS.stream().collect(Collectors.groupingBy(CheckOrderBaseItemVO::getCheckNo));
-        List<CheckBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(checkBillOrderDOMap, baseItemMap);
+        List<CheckBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(checkBillOrderDOMap, baseItemMap,productionDepartmentProfitMap);
         return wrapperAnalysisResultVO(exportVOS);
     }
@@ -261,7 +287,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
      * @param baseItemMap
      * @return
      */
-    private List<CheckBillAnalysisExportVO> wrapperAnalysisExport(Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap, Map<String, List<CheckOrderBaseItemVO>> baseItemMap) {
+    private List<CheckBillAnalysisExportVO> wrapperAnalysisExport(Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap, Map<String, List<CheckOrderBaseItemVO>> baseItemMap,Map<String,BigDecimal> productionDepartmentProfitMap) {
         if (CollectionUtils.isEmpty(checkBillOrderDOMap)) {
             return Collections.emptyList();
         }
@@ -273,6 +299,18 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                 results.addAll(exportVOS);
             }
         }
+        if(CollectionUtils.isNotEmpty(productionDepartmentProfitMap)){
+        for(Map.Entry<String,BigDecimal> entry : productionDepartmentProfitMap.entrySet()){
+            CheckBillAnalysisExportVO exportVO = new CheckBillAnalysisExportVO();
+            exportVO.setProductionDepartment(entry.getKey());
+            exportVO.setProductionDepartmentTotalPrice(entry.getValue().setScale(2, RoundingMode.HALF_UP));
+            exportVO.setDeductAmount(BigDecimal.ZERO);
+            exportVO.setActualPayedAmount(BigDecimal.ZERO);
+            exportVO.setUnPayedAmount(entry.getValue().setScale(2, RoundingMode.HALF_UP));
+            exportVO.setCalculateActualPayedAmount(entry.getValue().setScale(2, RoundingMode.HALF_UP));
+            results.add(exportVO);
+         }
+        }
         return results;
     }
@@ -57,7 +57,7 @@ spring:
     testWhileIdle: true
     testOnBorrow: true
     testOnReturn: true
-    password: Erp@test123456
+    password: eJ8(bD6]wN6=gI5=
     time-between-eviction-runs-millis: 1000
     url: jdbc:mysql://47.104.8.35:3307/order-erp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
     username: root
 server:
-  port: 8000
+  port: 18000
 spring:
   profiles:
-    active: prod
 \ No newline at end of file
+    active: test
 \ No newline at end of file
@@ -133,17 +133,29 @@
         <if test="queryVO.checkNoStatus != null">
             AND o.check_status = #{queryVO.checkNoStatus}
         </if>
-        <if test="queryVO.customerCode != null and queryVO.customerCode != ''">
-            AND o.customer_code = #{queryVO.customerCode}
-        </if>
-        <if test="queryVO.projectNo != null and queryVO.projectNo != ''">
-            AND o.project_no = #{queryVO.projectNo}
-        </if>
-        <if test="queryVO.productionDepartment != null and queryVO.productionDepartment != ''">
-            AND o.production_department = #{queryVO.productionDepartment}
-        </if>
-        <if test="queryVO.innerNo != null and queryVO.innerNo != ''">
-            AND o.inner_no = #{queryVO.innerNo}
+        <if test="queryVO.customerCode != null and queryVO.customerCode.size > 0 ">
+            AND o.customer_code IN
+            <foreach collection="queryVO.customerCode" item="customerCode" open="(" separator="," close=")">
+                #{customerCode}
+            </foreach>
+        </if>
+        <if test="queryVO.projectNo != null and queryVO.projectNo.size > 0 ">
+            AND o.project_no IN
+            <foreach collection="queryVO.projectNo" item="projectNo" open="(" separator="," close=")">
+                #{projectNo}
+            </foreach>
+        </if>
+        <if test="queryVO.productionDepartment != null and queryVO.productionDepartment.size > 0 ">
+            AND o.production_department IN
+            <foreach collection="queryVO.productionDepartment" item="productionDepartment" open="(" separator="," close=")">
+                #{productionDepartment}
+            </foreach>
+        </if>
+        <if test="queryVO.innerNo != null and queryVO.innerNo.size > 0 ">
+            AND o.inner_no IN
+            <foreach collection="queryVO.innerNo" item="innerNo" open="(" separator="," close=")">
+                #{innerNo}
+            </foreach>
         </if>
         <if test="queryVO.customerPo != null and queryVO.customerPo != ''">
             AND o.customer_po = #{queryVO.customerPo}