Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -121,13 +121,24 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
+
         OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
-        List<String> truckList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo).stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
+        List<String> truckList;
+
+        if(Objects.equals(orderGoodsVO.getPendingOrderWay(),PendingOrderWayStatusEnum.Status.FLEET_DX.getCode())){
+            truckList = orderGoodsTruckBindDao.
+                    listByField(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                    .stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
+        }else{
+            truckList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo).stream().map(OrderGoodsTruckBind::getTruckNo).collect(Collectors.toList());
+        }
+
         String orderNo = orderGoodsVO.getOrderNo();
         orderGoodsVO.setTruckList(truckList);
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
         orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
+        orderGoodsVO.setDispatchedOrders(truckList.size());
         return orderGoodsVO;
     }
 
@@ -162,7 +173,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 page.getRecords().forEach(item->item.setDispatchedOrders(map.get(item.getOrderGoodsNo())));
             }
         }
-        return orderGoodsDao.pageOrderGoodsList(param);
+        return page;
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsTruckBindSqlProvider.java

@@ -53,7 +53,6 @@ public class OrderGoodsTruckBindSqlProvider {
         return new SQL(){{
             SELECT(" a.order_goods_no,count(*) truckNum ");
             FROM("order_goods_truck_bind a");
-            WHERE("a.order_goods_no IN ("  + fleetNoList.stream().map(code -> "'"+code+"'").collect(Collectors.joining(","))+ ")" );
             StringJoiner sj = new StringJoiner(",","a.order_goods_no in (",")");
             fleetNoList.forEach(item -> sj.add("'"+item+"'"));
             WHERE(sj.toString());