diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml index 9911005e6..b7a2c8e60 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml @@ -866,6 +866,12 @@ op.name, op.model, op.spec, + op.brand, + op.factory, + op.color, + op.width, + op.length, + op.thickness, ob.name AS bodyName, ob.room_name AS roomName, ob.id AS bodyId, @@ -885,6 +891,7 @@ FROM order_item WHERE order_id = #{orderId} and parts_id != 0 and source_id = 0 + and ((group_id is null and comp_id is null) or group_id = 0) AND body_id IN