From 588f92abd4c5ff77451e318cf6f595d48f8f9f28 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 11 Apr 2025 10:20:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E9=85=8D?= =?UTF-8?q?=E4=BB=B6=E5=8C=85=E8=A3=B9=E6=95=B0=E9=87=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?SQL=E6=9B=B4=E6=94=B9=EF=BC=8C=E6=A0=87=E7=AD=BE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E6=BA=90=E5=8E=BB=E9=99=A4-?= =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/dal/mysql/pack/OrderPackageMapper.java | 11 +++++++++++ .../executor/service/order/OrderServiceImpl.java | 12 ++++++++++++ .../src/main/resources/mapper/order/OrderMapper.xml | 1 - .../resources/mapper/process/DataSourceMapper.xml | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java index 5db4e14ef..bad01ffcd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/pack/OrderPackageMapper.java +++ b/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 { List selectLabelOrderPackData(@Param("packIds") List packIds,@Param("organId") Long organId); + + default List selectPartPack(List orderIds, Long organId) { + return selectList(new LambdaQueryWrapperX() + .eq(OrderPackageDO::getOrganId,organId) + .eq(OrderPackageDO::getDeleted,false) + .inIfPresent(OrderPackageDO::getOrderId, orderIds) + .eqIfPresent(OrderPackageDO::getType, OrderPackageTypeEnum.PARTS.getType()) + .select(OrderPackageDO::getId,OrderPackageDO::getOrderId)); + } + + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index ce372afc9..4f1c05353 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/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 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 packageDOS = orderPackageMapper.selectBatchIds(packIds); labelOrderPlateData.forEach(f->f.setPackageSerialNo(packageDOS.stream().filter(o->o.getId().equals(f.getPackageNo())).findFirst().orElse(new OrderPackageDO()).getPackageNo())); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index cb49f9d9e..09e975984 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/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, diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml index ffac7a11c..6d1d34da1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml +++ b/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) \ No newline at end of file