调拨在途只要单号在完成流水出现就不参与计算

data-mid/mid-calculate-transit/src/main/java/com/bailuntec/mapper/DcMidTransitMapper.xml

@@ -603,11 +603,8 @@
                                  tb1.warehouse_code,
                                  sum(tb1.count) count
                           FROM dc_base_transfer_bale tb1
-                                   LEFT JOIN dc_base_transfer_complete tb2 ON tb1.deleted = tb2.deleted
-                              AND tb1.bailun_sku = tb2.bailun_sku
-                              AND tb1.warehouse_code = tb2.warehouse_code
-                              AND tb1.transfer_order_id = tb2.transfer_order_id
-                          WHERE tb2.bailun_sku IS NULL
+                                   LEFT JOIN dc_base_transfer_complete tb2 ON  tb1.transfer_order_id = tb2.transfer_order_id
+                          WHERE tb2.transfer_order_id IS NULL
                             AND tb1.deleted = 0
                           GROUP BY bailun_sku,
                                    warehouse_code
@@ -622,11 +619,8 @@
                                      max(tb1.count) count,
                                      tb1.transfer_order_id
                               FROM dc_base_transfer_inbound tb1
-                                       LEFT JOIN dc_base_transfer_complete tb2 ON tb2.deleted = 0
-                                  AND tb1.bailun_sku = tb2.bailun_sku
-                                  AND tb1.warehouse_code = tb2.warehouse_code
-                                  AND tb1.transfer_order_id = tb2.transfer_order_id
-                              WHERE tb2.bailun_sku IS NULL
+                                       LEFT JOIN dc_base_transfer_complete tb2 ON tb1.transfer_order_id = tb2.transfer_order_id
+                              WHERE tb2.transfer_order_id IS NULL
                                 AND tb1.deleted = 0
                               GROUP BY bailun_sku,
                                        warehouse_code,

data-show/show-auto-turnover/src/main/java/com/bailuntec/mapper/DcBaseTransferVerifyMapper.xml

@@ -628,10 +628,7 @@ FROM
 		sum( tb1.count ) count 
 	FROM
 		dc_base_transfer_bale tb1
-		LEFT JOIN dc_base_transfer_complete tb2 ON tb1.deleted = tb2.deleted 
-		AND tb1.bailun_sku = tb2.bailun_sku 
-		AND tb1.warehouse_code = tb2.warehouse_code 
-		AND tb1.transfer_order_id = tb2.transfer_order_id 
+		LEFT JOIN dc_base_transfer_complete tb2 ON  tb1.transfer_order_id = tb2.transfer_order_id
 	WHERE
 		tb2.bailun_sku IS NULL 
 		AND tb1.bailun_sku = #{bailunSku} 
@@ -652,10 +649,7 @@ FROM
 		sum( tb1.count ) count 
 	FROM
 		dc_base_transfer_verify tb1
-		LEFT JOIN dc_base_transfer_complete tb2 ON tb1.deleted = tb2.deleted 
-		AND tb1.bailun_sku = tb2.bailun_sku 
-		AND tb1.warehouse_code = tb2.warehouse_code 
-		AND tb1.transfer_order_id = tb2.transfer_order_id 
+		LEFT JOIN dc_base_transfer_complete tb2 ON  tb1.transfer_order_id = tb2.transfer_order_id
 	WHERE
 		tb2.bailun_sku IS NULL 
 		AND tb1.bailun_sku = #{bailunSku} 
@@ -683,10 +677,7 @@ FROM
 			tb1.transfer_order_id 
 		FROM
 			dc_base_transfer_inbound tb1
-			LEFT JOIN dc_base_transfer_complete tb2 ON tb2.deleted = 0 
-			AND tb1.bailun_sku = tb2.bailun_sku 
-			AND tb1.warehouse_code = tb2.warehouse_code 
-			AND tb1.transfer_order_id = tb2.transfer_order_id 
+			LEFT JOIN dc_base_transfer_complete tb2 ON tb1.transfer_order_id = tb2.transfer_order_id
 		WHERE
 			tb2.bailun_sku IS NULL 
 			AND tb1.bailun_sku = #{bailunSku} 
@@ -706,7 +697,7 @@ FROM
 	AND tb5.transfer_order_id = tb4.transfer_order_id 
 WHERE
 	( tb11.count - IFNULL( tb4.count, 0 ) ) > 0
-	union select  bailun_sku,warehouse_code,transfer_plan_order_id,null,update_time,count from  dc_base_transfer_plan where  status = 1 and deleted=0   AND  bailun_sku =  #{bailunSku}
+	union all select  bailun_sku,warehouse_code,transfer_plan_order_id,null,update_time,count from  dc_base_transfer_plan where  status = 1 and deleted=0   AND  bailun_sku =  #{bailunSku}
 		AND  warehouse_code = #{warehouseCode}
   </select>
 </mapper>
\ No newline at end of file