|
@@ -1470,6 +1470,7 @@
|
|
AND cror.splitStatus = 0
|
|
AND cror.splitStatus = 0
|
|
AND a.receiptStatus = 3
|
|
AND a.receiptStatus = 3
|
|
AND a.splitCode != 'E1807059160'
|
|
AND a.splitCode != 'E1807059160'
|
|
|
|
+ AND a.splitCode != 'E1808689662'
|
|
AND co.orderID NOT IN (SELECT orderID
|
|
AND co.orderID NOT IN (SELECT orderID
|
|
FROM cm_order_product
|
|
FROM cm_order_product
|
|
WHERE productID IN
|
|
WHERE productID IN
|
|
@@ -1619,6 +1620,7 @@
|
|
AND cror.mbOrderId IS NOT NULL
|
|
AND cror.mbOrderId IS NOT NULL
|
|
AND cror.splitStatus = 1
|
|
AND cror.splitStatus = 1
|
|
AND a.splitCode != 'E1807059160'
|
|
AND a.splitCode != 'E1807059160'
|
|
|
|
+ AND a.splitCode != 'E1808689662'
|
|
<if test="startTime != null and startTime != ''">
|
|
<if test="startTime != null and startTime != ''">
|
|
AND (a.orderTime > #{startTime} OR a.orderTime = #{startTime})
|
|
AND (a.orderTime > #{startTime} OR a.orderTime = #{startTime})
|
|
</if>
|
|
</if>
|