|
|
|
@ -12,8 +12,8 @@
|
|
|
|
|
basic_products.measname,
|
|
|
|
|
basic_products.manufactory
|
|
|
|
|
FROM inv_inner_order_detail
|
|
|
|
|
INNER JOIN basic_udirel on inv_inner_order_detail.productId = basic_udirel.id
|
|
|
|
|
INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
|
|
|
|
|
left JOIN basic_udirel on inv_inner_order_detail.productId = basic_udirel.id
|
|
|
|
|
left JOIN basic_products on basic_udirel.uuid = basic_products.uuid
|
|
|
|
|
<where>
|
|
|
|
|
<if test="orderIdFk != '' and orderIdFk != null">
|
|
|
|
|
AND orderIdFk = #{orderIdFk}
|
|
|
|
@ -22,7 +22,7 @@
|
|
|
|
|
AND productId = #{productId}
|
|
|
|
|
</if>
|
|
|
|
|
</where>
|
|
|
|
|
GROUP BY basic_products.uuid
|
|
|
|
|
group by inv_inner_order_detail.id
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<insert id="insert" keyProperty="id"
|
|
|
|
@ -107,6 +107,9 @@
|
|
|
|
|
<if test="batchNo != '' and batchNo != null">
|
|
|
|
|
AND batchNo = #{batchNo}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="batchNo == '' or batchNo == null">
|
|
|
|
|
AND (batchNo is null or batchNo = '')
|
|
|
|
|
</if>
|
|
|
|
|
</where>
|
|
|
|
|
|
|
|
|
|
</select>
|
|
|
|
|