包件明细维护托盘、库位字段

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -96,13 +96,17 @@
         IF(c.scan_user is not null,c.scan_user,IF(b.scan_user is not null,b.scan_user,a.scan_user)) AS scanUser,
         IF(c.signing_user is not null,c.signing_user,IF(b.signing_user is not null,b.signing_user,a.signing_user)) AS signingUser,
         IF(c.scan_time is not null,c.scan_time,IF(b.scan_time is not null,b.scan_time,a.scan_time)) AS loadingTime,
-        IF(c.signing_time is not null,c.signing_time,IF(b.signing_time is not null,b.signing_time,a.signing_time)) AS signingTime
+        IF(c.signing_time is not null,c.signing_time,IF(b.signing_time is not null,b.signing_time,a.signing_time)) AS signingTime,
+        m.qr_code AS goodsAllocation,
+        n.pallet_name AS pallet
         FROM
         logpm_distribution_parcel_list AS ldpl
         LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg ON ldpl.id = lwtg.association_id
         LEFT join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
         LEFT join logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id
+        LEFT JOIN (SELECT lwug.association_id,lwga.qr_code,lwug.is_deleted FROM logpm_warehouse_updown_goods AS lwug LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwug.allocation_id = lwga.id ) AS m ON m.association_id = ldpl.id
+        LEFT JOIN (SELECT lwtg.association_id,lwt.pallet_name,lwug.is_deleted.is_deleted FROM logpm_warehouse_tray_goods AS lwtg LEFT JOIN logpm_warehouse_tray AS lwt ON lwtg.tray_id = lwt.id) AS n ON n.association_id = ldpl.id
         LEFT JOIN
         (SELECT
         ldrp.parce_list_id,
@@ -211,14 +215,18 @@
         LEFT JOIN logpm_distribution_delivery_list lddl on  lds.delivery_id =lddl.id
         LEFT JOIN logpm_distrilbution_bill_lading ldbl ON ldrzp.reservation_id = ldbl.id
         LEFT JOIN logpm_distribution_bill_lading_scan ldbls ON ldbls.parcel_list_id = ldrzp.parcel_list_id
-        <where>
-        </where>
         ) AS c ON c.parcel_list_id = ldpl.id
         <where>
-            ldpl.is_deleted = 0
+            ldpl.is_deleted = 0 AND m.is_deleted = 0 AND n.is_deleted = 0
             <if test="param.warehouse !='' and param.warehouse != null">
                 and lww.name like concat('%',#{param.warehouse},'%')
             </if>
+            <if test="param.pallet !='' and param.pallet != null">
+                and n.pallet_name like concat('%',#{param.warehouse},'%')
+            </if>
+            <if test="param.goodsAllocation !='' and param.goodsAllocation != null">
+                and m.qr_code like concat('%',#{param.warehouse},'%')
+            </if>
            <if test="param.orderPackageGroundingStatus !='' and param.orderPackageGroundingStatus != null">
                 and ldpl.order_package_grounding_status = #{param.orderPackageGroundingStatus}
             </if>