From 04e6fea21acb8438c5f046dee0868bf32b21e5cc Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 21 Jan 2025 11:06:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/mapper/DistributionStockupMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index b0845cb23..e760a4fe3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -1655,7 +1655,7 @@ logpm_distribution_stock AS ldss WHERE ldss.is_deleted = 0 - ldss.cancel_status != 1 + and ldss.cancel_status != 1 AND ldss.reservation_id = ldbl.id ) AS scanNum, ( From 62915306334780b392f6fd5d8abab05410d0db75 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 21 Jan 2025 11:39:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E6=8A=A5=E9=94=99bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/report/mapper/ReportTimeMapper.xml | 10 +++++++++- .../report/service/impl/ReportTimeServiceImpl.java | 9 ++++++++- .../com/logpm/report/vo/ReportOrderAllTimeVO.java | 3 +++ .../com/logpm/report/vo/ReportPackgeStartTimeVO.java | 3 +++ .../statistics/listener/mq/WaybillCheckListener.java | 12 ++++++++---- .../trunkline/service/impl/OpenOrderServiceImpl.java | 4 ++-- 6 files changed, 33 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index 7e6e3eb6e..418ecd870 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -234,7 +234,7 @@ count(lta.id)-count(ltcls.id) noOutNum, sum(if( ltcls.id is null and now() <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) noOutOverNum, sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) onTimeNum, - IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(ltcls.id)*100,2),'0.00') onTimeRate, + IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(lta.id)*100,2),'0.00') onTimeRate, round(sum(TIMESTAMPDIFF(SECOND, lta.create_time, ltcll.start_date))/count(ltcls.id)/3600,1) avgTime from logpm_trunkline_advance_detail lta left join logpm_warehouse_waybill lww on lww.id = lta.waybill_id @@ -1328,6 +1328,7 @@ lww.consignee consignee, lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, + IFNULL(lqd.delivery_type,lww.service_type) serviceType, GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber, GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode, GROUP_CONCAT(DISTINCT ltclsm.load_code) unloadLoadCode, @@ -1423,6 +1424,7 @@ lww.consignee, lww.departure_warehouse_name, lww.destination_warehouse_name, + lqd.delivery_type,lww.service_type, oat.day_time @@ -1446,6 +1448,11 @@ lww.consignee consignee, lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, + CASE WHEN IFNULL(lqd.delivery_type,lww.service_type)=1 THEN '商配' + WHEN IFNULL(lqd.delivery_type,lww.service_type)=2 THEN '市配' + WHEN IFNULL(lqd.delivery_type,lww.service_type)=3 THEN '自提' + WHEN IFNULL(lqd.delivery_type,lww.service_type)=4 THEN '三方中转' + ELSE '未知' END serviceType, GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber, GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode, GROUP_CONCAT(DISTINCT ltclsm.load_code) unloadLoadCode, @@ -1541,6 +1548,7 @@ lww.consignee, lww.departure_warehouse_name, lww.destination_warehouse_name, + lqd.delivery_type,lww.service_type, oat.day_time diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java index f71a937ec..f5ba4d20a 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java @@ -158,7 +158,11 @@ public class ReportTimeServiceImpl implements IReportTimeService { } IPage iPage = reportTimeMapper.packageStartTimePage(page,reportTimeDTO); - + List records = iPage.getRecords(); + records.forEach(reportPackgeStartTimeVO -> { + reportPackgeStartTimeVO.setHoursTime(reportTimeDTO.getHoursTime()); + }); + iPage.setRecords(records); return R.data(iPage); } @@ -181,6 +185,9 @@ public class ReportTimeServiceImpl implements IReportTimeService { } List list = reportTimeMapper.packageStartTimeExport(reportTimeDTO); + list.forEach(reportPackgeStartTimeVO -> { + reportPackgeStartTimeVO.setHoursTime(reportTimeDTO.getHoursTime()); + }); //导出ls ExcelUtil.export(response, "订制品发运时效报表导出", "订制品发运时效报表导出", list, ReportPackgeStartTimeVO.class); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportOrderAllTimeVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportOrderAllTimeVO.java index ac7c8d462..d38667a43 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportOrderAllTimeVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportOrderAllTimeVO.java @@ -34,6 +34,9 @@ public class ReportOrderAllTimeVO implements Serializable { @ExcelProperty(value = "目的仓") private String destinationWarehouseName; + @ExcelProperty(value = "订单类型") + private String serviceType; + @ExcelProperty(value = "客户车次号") private String trainNumber; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java index ca616d7f9..a60fd419f 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java @@ -39,5 +39,8 @@ public class ReportPackgeStartTimeVO implements Serializable { @ExcelProperty(value = "平均发运时效") private String avgTime; + @ExcelProperty(value = "标准时效") + private Integer hoursTime; + } diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java index 6a168c70a..776153cc8 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java @@ -310,6 +310,7 @@ public class WaybillCheckListener { trunklinePackageEntity.setThirdOperationPrice(thirdOperationPrice.multiply(new BigDecimal(num))); + BigDecimal systemFreightPrice = wayBillDetail.getFreightPrice(); BigDecimal price = wayBillDetail.getPrice(); BigDecimal systemPickupPrice = wayBillDetail.getPickupPrice(); @@ -320,20 +321,23 @@ public class WaybillCheckListener { Integer systemWarehouseChargeType = wayBillDetail.getSystemWarehouseChargeType(); Integer systemDeliveryChargeType = wayBillDetail.getSystemDeliveryChargeType(); + trunklinePackageEntity.setFreightChargeType(chargeType); + trunklinePackageEntity.setSystemFreightChargeType(systemChargeType); + if (systemChargeType == 1) { trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(new BigDecimal(num))); } else if (systemChargeType == 2) { - trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(trunklinePackageEntity.getWeight())); + trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(weight)); } else if (systemChargeType == 3) { - trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(trunklinePackageEntity.getVolume())); + trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(volume)); } if (chargeType == 1) { trunklinePackageEntity.setFreightPrice(price.multiply(new BigDecimal(num))); } else if (chargeType == 2) { - trunklinePackageEntity.setFreightPrice(price.multiply(trunklinePackageEntity.getWeight())); + trunklinePackageEntity.setFreightPrice(price.multiply(weight)); } else if (chargeType == 3) { - trunklinePackageEntity.setFreightPrice(price.multiply(trunklinePackageEntity.getVolume())); + trunklinePackageEntity.setFreightPrice(price.multiply(volume)); } if (systemPickupChargeType == 1) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index deb195aea..9be9cff9b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -1155,7 +1155,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { warehouseWayBillDetail.setSubtotalDeliveryFee(waybillDetailDTO.getSubtotalDeliveryFee()); warehouseWayBillDetail.setPickupPrice(waybillDetailDTO.getPickupPrice()); warehouseWayBillDetail.setFreightPrice(waybillDetailDTO.getFreightPrice()); - warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getSystemChargeType()); + warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getChargeType()); warehouseWayBillDetail.setSystemDeliveryChargeType(waybillDetailDTO.getSystemDeliveryChargeType()); warehouseWayBillDetail.setSystemPickupChargeType(waybillDetailDTO.getSystemPickupChargeType()); warehouseWayBillDetail.setSystemWarehouseChargeType(waybillDetailDTO.getSystemWarehouseChargeType()); @@ -5620,7 +5620,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { warehouseWayBillDetail.setSubtotalFreight(waybillDetailDTO.getSubtotalFreight()); warehouseWayBillDetail.setPickupPrice(waybillDetailDTO.getPickupPrice()); warehouseWayBillDetail.setFreightPrice(waybillDetailDTO.getFreightPrice()); - warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getSystemChargeType()); + warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getChargeType()); warehouseWayBillDetail.setSystemDeliveryChargeType(waybillDetailDTO.getSystemDeliveryChargeType()); warehouseWayBillDetail.setSystemPickupChargeType(waybillDetailDTO.getSystemPickupChargeType()); warehouseWayBillDetail.setSystemWarehouseChargeType(waybillDetailDTO.getSystemWarehouseChargeType()); From e539bda3ad261bcae6816b1a145c017d0419896f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 21 Jan 2025 15:01:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=AF=A6=E6=83=85BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/vo/DistributionSignforVO.java | 8 +++++++- .../mapper/DistributionSignforMapper.xml | 12 +++++++++--- .../service/impl/DistributionSignforServiceImpl.java | 3 ++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java index 2f6ed1e13..260dab40a 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java @@ -50,6 +50,11 @@ public class DistributionSignforVO extends DistributionSignforEntity { */ @ApiModelProperty(value = "客户电话") private String deliveryPhone; + /** + * 定位打卡位置 + */ + @ApiModelProperty(value = "定位打卡位置") + private String positioningAdr; /** * 客户地址 */ @@ -90,7 +95,7 @@ public class DistributionSignforVO extends DistributionSignforEntity { * 计划总数 */ @ApiModelProperty(value = "计划总数") - private Integer totalNum; + private Integer planNum; /** * 装车件数 */ @@ -340,6 +345,7 @@ public class DistributionSignforVO extends DistributionSignforEntity { @ApiModelProperty(value = "商城ID") private List clientIds; + /** * 签收图片路径，多个 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 4f9a976eb..5407946b4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -743,15 +743,20 @@ lds.clerk_sign_pictures clerkSignPictures, lds.delivery_sign_pictures deliverySignPictures, ldr.reservation_date reservationDate, - lds.positioning_adr positioningAdr, + (ldr.reservation_num + ldr.reservation_stock_list_num) AS planNum, (lds.loaded_number + lds.loadedin_number) loadingNum, (lds.received_quantity + lds.receivedin_quantity) signingNum, lddl.train_number trainNumber, lddl.vehicle_name vehicleName, lddl.driver_name driverName, - lddl.loading_team_name loadingTeamName, lddl.unloading_team_name unLoadingTeamName, + lds.signee_name AS signeeName, + lds.examine_user_name AS examineUserName, + lds.sjsigning_time AS sjsigningTime, + lds.signing_time AS signingTime, + lddl.task_time AS taskTime, + GROUP_CONCAT(DISTINCT ldp.latitude_and_longitude) AS positioningAdr, CASE WHEN ldr.delivery_type = '1' THEN '商配' @@ -773,7 +778,8 @@ FROM logpm_distribution_signfor lds JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id - JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.reservation_status != 40 + LEFT JOIN logpm_distribution_positioning AS ldp ON lds.reservation_id = lds.reservation_id AND ldp.is_deleted = 0 where lds.is_deleted = 0 and lds.id = #{id} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index c6fc16c05..5c46c3898 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -3706,13 +3706,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.query().lambda() .eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()) .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));