Merge remote-tracking branch 'origin/master'

data-common/src/main/java/com/bailuntec/mapper/DcMidTransitMapper.xml

@@ -631,7 +631,7 @@
                     SELECT
                         t1.bailun_sku,
                         t1.warehouse_code,
-                        t2.count,
+                        (case  WHEN t2.count > tbb.count then tbb.count else t2.count end) as count,
                         t1.transfer_order_id
                     FROM
                         ( SELECT max( create_time ) AS create_time, bailun_sku, warehouse_code, transfer_order_id FROM dc_base_transfer_inbound WHERE deleted = 0 GROUP BY bailun_sku, warehouse_code, transfer_order_id ) t1
@@ -639,6 +639,7 @@
                         AND t1.warehouse_code = t2.warehouse_code
                         AND t1.transfer_order_id = t2.transfer_order_id
                         AND t1.create_time = t2.create_time
+                        LEFT JOIN dc_base_transfer_bale tbb on t1.bailun_sku = tbb.bailun_sku and t1.warehouse_code = tbb.warehouse_code and t1.transfer_order_id = tbb.transfer_order_id
                         LEFT JOIN dc_base_transfer_complete tb2 ON t1.transfer_order_id = tb2.transfer_order_id
                     WHERE
                         tb2.bailun_sku IS NULL