From 17b06d4a3ec8072aabc9d3772ebe6e2d025db559 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 27 Mar 2025 10:56:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E4=BB=B7=E6=A0=BC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改代码错误问题 --- .../distribution/receiver/report/QualityDeliverAddListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java index 5c8e7edf2..3f4a11923 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverAddListener.java @@ -335,8 +335,8 @@ public class QualityDeliverAddListener implements ReportService { TrunklineWaybillOrderEntity entityByWaybillNoAndOrderCode = waybillOrderClient.findEntityByWaybillNoAndOrderCode(waybillNumber, orderCode); if (ObjectUtil.isNotEmpty(entityByWaybillNoAndOrderCode)) { qualityDeliverEntity.setOrderWaybillNumber(entityByWaybillNoAndOrderCode.getTotalNumber()); + redisCache.setEx(key, entityByWaybillNoAndOrderCode.getTotalNumber(), 60L); } - redisCache.setEx(key, entityByWaybillNoAndOrderCode.getTotalNumber(), 60L); } } } From ab1608886274a5c7f7e3d85ccf8f1b5feb56d8b2 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 27 Mar 2025 15:23:39 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E7=AD=BE=E6=94=B6BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 7886fba9f..9d60e70e2 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 @@ -3984,6 +3984,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Thu, 27 Mar 2025 15:27:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E7=AD=BE=E6=94=B6BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) 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 9d60e70e2..0d2faa721 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 @@ -6093,13 +6093,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = new HashMap<>(); -// map.put("orderPackageCode", collected); -// map.put("warehouseId", myCurrentWarehouse.getId()); -// warehouseUpdownTypeClient.downDeliveryPackage(map); -// trunklinePackageTrackLogClient.addPackageTrackLog(aaa); -// } + } //维护客户信息状态 -// reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue()); -// reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue()); -// distributionReservationMapper.updateById(reservationEntity); //更新配送装车时间 distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue()); distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue()); From f5eda3d0a16c0a353e4ec59ab3761663ff3f3144 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 27 Mar 2025 15:53:12 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E4=BB=B7=E6=A0=BC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改代码错误问题 --- .../receiver/report/DeliverFinishReportListener.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index ba463406a..42749876e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -160,6 +160,9 @@ public class DeliverFinishReportListener implements ReportService { entity.setWaybillNumber(qualityDeliverEntity.getWaybillNumber()); entity.setConditions(qualityDeliverEntity.getConditions()); entity.setSignNum(qualityDeliverEntity.getSignNum()); + entity.setArriveProvince(qualityDeliverEntity.getArriveProvince()); + entity.setArriveCity(qualityDeliverEntity.getArriveCity()); + entity.setArriveDistrict(qualityDeliverEntity.getArriveDistrict()); // 查询品类 BasicdataFactoryCategoryEntity param = new BasicdataFactoryCategoryEntity(); param.setBrand(qualityDeliverEntity.getBrandName()); @@ -770,9 +773,11 @@ public class DeliverFinishReportListener implements ReportService { Collection values = valueMap.values(); // 按省市区分组后的数量 arriveProvince arriveCity arriveDistrict if(CollUtil.isNotEmpty(values)){ - Set collect1 = values.stream().map(v -> { - return v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict(); - }).collect(Collectors.toSet()); + Set collect1 = values.stream() + .filter(v -> StrUtil.isNotEmpty(v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict())) + .map(v -> { + return v.getArriveProvince() + v.getArriveCity() + v.getArriveDistrict(); + }).collect(Collectors.toSet()); if(CollUtil.isNotEmpty(collect1)){ dkp = collect1.size(); } From 16b667f23afcbd72005c958acd4264c0639aeca8 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 27 Mar 2025 16:33:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=E5=BC=80=E5=8D=95=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 74170ede8..181a5f8c0 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 @@ -1027,6 +1027,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { }); if (CollUtil.isNotEmpty(updateStockArticleList)) { + log.info("###############openWaybill: 更新订单列表, {}", updateStockArticleList); distributionStockArticleClient.updateByBatchId(updateStockArticleList); } } From 6d2056f09436584e09b2003fd4c3d1ce2a10361b Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 27 Mar 2025 16:57:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1.=E6=97=B6=E6=95=88=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/report/mapper/ReportTimeMapper.xml | 21 ++++++++++++------- 1 file changed, 13 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 9a7ffd939..1ca670eb3 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 @@ -245,9 +245,10 @@ from logpm_trunkline_advance_detail lta left join logpm_warehouse_waybill lww on lww.id = lta.waybill_id left join logpm_warehouse_warehouse waw on waw.id = lta.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 + left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where lta.create_time > '2024-10-22 00:00:00' + and lww.document_making_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id and waw.business_line is not null @@ -305,9 +306,10 @@ from logpm_trunkline_advance_detail lta left join logpm_warehouse_waybill lww on lww.id = lta.waybill_id left join logpm_warehouse_warehouse waw on waw.id = lta.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 + left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where lta.create_time > '2024-10-22 00:00:00' + and lww.document_making_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id and waw.business_line is not null @@ -579,7 +581,7 @@ round(sum(TIMESTAMPDIFF(SECOND, ldpl.create_time, ltcll.start_date))/sum( if(ltcls.id is not null or ldpl.order_package_status != '20',1,0))/3600,1) avgTime from logpm_distribution_parcel_list ldpl left join logpm_warehouse_warehouse waw on waw.id = ldpl.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1 + left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where ldpl.is_transfer = 1 and ldpl.create_time > '2024-10-22 00:00:00' @@ -648,7 +650,7 @@ round(sum(TIMESTAMPDIFF(SECOND, ldpl.create_time, ltcll.start_date))/sum( if(ltcls.id is not null or ldpl.order_package_status != '20',1,0))/3600,1) avgTime from logpm_distribution_parcel_list ldpl left join logpm_warehouse_warehouse waw on waw.id = ldpl.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1 + left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where ldpl.is_transfer = 1 and ldpl.create_time > '2024-10-22 00:00:00' @@ -1405,6 +1407,7 @@ left join logpm_reportconfig_order_all oat on oat.departure_warehouse_id = lww.departure_warehouse_id and oat.destination_warehouse_id = lww.destination_warehouse_id and oat.is_deleted = 0 where ltad.waybill_id is not null and ltad.create_time > '2024-10-22 00:00:00' + and lww.document_making_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id and waw.business_line in @@ -2762,9 +2765,10 @@ left join logpm_trunkline_advance lta on lta.id = ltad.advance_id left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id left join logpm_warehouse_warehouse waw on waw.id = ltad.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ltad.order_package_code and ltcls.warehouse_id = ltad.warehouse_id and ltcls.type = 1 + left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ltad.order_package_code and ltcls.warehouse_id = ltad.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where ltad.create_time > '2024-10-22 00:00:00' + and lww.document_making_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id and waw.business_line is not null and waw.business_line = #{param.businessLine} @@ -2863,9 +2867,10 @@ left join logpm_trunkline_advance lta on lta.id = ltad.advance_id left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id left join logpm_warehouse_warehouse waw on waw.id = ltad.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ltad.order_package_code and ltcls.warehouse_id = ltad.warehouse_id and ltcls.type = 1 + left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ltad.order_package_code and ltcls.warehouse_id = ltad.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where ltad.create_time > '2024-10-22 00:00:00' + and lww.document_making_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id and waw.business_line is not null and waw.business_line = #{param.businessLine} @@ -2963,7 +2968,7 @@ from logpm_distribution_parcel_list ldpl left join logpm_trunkline_advance lta on lta.id = ldpl.advance_id left join logpm_warehouse_warehouse waw on waw.id = ldpl.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1 + left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where ldpl.is_transfer = 1 and ldpl.create_time > '2024-10-22 00:00:00' @@ -3064,7 +3069,7 @@ from logpm_distribution_parcel_list ldpl left join logpm_trunkline_advance lta on lta.id = ldpl.advance_id left join logpm_warehouse_warehouse waw on waw.id = ldpl.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1 + left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpl.order_package_code and ltcls.warehouse_id = ldpl.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where ldpl.is_transfer = 1 and ldpl.create_time > '2024-10-22 00:00:00'