|
|
@ -53,6 +53,7 @@
|
|
|
|
<result column="order_main_unit_name" property="orderMainUnitName"/>
|
|
|
|
<result column="order_main_unit_name" property="orderMainUnitName"/>
|
|
|
|
<result column="sales_main_unit_id" property="salesMainUnitId"/>
|
|
|
|
<result column="sales_main_unit_id" property="salesMainUnitId"/>
|
|
|
|
<result column="sales_main_unit_name" property="salesMainUnitName"/>
|
|
|
|
<result column="sales_main_unit_name" property="salesMainUnitName"/>
|
|
|
|
|
|
|
|
<result column="business_line_id_arr" property="businessLineIdArr"/>
|
|
|
|
<result column="input_tax_rate" property="inputTaxRate"/>
|
|
|
|
<result column="input_tax_rate" property="inputTaxRate"/>
|
|
|
|
<result column="output_tax_rate" property="outputTaxRate"/>
|
|
|
|
<result column="output_tax_rate" property="outputTaxRate"/>
|
|
|
|
<result column="productId" property="productId"/>
|
|
|
|
<result column="productId" property="productId"/>
|
|
|
@ -71,8 +72,12 @@
|
|
|
|
a.order_main_unit_id, JgFnUnitArrName(a.order_main_unit_id) as order_main_unit_name,
|
|
|
|
a.order_main_unit_id, JgFnUnitArrName(a.order_main_unit_id) as order_main_unit_name,
|
|
|
|
a.sales_main_unit_id, JgFnUnitArrName(a.sales_main_unit_id) as sales_main_unit_name,
|
|
|
|
a.sales_main_unit_id, JgFnUnitArrName(a.sales_main_unit_id) as sales_main_unit_name,
|
|
|
|
a.input_tax_rate,
|
|
|
|
a.input_tax_rate,
|
|
|
|
a.output_tax_rate
|
|
|
|
a.output_tax_rate,
|
|
|
|
FROM jg_product a ${ew.customSqlSegment}
|
|
|
|
b.business_line_id as business_line_id_arr
|
|
|
|
|
|
|
|
FROM jg_product a LEFT JOIN jg_product_business b ON a.id = b.product_id ${ew.customSqlSegment}
|
|
|
|
|
|
|
|
<if test="productWarehousePagination.businessLineIdArr != null and productWarehousePagination.businessLineIdArr != ''">
|
|
|
|
|
|
|
|
WHERE b.business_line_id like CONCAT('%',${productWarehousePagination.businessLineIdArr},'%')
|
|
|
|
|
|
|
|
</if>
|
|
|
|
<if test="productWarehousePagination.sidx != null and productWarehousePagination.sidx != ''">
|
|
|
|
<if test="productWarehousePagination.sidx != null and productWarehousePagination.sidx != ''">
|
|
|
|
ORDER BY ${productWarehousePagination.sidx} ${productWarehousePagination.sort}
|
|
|
|
ORDER BY ${productWarehousePagination.sidx} ${productWarehousePagination.sort}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|