From 52182cf53e8efcc757b150439989fff0ba40afda Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 15 Oct 2024 15:33:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=88=A0=E9=99=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2sql=E7=A7=8D=E7=BB=91=E5=AE=9A=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockupMapper.xml | 32 +++++++++---------- .../logpm/report/mapper/BillDataMapper.xml | 2 +- .../logpm/report/mapper/IndexCountMapper.xml | 6 ++-- .../TrunklineBillladingWaybillMapper.xml | 4 +-- .../mapper/WarehouseRetentionRecordMapper.xml | 2 +- .../warehouse/mapper/WarehouseStockMapper.xml | 2 +- .../mapper/WarehouseUpdownGoodsLogMapper.xml | 22 ++++++------- .../WarehouseWarehousingEntryMapper.xml | 6 ++-- 8 files changed, 38 insertions(+), 38 deletions(-) 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 b5117f1fc..f176246a6 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 @@ -1153,11 +1153,11 @@ lds.stockup_code stockupCode, COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') stockipAllocation, COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet - from logpm_platform.logpm_distribution_stockup lds - LEFT JOIN logpm_platform.logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id - LEFT JOIN logpm_platform.logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id - LEFT JOIN logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id - LEFT JOIN logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id + from logpm_distribution_stockup lds + LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id + LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id + LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id lds.is_deleted = 0 and lds.type_service = #{paramMap.typeService} @@ -1203,12 +1203,12 @@ COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee, COALESCE ( group_concat( DISTINCT ldr.delivery_address SEPARATOR ',' ), '' ) AS deliveryAddress, (SELECT GROUP_CONCAT(ldsa.order_code) FROM logpm_distribution_reservation_stockarticle AS ldrs LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id WHERE ldrs.reservation_id = ldr.id GROUP BY ldrs.reservation_id) As orderCodes - from logpm_platform.logpm_distribution_stockup lds - LEFT JOIN logpm_platform.logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id + from logpm_distribution_stockup lds + LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id LEFT JOIN logpm_distribution_reservation AS ldr ON ldsi.reservation_id = ldr.id - LEFT JOIN logpm_platform.logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id - LEFT JOIN logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id - LEFT JOIN logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id + LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id + LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id lds.is_deleted = 0 and lds.type_service = #{paramMap.typeService} @@ -1246,12 +1246,12 @@ lds.stockup_code stockupCode, COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') stockipAllocation, COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet - from logpm_platform.logpm_distribution_stockup lds - LEFT JOIN logpm_platform.logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id - LEFT JOIN logpm_platform.logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id - LEFT JOIN logpm_platform.logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id - LEFT JOIN logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id - LEFT JOIN logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id + from logpm_distribution_stockup lds + LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id + LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id + LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id + LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id lds.is_deleted = 0 and lds.type_service = #{paramMap.typeService} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml index 31b2c024b..c91ea0c62 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml @@ -6,7 +6,7 @@ - select count(*) count,b.type_service as typeService from logpm_platform.logpm_distribution_parcel_list as a - inner join logpm_platform.logpm_distribution_stock_article as b on a.stock_article_id = b.id + select count(*) count,b.type_service as typeService from logpm_distribution_parcel_list as a + inner join logpm_distribution_stock_article as b on a.stock_article_id = b.id where a.create_time > MONTH(CURRENT_DATE()) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml index dd552b2ca..4c424be0a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml @@ -51,7 +51,7 @@ left join (select IFNULL(ltad.waybill_no,'————') waybillNo, COUNT(ltbp.id) num from logpm_trunkline_billlading_package ltbp - left join logpm_platform.logpm_trunkline_advance_detail ltad on ltbp.order_package_code = ltad.order_package_code + left join logpm_trunkline_advance_detail ltad on ltbp.order_package_code = ltad.order_package_code where ltbp.billlading_id=#{billladingId} group by IFNULL(ltad.waybill_no,'————')) t on t.waybillNo = ltbw.waybill_no left join logpm_trunkline_billlading ltb on ltb.id = ltbw.billlading_id @@ -140,7 +140,7 @@ left join (select IFNULL(ltad.waybill_no,'————') waybillNo, COUNT(ltbp.id) num from logpm_trunkline_billlading_package ltbp - left join logpm_platform.logpm_trunkline_advance_detail ltad on ltbp.order_package_code = ltad.order_package_code + left join logpm_trunkline_advance_detail ltad on ltbp.order_package_code = ltad.order_package_code where ltbp.billlading_id=#{billladingId} group by IFNULL(ltad.waybill_no,'————')) t on t.waybillNo = ltbw.waybill_no left join logpm_trunkline_billlading ltb on ltb.id = ltbw.billlading_id diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml index 819440f90..a93663d94 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml @@ -91,7 +91,7 @@ remark, cancel_retention_user_name, cancel_remark - from logpm_platform.logpm_warehouse_retention_record lwrr + from logpm_warehouse_retention_record lwrr lwrr.is_deleted = 0