|
|
@@ -628,7 +628,7 @@
|
|
|
,tmgb.short_name as "shortName"
|
|
|
,tmgc.cat_name as "catName"
|
|
|
,series.series_name as "seriesName"
|
|
|
- , sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatus"
|
|
|
+ , sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "intoStatus"
|
|
|
,tppi.price_pur as "pricePur"
|
|
|
,tppi.item_qty as "itemQty"
|
|
|
,tppi.item_amt as "itemAmt"
|
|
|
@@ -654,7 +654,7 @@
|
|
|
left join dkic_b.t_psi_order as tpo on tpo.order_id = tppi.from_id
|
|
|
left join dkic_b.t_psi_inbound_item as ibi on ibi.from_item_id=tppi.item_id
|
|
|
left join dkic_b.t_psi_inbound as ib on ibi.into_id=ib.into_id
|
|
|
- left join sys.t_data_kind tdk1 on tdk1.kind_code = tppi.into_status
|
|
|
+ left join sys.t_data_kind tdk3 on tdk3.kind_code = tppi.into_status
|
|
|
<include refid="Condition_PurDetailReport"/>
|
|
|
order by tpp.op_create_time desc
|
|
|
<if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
|