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