物流运单类别原矿订单需要区分

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -3728,24 +3728,24 @@ public class KwtWaybillOrderV1Service {
             }
         }
 
-//        EntTypeResDto entTypeResDto = remoteSystemService.queryEntTypeById(entId);
-//        log.debug("当前登录企业类型为: {}", entTypeResDto.getType());
-//        if (Objects.equals(entTypeResDto.getType(), 3)) {
-//            // 如果是物流企业，只能看到自己物流企业的原矿订单
-//            List<KwtLogisticsOrderUnit> logisticsOrderUnits = kwtLogisticsOrderUnitRepository.queryByEntIdAndUnitType(entId, 2);
-//            Set<Long> logUnitOrderIds = logisticsOrderUnits.stream().map(KwtLogisticsOrderUnit::getLOrderId).collect(Collectors.toSet());
-//            log.debug("物流企业物流订单: {}", JSON.toJSONString(logUnitOrderIds));
-//            intersectLogOrderIds(logOrderIds, logUnitOrderIds);
-//        } else {
-//            // 查询原矿订单
-//            List<KwtLogisticsOrder> logisticsOrderList = kwtLogisticsOrderRepository.queryByIdsByOrderType();
-//            if (CollectionUtils.isEmpty(logisticsOrderList)) {
-//                return logOrderIds;
-//            }
-//            Set<Long> logisticsOrder = logisticsOrderList.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toSet());
-//            log.debug("非物流企业原矿物流订单: {}", JSON.toJSONString(logisticsOrder));
-//            intersectLogOrderIds(logOrderIds, logisticsOrder);
-//        }
+        EntTypeResDto entTypeResDto = remoteSystemService.queryEntTypeById(entId);
+        log.debug("当前登录企业类型为: {}", entTypeResDto.getType());
+        if (Objects.equals(entTypeResDto.getType(), 3)) {
+            // 如果是物流企业，只能看到自己物流企业的原矿订单
+            List<KwtLogisticsOrderUnit> logisticsOrderUnits = kwtLogisticsOrderUnitRepository.queryByEntIdAndUnitType(entId, 2);
+            Set<Long> logUnitOrderIds = logisticsOrderUnits.stream().map(KwtLogisticsOrderUnit::getLOrderId).collect(Collectors.toSet());
+            log.debug("物流企业物流订单: {}", JSON.toJSONString(logUnitOrderIds));
+            logOrderIds.addAll(logUnitOrderIds);
+        } else {
+            // 查询原矿订单
+            List<KwtLogisticsOrder> logisticsOrderList = kwtLogisticsOrderRepository.queryByIdsByOrderType();
+            if (CollectionUtils.isEmpty(logisticsOrderList)) {
+                return logOrderIds;
+            }
+            Set<Long> logisticsOrder = logisticsOrderList.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toSet());
+            log.debug("非物流企业原矿物流订单: {}", JSON.toJSONString(logisticsOrder));
+            logOrderIds.addAll(logisticsOrder);
+        }
 
         log.debug("查询完成，最终物流订单ID数量: {}，订单ids:{}", logOrderIds.size(), JSON.toJSONString(logOrderIds));
         return logOrderIds;