Merge remote-tracking branch 'origin/main'

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java

@@ -98,4 +98,15 @@ public interface OrderPackageMapper extends BaseMapperX<OrderPackageDO> {
     List<LabelOrderPackData> selectLabelOrderPackData(@Param("packIds") List<Long> packIds,@Param("organId") Long organId);
 
 
+
+    default List<OrderPackageDO> selectPartPack(List<Long> orderIds, Long organId) {
+        return selectList(new LambdaQueryWrapperX<OrderPackageDO>()
+                .eq(OrderPackageDO::getOrganId,organId)
+                .eq(OrderPackageDO::getDeleted,false)
+                .inIfPresent(OrderPackageDO::getOrderId, orderIds)
+                .eqIfPresent(OrderPackageDO::getType, OrderPackageTypeEnum.PARTS.getType())
+                .select(OrderPackageDO::getId,OrderPackageDO::getOrderId));
+    }
+
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -1528,6 +1528,18 @@ public class OrderServiceImpl implements OrderService {
 
             labelOrderPackData.forEach(f -> f.setPackNum(f.getPackageId().size()));
 
+            // 查询是否有 配件 类型包裹
+            List<OrderPackageDO> partPackList = orderPackageMapper.selectPartPack(orderIds, getUserOrganId());
+
+            if(CollUtil.isNotEmpty(partPackList)){
+                labelOrderPackData.forEach(f->{
+
+                    f.setPackNum( f.getPackNum() + partPackList.stream().filter(p->p.getOrderId().equals(f.getOrderNo())).toList().size());
+                });
+
+            }
+
+
             List<OrderPackageDO> packageDOS = orderPackageMapper.selectBatchIds(packIds);
 
             labelOrderPlateData.forEach(f->f.setPackageSerialNo(packageDOS.stream().filter(o->o.getId().equals(f.getPackageNo())).findFirst().orElse(new OrderPackageDO()).getPackageNo()));

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml

@@ -614,7 +614,6 @@
         custom_order_no as customOrderNo,
         status as status,
         dealer as dealer,
-        dealer_phone_number as dealerPhoneNumber,
         customer as customer,
         phone_number as phoneNumber,
         address as address,

cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml

@@ -19,6 +19,6 @@
         select a.*, b.id field_id, b.name field_name, b.source_id field_source_id, b.keyName field_key
         from system_data_source a
         left join system_data_source_field b on a.id = b.source_id
-        where a.type in (1,2) and b.id not in (19,20,35)
+        where a.type in (1,2) and b.id not in (11,19,20,35)
     </select>
 </mapper>