From aa9d0c1bffc36eea977b8353a5347ebb90b4c315 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 18 Feb 2025 17:21:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=8A=A5=E8=A1=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=202.=E5=B9=B2=E7=BA=BFbug=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 | 12 ++++++++---- .../service/impl/AdvanceOrderMqServiceImpl.java | 1 + .../service/impl/CarsLoadAsyncServiceImpl.java | 2 +- .../service/impl/TrunklineAdvanceServiceImpl.java | 6 +++++- .../service/impl/TrunklineCarsLoadServiceImpl.java | 6 ++++-- 5 files changed, 19 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 191ea85a5..feb21851c 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 @@ -1169,6 +1169,8 @@ group by lw.id,lrat.hours_time) t on lww.id = t.waybillId where 1=1 + and lww.departure_warehouse_id != lww.destination_warehouse_id + and lww.create_time > '2024-10-22 00:00:00' and waw.business_line in @@ -1288,6 +1290,8 @@ group by lw.id,lrat.hours_time) t on lww.id = t.waybillId where 1=1 + and lww.departure_warehouse_id != lww.destination_warehouse_id + and lww.create_time > '2024-10-22 00:00:00' and waw.business_line in @@ -1357,7 +1361,7 @@ when count(ltad.id) = sum(if(ldplm.order_package_status='70',1,0)) then '已签收' else '未知' end signStatus, sum(if(ldplm.order_package_status='70',1,0)) signNum - from logpm_trunkline_advance_detail ltad + from logpm_trunkline_advance_detail ltad FORCE INDEX (idx_createtime_count_1) left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id left join logpm_distribution_parcel_list ldpls on ldpls.warehouse_id = lww.departure_warehouse_id and ldpls.order_package_code = ltad.order_package_code @@ -1366,7 +1370,7 @@ left join logpm_distribution_parcel_list ldplm on ldplm.warehouse_id = lww.destination_warehouse_id and ldplm.order_package_code = ltad.order_package_code left join logpm_trunkline_cars_load_scan ltclsm on ltclsm.scan_code = ldplm.order_package_code and ltclsm.unload_node_id = ldplm.warehouse_id left join logpm_trunkline_cars_load_line ltcllm on ltcllm.load_id = ltclsm.load_id and ltcllm.node_id = ltclsm.unload_node_id - left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.retention_time is null + left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.biz_status <= 100 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' @@ -1487,7 +1491,7 @@ when count(ltad.id) = sum(if(ldplm.order_package_status='70',1,0)) then '已签收' else '未知' end signStatus, sum(if(ldplm.order_package_status='70',1,0)) signNum - from logpm_trunkline_advance_detail ltad + from logpm_trunkline_advance_detail ltad FORCE INDEX (idx_createtime_count_1) left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id left join logpm_distribution_parcel_list ldpls on ldpls.warehouse_id = lww.departure_warehouse_id and ldpls.order_package_code = ltad.order_package_code @@ -1496,7 +1500,7 @@ left join logpm_distribution_parcel_list ldplm on ldplm.warehouse_id = lww.destination_warehouse_id and ldplm.order_package_code = ltad.order_package_code left join logpm_trunkline_cars_load_scan ltclsm on ltclsm.scan_code = ldplm.order_package_code and ltclsm.unload_node_id = ldplm.warehouse_id left join logpm_trunkline_cars_load_line ltcllm on ltcllm.load_id = ltclsm.load_id and ltcllm.node_id = ltclsm.unload_node_id - left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.retention_time is null + left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.biz_status <= 100 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' diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/AdvanceOrderMqServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/AdvanceOrderMqServiceImpl.java index acbfa76d9..b3471012d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/AdvanceOrderMqServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/AdvanceOrderMqServiceImpl.java @@ -146,6 +146,7 @@ public class AdvanceOrderMqServiceImpl implements IAdvanceOrderMqService { if (StrUtil.isEmpty(advanceDetailEntity.getSendDateStr())) { advanceDetailEntity.setSendDateStr(DateUtil.today()); } + advanceDetailEntity.setWaybillNo(null); advanceDetailEntityList.add(advanceDetailEntity); JSONArray items = detail.getJSONArray("items"); if (CollUtil.isNotEmpty(items)) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java index 54ecc4fef..587407e88 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java @@ -135,7 +135,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { String driverMobile = carsLoadEntity.getDriverMobile(); String carsLineName = carsLoadEntity.getCarsLineName(); - String now = CommonUtil.dateToString(new Date()); + String now = CommonUtil.dateToStringGeneral(new Date()); TrunklineCarsLoadLogEntity carsLoadLogEntity = new TrunklineCarsLoadLogEntity(); carsLoadLogEntity.setNodeId(nodeId); carsLoadLogEntity.setNodeName(nodeName); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 24a37763c..a629c136d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -696,7 +696,11 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId); - String content = "包件在 " + warehouseId + "取消到车"; + String content = "包件在 " + warehouseName + "取消到车"; packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), workNode, content); } catch (Exception e) { log.warn("#############cancelArriveCarByLoadId: 存入日志失败"); From 255756b1f182a5614709f1527e8dee102fc945ca Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 19 Feb 2025 10:23:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BABUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/excel/DistributionDeliveryListExcel.java | 6 +----- .../distribution/mapper/DistributionDeliveryListMapper.xml | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index 553b0ff1a..3e00a059e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -41,15 +41,11 @@ public class DistributionDeliveryListExcel implements Serializable { private static final long serialVersionUID = 1L; - - - - private Long id; /** * 车次 */ @ColumnWidth(20) - @ExcelProperty("车次") + @ExcelProperty("车次号") private String trainNumber; /** * 车次 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 1fc1e9bbd..e04472b1c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -318,7 +318,6 @@