|
|
@@ -912,17 +912,22 @@
|
|
|
,makestaff.staff_name as "makeStaffName"
|
|
|
,tmgs.sku_name as "skuName"
|
|
|
,tmgs.sku_model as "skuModel"
|
|
|
+ ,tmgs.sku_spec as "skuSpec"
|
|
|
,tpi.non_std_code as "nonStdCode"
|
|
|
,tmgb.short_name as "shortName"
|
|
|
,tmgc.cat_name as "catName"
|
|
|
,series.series_name as "whName"
|
|
|
,tmw.wh_name as "seriesName"
|
|
|
,tpoi.outing_qty as "outingQty"
|
|
|
+ ,concat(tpoi.outing_qty,tmgu.unit_name) as "outingQtyPiece"
|
|
|
,tpoi.outing_amt as "outingAmt"
|
|
|
+ ,concat(tpoi.out_qty,tmgu.unit_name) as "outQtyPiece"
|
|
|
,tpoi.out_qty as "outQty"
|
|
|
,tpoi.out_amt as "outAmt"
|
|
|
,tpoi.return_qty as "returnQty"
|
|
|
,tpoi.return_amt as "returnAmt"
|
|
|
+ ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.outing_box,tpoi.outing_piece) as "outingBoxPiece"
|
|
|
+ ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.out_box,tpoi.out_piece) as "outBoxPiece"
|
|
|
FROM dkic_b.t_psi_outbound as t
|
|
|
left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
|
|
|
Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.sup_id
|
|
|
@@ -939,6 +944,8 @@
|
|
|
left join dkic_b.t_mst_goods_series as series on series.series_id = tmgs.series_id
|
|
|
left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
|
|
|
left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
|
|
|
+ left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
|
|
|
+ left join dkic_b.t_mst_unit as tmgus on tmgs.sub_unit_id = tmgus.unit_id
|
|
|
<include refid="Condition_OutboundDetailReport"/>
|
|
|
order by tpoi.op_create_time desc
|
|
|
<if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
|
|
|
@@ -1065,6 +1072,8 @@
|
|
|
,tpoi.into_amt as "intoAmt"
|
|
|
,tpoi.return_qty as "returnQty"
|
|
|
,tpoi.return_amt as "returnAmt"
|
|
|
+ ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.intoing_box,tpoi.intoing_piece) as "intoingBoxPiece"
|
|
|
+ ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.into_box,tpoi.into_piece) as "intoBoxPiece"
|
|
|
FROM dkic_b.t_psi_inbound as t
|
|
|
left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
|
|
|
Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.sup_id
|
|
|
@@ -1080,6 +1089,8 @@
|
|
|
left join dkic_b.t_mst_goods_category as tmgc on tmgc.cat_id = tmgs.category_id
|
|
|
left join dkic_b.t_mst_goods_series as series on series.series_id = tmgs.series_id
|
|
|
left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
|
|
|
+ left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
|
|
|
+ left join dkic_b.t_mst_unit as tmgus on tmgs.sub_unit_id = tmgus.unit_id
|
|
|
<include refid="Condition_IntoboundDetailReport"/>
|
|
|
order by tpoi.op_create_time desc
|
|
|
<if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
|
