|
|
@@ -24,15 +24,18 @@
|
|
|
</select>
|
|
|
<select id="productDetailList" resultType="java.util.Map">
|
|
|
SELECT
|
|
|
- id as businessId,
|
|
|
- remark,
|
|
|
+ dg.id as businessId,
|
|
|
+ dg.remark,
|
|
|
null as subDescription,
|
|
|
null as customsCode,
|
|
|
- quantity,
|
|
|
+ dg.quantity,
|
|
|
+ pd.pack_quantity as packQuantity,
|
|
|
+ ( dg.quantity * pd.pack_quantity ) AS sumQuantity,
|
|
|
null as price,
|
|
|
10 as type
|
|
|
FROM
|
|
|
pack_detail_goods dg
|
|
|
+ LEFT JOIN pack_detail pd ON dg.pack_detail_id = pd.id
|
|
|
<where>
|
|
|
<include refid="productDetail"/>
|
|
|
</where>
|
|
|
@@ -43,10 +46,13 @@
|
|
|
dg.product_name AS subDescription,
|
|
|
pi.hs_code AS customsCode,
|
|
|
dg.quantity,
|
|
|
+ pd.pack_quantity as packQuantity,
|
|
|
+ ( dg.quantity * pd.pack_quantity ) AS sumQuantity,
|
|
|
cp.price AS price,
|
|
|
20 AS type
|
|
|
FROM
|
|
|
pack_detail_product dg
|
|
|
+ LEFT JOIN pack_detail pd ON dg.pack_detail_id = pd.id
|
|
|
LEFT JOIN product_info pi ON dg.product_id = pi.id
|
|
|
LEFT JOIN contract_product cp ON dg.contract_product_id = cp.id
|
|
|
<where>
|
yzc