Merge remote-tracking branch 'origin/dev' into dev

3 months ago · c4473b1daf
8 changed files with 38 additions and 38 deletions
--- 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
        <where>
            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
        <where>
            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
        <where>
            lds.is_deleted = 0
            and lds.type_service = #{paramMap.typeService}
--- 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 id="billCount" resultType="java.lang.Integer">
        select count(*) billCount
         from
-             logpm_platform.logpm_warehouse_waybill
+             logpm_warehouse_waybill
        where  freeze_status = 0
        <where>
            <if test="item != null">
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/IndexCountMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/IndexCountMapper.xml
@ -5,7 +5,7 @@
        select
            count(*)
        FROM
-            logpm_platform.logpm_aftersales_work_order
+            logpm_aftersales_work_order
        where
            create_time > MONTH(CURRENT_DATE())
    </sql>
@ -24,8 +24,8 @@
        </if>
    </select>
    <sql id="boundQuantity">
-        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())
        <if test="warehouseId != null">
--- 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
--- 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
        <where>
            lwrr.is_deleted = 0
            <!--
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
@ -705,7 +705,7 @@

    </select>
    <select id="exportWarehouseStock" resultType="com.logpm.warehouse.excel.WarehouseStockExcel">
-        select distinct * from logpm_platform.view_scan_record vsr
+        select distinct * from view_scan_record vsr
        <where>
            vsr.is_deleted = 0
            <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsLogMapper.xml
@ -178,9 +178,9 @@
        lwtg.tray_code palletCode,
        ldpl.warehouse logWarehouseName,
        lwup.create_time createTime
-        FROM logpm_platform.logpm_warehouse_updown_goods_log lwup
-        join logpm_platform.logpm_distribution_parcel_list ldpl on ldpl.id = lwup.association_id
-        left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwup.association_id
+        FROM logpm_warehouse_updown_goods_log lwup
+        join logpm_distribution_parcel_list ldpl on ldpl.id = lwup.association_id
+        left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwup.association_id
        <where>
            lwup.is_deleted = 0
            <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
@ -224,10 +224,10 @@
               lwup.create_user createUser,
               lwup.create_time createTime,
               lww.name logWarehouseName
-        FROM logpm_platform.logpm_warehouse_updown_goods_log lwup
-        join logpm_platform.logpm_basicdata_material lbm on lbm.id = lwup.association_id
-        left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwup.association_id
-        left join logpm_platform.logpm_warehouse_warehouse lww on lwup.warehouse_id = lww.id
+        FROM logpm_warehouse_updown_goods_log lwup
+        join logpm_basicdata_material lbm on lbm.id = lwup.association_id
+        left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwup.association_id
+        left join logpm_warehouse_warehouse lww on lwup.warehouse_id = lww.id
        <where>
            lwup.is_deleted = 0
            <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
@ -257,10 +257,10 @@
               lwup.create_user      createUserName,
               lwup.create_time      createTime,
               lww.name              logWarehouseName
-        FROM logpm_platform.logpm_warehouse_updown_goods_log lwup
-        join logpm_platform.logpm_distribution_stock_article ldsa on ldsa.id = lwup.association_id
-        left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwup.association_id
-        left join logpm_platform.logpm_warehouse_warehouse lww on lwup.warehouse_id = lww.id
+        FROM logpm_warehouse_updown_goods_log lwup
+        join logpm_distribution_stock_article ldsa on ldsa.id = lwup.association_id
+        left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = lwup.association_id
+        left join logpm_warehouse_warehouse lww on lwup.warehouse_id = lww.id
        <where>
            lwup.is_deleted = 0
            <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWarehousingEntryMapper.xml
@ -60,7 +60,7 @@
               license_plate,
               service_type,
               conditions
-        from logpm_platform.logpm_warehouse_warehousing_entry lwwe
+        from logpm_warehouse_warehousing_entry lwwe
        <where>
            <if test="paramMap.orderNumber !=null and paramMap.orderNumber != ''">
                and lwwe.order_number = #{paramMap.orderNumber}
@ -80,8 +80,8 @@
            <if test="paramMap.conditions !=null and paramMap.conditions != ''">
                and lwwe.conditions = #{paramMap.conditions}
            </if>
-            <if test="paramMap.warehouse !=null and paramMap.warehouse != ''">
-                and lwwe.warehouse = #{paramMap.warehouse}
+            <if test="paramMap.warehouseId !=null ">
+                and lwwe.warehouse_id = #{paramMap.warehouseId}
            </if>
            <if test="paramMap.customerName !=null and paramMap.customerName != ''">
                and lwwe.customer_name = #{paramMap.customerName}