|
|
@@ -26,10 +26,10 @@
|
|
|
tmgs.price_limited as "priceLimited",
|
|
|
tmgs.sku_images as "skuImages",
|
|
|
tpi.non_std_code as "nonStdCode",
|
|
|
- tpi.inv_qty as "invQty",
|
|
|
- tpi.outing_qty as "outingQty",
|
|
|
- tpi.usable_qty as "usableQty",
|
|
|
- tpi.freeze_qty as "freezeQty",
|
|
|
+ sys.f_remove_zero(tpi.inv_qty) as "invQty",
|
|
|
+ sys.f_remove_zero(tpi.outing_qty) as "outingQty",
|
|
|
+ sys.f_remove_zero(tpi.usable_qty) as "usableQty",
|
|
|
+ sys.f_remove_zero(tpi.freeze_qty) as "freezeQty",
|
|
|
tpi.wh_id as "whId",
|
|
|
tmw.wh_code as "whCode",
|
|
|
tmw.wh_name as "whName",
|
|
|
@@ -555,11 +555,11 @@
|
|
|
,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "purTypeName"
|
|
|
,tpp.contact_name as "contactName"
|
|
|
,tpp.contact_phone as "contactPhone"
|
|
|
- ,tpp.intoing_qty as "intoingQtySum"
|
|
|
+ ,sys.f_remove_zero(tpp.intoing_qty) as "intoingQtySum"
|
|
|
,tpp.intoing_amt as "intoingAmtSum"
|
|
|
- ,tpp.into_qty as "intoQtySum"
|
|
|
+ ,sys.f_remove_zero(tpp.into_qty) as "intoQtySum"
|
|
|
,tpp.into_amt as "intoAmtSum"
|
|
|
- ,tpp.return_qty as "returnInQtySum"
|
|
|
+ ,sys.f_remove_zero(tpp.return_qty) as "returnInQtySum"
|
|
|
,tpp.return_amt as "returnInAmtSum"
|
|
|
,tpp.amt_payable as "amtPayable"
|
|
|
,tpp.amt_residue as "amtResidue"
|
|
|
@@ -606,11 +606,11 @@
|
|
|
,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "purTypeName"
|
|
|
,tpp.contact_name as "contactName"
|
|
|
,tpp.contact_phone as "contactPhone"
|
|
|
- ,tpp.intoing_qty as "intoingQtySum"
|
|
|
+ ,sys.f_remove_zero(tpp.intoing_qty) as "intoingQtySum"
|
|
|
,tpp.intoing_amt as "intoingAmtSum"
|
|
|
- ,tpp.into_qty as "intoQtySum"
|
|
|
+ ,sys.f_remove_zero(tpp.into_qty) as "intoQtySum"
|
|
|
,tpp.into_amt as "intoAmtSum"
|
|
|
- ,tpp.return_qty as "returnQtySum"
|
|
|
+ ,sys.f_remove_zero(tpp.return_qty) as "returnQtySum"
|
|
|
,tpp.return_amt as "returnAmtSum"
|
|
|
,tpp.amt_payable as "amtPayable"
|
|
|
,tpp.amt_residue as "amtResidue"
|
|
|
@@ -628,14 +628,14 @@
|
|
|
,series.series_name as "seriesName"
|
|
|
, sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "intoStatus"
|
|
|
,tppi.price_pur as "pricePur"
|
|
|
- ,tppi.item_qty as "itemQty"
|
|
|
- ,concat(tppi.item_qty ,tmgu.unit_name) as "itemQtyPiece"
|
|
|
+ ,sys.f_remove_zero(tppi.item_qty) as "itemQty"
|
|
|
+ ,concat(sys.f_remove_zero(tppi.item_qty) ,tmgu.unit_name) as "itemQtyPiece"
|
|
|
,tppi.item_amt as "itemAmt"
|
|
|
- ,tppi.intoing_qty as "intoingQty"
|
|
|
+ ,sys.f_remove_zero(tppi.intoing_qty) as "intoingQty"
|
|
|
,tppi.intoing_amt as "intoingAmt"
|
|
|
- ,tppi.into_qty as "intoQty"
|
|
|
+ ,sys.f_remove_zero(tppi.into_qty) as "intoQty"
|
|
|
,tppi.into_amt as "intoAmt"
|
|
|
- ,tppi.return_qty as "returnQty"
|
|
|
+ ,sys.f_remove_zero(tppi.return_qty) as "returnQty"
|
|
|
,tppi.return_amt as "returnAmt"
|
|
|
,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tppi.box,tppi.piece) as "boxPiece"
|
|
|
FROM dkic_b.t_psi_purchase as tpp
|
|
|
@@ -702,7 +702,7 @@
|
|
|
t.sales_channel as "salesChannel",
|
|
|
tmsc.channel_name as "channelName",
|
|
|
t.delivery_date as "deliveryDate",
|
|
|
- t.sum_quantity as "sumQuantity",
|
|
|
+ sys.f_remove_zero(t.sum_quantity) as "sumQuantity",
|
|
|
t.sum_standard as "sumStandard",
|
|
|
t.sum_amount as "sumAmount",
|
|
|
t.sale_discount as "saleDiscount",
|
|
|
@@ -759,7 +759,7 @@
|
|
|
,t.sales_channel as "salesChannel"
|
|
|
,tmsc.channel_name as "channelName"
|
|
|
,t.delivery_date as "deliveryDate"
|
|
|
- ,t.sum_quantity as "sumQuantity"
|
|
|
+ ,sys.f_remove_zero(t.sum_quantity) as "sumQuantity"
|
|
|
,t.sum_standard as "sumStandard"
|
|
|
,t.sum_amount as "sumAmount"
|
|
|
,t.sale_discount as "saleDiscount"
|
|
|
@@ -780,19 +780,19 @@
|
|
|
,tmgc.cat_name as "catName"
|
|
|
,series.series_name as "seriesName"
|
|
|
,toi.price_std as "priceStd"
|
|
|
- ,toi.item_qty as "itemQty"
|
|
|
- ,concat(toi.item_qty ,tmgu.unit_name) as "itemQtyPiece"
|
|
|
+ ,sys.f_remove_zero(toi.item_qty) as "itemQty"
|
|
|
+ ,concat(sys.f_remove_zero(toi.item_qty) ,tmgu.unit_name) as "itemQtyPiece"
|
|
|
,toi.amt_std as "amtStd"
|
|
|
,toi.price_sale as "priceSale"
|
|
|
,toi.item_amt as "itemAmt"
|
|
|
,toi.price_discount as "priceDiscount"
|
|
|
,tpo.out_no as "outNo"
|
|
|
,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) AS "outStatusName"
|
|
|
- ,toi.outing_qty as "outingQty"
|
|
|
+ ,sys.f_remove_zero(toi.outing_qty) as "outingQty"
|
|
|
,toi.outing_amt as "outingAmt"
|
|
|
- ,toi.out_qty as "outQty"
|
|
|
+ ,sys.f_remove_zero(toi.out_qty) as "outQty"
|
|
|
,toi.out_amt as "outAmt"
|
|
|
- ,toi.return_qty as "returnQty"
|
|
|
+ ,sys.f_remove_zero(toi.return_qty) as "returnQty"
|
|
|
,toi.return_amt as "returnAmt"
|
|
|
,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,toi.box,toi.piece) as "boxPiece"
|
|
|
FROM dkic_b.t_psi_order as t
|
|
|
@@ -859,11 +859,11 @@
|
|
|
tmp.sup_name as "supplierName",
|
|
|
sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "outStatusName",
|
|
|
sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) as "outTypeName",
|
|
|
- t.outing_qty as "outingQtySum",
|
|
|
+ sys.f_remove_zero(t.outing_qty) as "outingQtySum",
|
|
|
t.outing_amt as "outingAmtSum",
|
|
|
- t.out_qty as "outQtySum",
|
|
|
+ sys.f_remove_zero(t.out_qty) as "outQtySum",
|
|
|
t.out_amt as "outAmtSum",
|
|
|
- t.return_qty as "returnOutQtySum",
|
|
|
+ sys.f_remove_zero(t.return_qty) as "returnOutQtySum",
|
|
|
t.return_amt as "returnOutAmtSum",
|
|
|
t.out_date as "outDate",
|
|
|
t.make_time as "makeTime",
|
|
|
@@ -916,11 +916,11 @@
|
|
|
,tmp.sup_name as "supplierName"
|
|
|
,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "outStatusName"
|
|
|
,sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) as "outTypeName"
|
|
|
- ,t.outing_qty as "outingQtySum"
|
|
|
+ ,sys.f_remove_zero(t.outing_qty) as "outingQtySum"
|
|
|
,t.outing_amt as "outingAmtSum"
|
|
|
- ,t.out_qty as "outQtySum"
|
|
|
+ ,sys.f_remove_zero(t.out_qty) as "outQtySum"
|
|
|
,t.out_amt as "outAmtSum"
|
|
|
- ,t.return_qty as "returnOutQtySum"
|
|
|
+ ,sys.f_remove_zero(t.return_qty) as "returnOutQtySum"
|
|
|
,t.return_amt as "returnOutAmtSum"
|
|
|
,t.out_date as "outDate"
|
|
|
,t.remarks
|
|
|
@@ -934,13 +934,13 @@
|
|
|
,tmw.wh_name as "whName"
|
|
|
,tmgc.cat_name as "catName"
|
|
|
,series.series_name as "seriesName"
|
|
|
- ,tpoi.outing_qty as "outingQty"
|
|
|
- ,concat(tpoi.outing_qty,tmgu.unit_name) as "outingQtyPiece"
|
|
|
+ ,sys.f_remove_zero(tpoi.outing_qty) as "outingQty"
|
|
|
+ ,concat(sys.f_remove_zero(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"
|
|
|
+ ,concat(sys.f_remove_zero(tpoi.out_qty),tmgu.unit_name) as "outQtyPiece"
|
|
|
+ ,sys.f_remove_zero(tpoi.out_qty) as "outQty"
|
|
|
,tpoi.out_amt as "outAmt"
|
|
|
- ,tpoi.return_qty as "returnQty"
|
|
|
+ ,sys.f_remove_zero(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"
|
|
|
@@ -1007,11 +1007,11 @@
|
|
|
tmp.sup_name as "supplierName",
|
|
|
sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName",
|
|
|
sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) as "intoTypeName",
|
|
|
- t.intoing_qty as "intoingQtySum",
|
|
|
+ sys.f_remove_zero(t.intoing_qty) as "intoingQtySum",
|
|
|
t.intoing_amt as "intoingAmtSum",
|
|
|
- t.into_qty as "intoQtySum",
|
|
|
+ sys.f_remove_zero(t.into_qty) as "intoQtySum",
|
|
|
t.into_amt as "intoAmtSum",
|
|
|
- t.return_qty as "returnintoQtySum",
|
|
|
+ sys.f_remove_zero(t.return_qty) as "returnintoQtySum",
|
|
|
t.return_amt as "returnintoAmtSum",
|
|
|
t.into_date as "intoDate",
|
|
|
tmw.wh_name as "whName",
|
|
|
@@ -1067,11 +1067,11 @@
|
|
|
,tmp.sup_name as "supplierName"
|
|
|
,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName"
|
|
|
,sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) as "intoTypeName"
|
|
|
- ,t.intoing_qty as "intoingQtySum"
|
|
|
+ ,sys.f_remove_zero(t.intoing_qty) as "intoingQtySum"
|
|
|
,t.intoing_amt as "intoingAmtSum"
|
|
|
- ,t.into_qty as "intoQtySum"
|
|
|
+ ,sys.f_remove_zero(t.into_qty) as "intoQtySum"
|
|
|
,t.into_amt as "intoAmtSum"
|
|
|
- ,t.return_qty as "returnInQtySum"
|
|
|
+ ,sys.f_remove_zero(t.return_qty) as "returnInQtySum"
|
|
|
,t.return_amt as "returnInAmtSum"
|
|
|
,t.into_date as "intoDate"
|
|
|
,t.remarks
|
|
|
@@ -1085,13 +1085,13 @@
|
|
|
,tmw.wh_name as "whName"
|
|
|
,tmgc.cat_name as "catName"
|
|
|
,series.series_name as "seriesName"
|
|
|
- ,tpoi.intoing_qty as "intoingQty"
|
|
|
- ,concat(tpoi.intoing_qty,tmgu.unit_name) as "intoingQtyPiece"
|
|
|
+ ,sys.f_remove_zero(tpoi.intoing_qty) as "intoingQty"
|
|
|
+ ,concat(sys.f_remove_zero(tpoi.intoing_qty),tmgu.unit_name) as "intoingQtyPiece"
|
|
|
,tpoi.intoing_amt as "intoingAmt"
|
|
|
- ,tpoi.into_qty as "intoQty"
|
|
|
- ,concat(tpoi.into_qty,tmgu.unit_name) as "intoQtyPiece"
|
|
|
+ ,sys.f_remove_zero(tpoi.into_qty) as "intoQty"
|
|
|
+ ,concat(sys.f_remove_zero(tpoi.into_qty),tmgu.unit_name) as "intoQtyPiece"
|
|
|
,tpoi.into_amt as "intoAmt"
|
|
|
- ,tpoi.return_qty as "returnQty"
|
|
|
+ ,sys.f_remove_zero(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"
|
|
|
@@ -1196,7 +1196,7 @@
|
|
|
,tpo.order_no AS "orderNo"
|
|
|
,tpo.order_type AS "orderType"
|
|
|
,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) AS "orderTypeName"
|
|
|
- ,tpo.sum_quantity AS "sumQuantity"
|
|
|
+ ,sys.f_remove_zero(tpo.sum_quantity) AS "sumQuantity"
|
|
|
,tpo.sum_amount AS "sumAmount"
|
|
|
,tpo.sum_standard AS "sumStandard"
|
|
|
,tpo.sale_discount AS "saleDiscount"
|
|
|
@@ -1204,11 +1204,11 @@
|
|
|
,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "orderStatusName"
|
|
|
,tpo.out_status AS "outStatus"
|
|
|
,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "outStatusName"
|
|
|
- ,tpo.outing_qty AS "outingQty"
|
|
|
+ ,sys.f_remove_zero(tpo.outing_qty) AS "outingQty"
|
|
|
,tpo.outing_amt AS "outingAmt"
|
|
|
- ,tpo.out_qty AS "outQty"
|
|
|
+ ,sys.f_remove_zero(tpo.out_qty) AS "outQty"
|
|
|
,tpo.out_amt AS "outAmt"
|
|
|
- ,tpo.return_qty AS "returnQty"
|
|
|
+ ,sys.f_remove_zero(tpo.return_qty) AS "returnQty"
|
|
|
,tpo.return_amt AS "returnAmt"
|
|
|
,tpo.amt_receivable AS "amtReceivable"
|
|
|
,tpo.amt_handle AS "amtHandle"
|
|
|
@@ -1298,11 +1298,11 @@
|
|
|
t.price_discount AS "priceDiscount",
|
|
|
t.non_std_code AS "nonStdCode",
|
|
|
t.out_status AS "outStatus",
|
|
|
- t.outing_qty AS "outingQty",
|
|
|
+ sys.f_remove_zero(t.outing_qty) AS "outingQty",
|
|
|
t.outing_amt AS "outingAmt",
|
|
|
- t.out_qty AS "outQty",
|
|
|
+ sys.f_remove_zero(t.out_qty) AS "outQty",
|
|
|
t.out_amt AS "outAmt",
|
|
|
- t.return_qty AS "returnQty",
|
|
|
+ sys.f_remove_zero(t.return_qty) AS "returnQty",
|
|
|
t.return_amt AS "returnAmt",
|
|
|
t.remarks,
|
|
|
t.wh_id AS "whId",
|
|
|
@@ -1456,12 +1456,12 @@
|
|
|
tmgs.sku_images AS "skuImages",
|
|
|
tmgb.brand_name AS "brandName",
|
|
|
tmgb.short_name AS "shortName",
|
|
|
- tpo.return_qty AS "returnQty",
|
|
|
- tpo.out_qty AS "outQty",
|
|
|
- tpo.outing_qty AS "outingQty",
|
|
|
+ sys.f_remove_zero(tpo.return_qty) AS "returnQty",
|
|
|
+ sys.f_remove_zero(tpo.out_qty) AS "outQty",
|
|
|
+ sys.f_remove_zero(tpo.outing_qty) AS "outingQty",
|
|
|
tpoi.price_sale AS "priceSale",
|
|
|
- tpoi.item_qty AS "itemQty",
|
|
|
- tpo.sum_quantity AS "sumQuantity",
|
|
|
+ sys.f_remove_zero(tpoi.item_qty) AS "itemQty",
|
|
|
+ sys.f_remove_zero(tpo.sum_quantity) AS "sumQuantity",
|
|
|
tpo.sum_amount AS "sumAmount",
|
|
|
0.00 AS "sumAmtRec",
|
|
|
0.00 AS "sumShouldHandle",
|
|
|
@@ -1491,14 +1491,14 @@
|
|
|
tmgs.sku_images AS "skuImages",
|
|
|
tmgb.brand_name AS "brandName",
|
|
|
tmgb.short_name AS "shortName",
|
|
|
- tpob.return_qty AS "returnQty",
|
|
|
- tpob.out_qty AS "outQty",
|
|
|
- tpob.outing_qty AS "outingQty",
|
|
|
+ sys.f_remove_zero(tpob.return_qty) AS "returnQty",
|
|
|
+ sys.f_remove_zero(tpob.out_qty) AS "outQty",
|
|
|
+ sys.f_remove_zero(tpob.outing_qty) AS "outingQty",
|
|
|
tpobi.price_out AS "priceSale",
|
|
|
CASE
|
|
|
|
|
|
WHEN tpobi.out_status = '出库状态-出库中' THEN
|
|
|
- tpobi.outing_qty ELSE tpobi.out_qty
|
|
|
+ sys.f_remove_zero(tpobi.outing_qty) ELSE sys.f_remove_zero(tpobi.out_qty)
|
|
|
END AS "itemQty",
|
|
|
0.00 AS "sumQuantity",
|
|
|
0.00 AS "sumAmount",
|
|
|
@@ -1529,14 +1529,14 @@
|
|
|
tmgs.sku_images AS "skuImages",
|
|
|
tmgb.brand_name AS "brandName",
|
|
|
tmgb.short_name AS "shortName",
|
|
|
- tpob.return_qty AS "returnQty",
|
|
|
- tpob.out_qty AS "outQty",
|
|
|
- tpob.outing_qty AS "outingQty",
|
|
|
+ sys.f_remove_zero(tpob.return_qty) AS "returnQty",
|
|
|
+ sys.f_remove_zero(tpob.out_qty) AS "outQty",
|
|
|
+ sys.f_remove_zero(tpob.outing_qty) AS "outingQty",
|
|
|
tpobi.price_out AS "priceSale",
|
|
|
CASE
|
|
|
|
|
|
WHEN tpobi.out_status = '出库状态-出库中' THEN
|
|
|
- tpobi.outing_qty ELSE tpobi.out_qty
|
|
|
+ sys.f_remove_zero(tpobi.outing_qty) ELSE sys.f_remove_zero(tpobi.out_qty)
|
|
|
END AS "itemQty",
|
|
|
0.00 AS "sumQuantity",
|
|
|
0.00 AS "sumAmount",
|
|
|
@@ -1605,7 +1605,7 @@
|
|
|
,tpp.contact_phone AS "contactPhone"
|
|
|
,tpp.wh_id AS "whId"
|
|
|
,tpp.pickup_date AS "pickupDate"
|
|
|
- ,tpp.sum_quantity AS "sumQuantity"
|
|
|
+ ,sys.f_remove_zero(tpp.sum_quantity) AS "sumQuantity"
|
|
|
,tpp.sum_standard AS "sumStandard"
|
|
|
,tpp.sum_amount AS "sumAmount"
|
|
|
,tpp.pur_discount AS "purDiscount"
|
|
|
@@ -1613,11 +1613,11 @@
|
|
|
,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "purStatusName"
|
|
|
,tpp.into_status AS "intoStatus"
|
|
|
,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "intoStatusName"
|
|
|
- ,tpp.intoing_qty AS "intoingQty"
|
|
|
+ ,sys.f_remove_zero(tpp.intoing_qty) AS "intoingQty"
|
|
|
,tpp.intoing_amt AS "intoingAmt"
|
|
|
- ,tpp.into_qty AS "intoQty"
|
|
|
+ ,sys.f_remove_zero(tpp.into_qty) AS "intoQty"
|
|
|
,tpp.into_amt AS "intoAmt"
|
|
|
- ,tpp.return_qty AS "returnQty"
|
|
|
+ ,sys.f_remove_zero(tpp.return_qty) AS "returnQty"
|
|
|
,tpp.return_amt AS "returnAmt"
|
|
|
,tpp.amt_payable AS "amtPayable"
|
|
|
,tpp.amt_handle AS "amtHandle"
|
|
|
@@ -1735,10 +1735,10 @@
|
|
|
,tpp.contact_phone AS "contactPhone"
|
|
|
,tpp.wh_id AS "whId"
|
|
|
,tpp.pickup_date AS "pickupDate"
|
|
|
- ,tpp.sum_quantity AS "sumQuantity"
|
|
|
+ ,sys.f_remove_zero(tpp.sum_quantity) AS "sumQuantity"
|
|
|
,tpp.sum_amount AS "sumAmount"
|
|
|
- ,tpp.into_qty AS "intoQty"
|
|
|
- ,tpp.return_qty AS "returnQty"
|
|
|
+ ,sys.f_remove_zero(tpp.into_qty) AS "intoQty"
|
|
|
+ ,sys.f_remove_zero(tpp.return_qty) AS "returnQty"
|
|
|
,0.00 AS "sumAmtRec"
|
|
|
,0.00 AS "sumShouldHandle"
|
|
|
,0.00 AS "sumUsePaymentResidue"
|
|
|
@@ -1753,7 +1753,7 @@
|
|
|
,tmgb.brand_name AS "brandName"
|
|
|
,tmgb.short_name AS "shortName"
|
|
|
,tppi.price_pur AS "pricePur"
|
|
|
- ,tppi.item_qty AS "itemQty"
|
|
|
+ ,sys.f_remove_zero(tppi.item_qty) AS "itemQty"
|
|
|
,tppi.remarks AS "remarks"
|
|
|
,tpp.make_time AS "makeTime"
|
|
|
FROM
|
|
|
@@ -1830,8 +1830,8 @@
|
|
|
,tmgb.short_name AS "shortName"
|
|
|
,tpii.price_into AS "pricePur"
|
|
|
, CASE
|
|
|
- WHEN tpii.into_status = '入库状态-入库中' THEN tpii.intoing_qty
|
|
|
- ELSE tpii.into_qty
|
|
|
+ WHEN tpii.into_status = '入库状态-入库中' THEN sys.f_remove_zero(tpii.intoing_qty)
|
|
|
+ ELSE sys.f_remove_zero(tpii.into_qty)
|
|
|
END AS "itemQty"
|
|
|
,tpii.remarks AS "remarks"
|
|
|
,tpi.make_time AS "makeTime"
|
|
|
@@ -2004,7 +2004,7 @@
|
|
|
T.sales_channel AS "salesChannel",
|
|
|
tmsc.channel_name AS "channelName",
|
|
|
T.delivery_date AS "deliveryDate",
|
|
|
- T.sum_quantity AS "sumQuantity",
|
|
|
+ sys.f_remove_zero(T.sum_quantity) AS "sumQuantity",
|
|
|
T.sum_standard AS "sumStandard",
|
|
|
T.sum_amount AS "sumAmount",
|
|
|
T.sale_discount AS "saleDiscount",
|
|
|
@@ -2012,11 +2012,11 @@
|
|
|
sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) AS "orderStatusName",
|
|
|
T.out_status AS "orderStatus",
|
|
|
sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) AS "outStatusName",
|
|
|
- T.outing_qty AS "outingQty",
|
|
|
+ sys.f_remove_zero(T.outing_qty) AS "outingQty",
|
|
|
T.outing_amt AS "outingAmt",
|
|
|
- T.out_qty AS "outQty",
|
|
|
+ sys.f_remove_zero(T.out_qty) AS "outQty",
|
|
|
T.out_amt AS "outAmt",
|
|
|
- T.return_qty AS "returnQty",
|
|
|
+ sys.f_remove_zero(T.return_qty) AS "returnQty",
|
|
|
T.return_amt AS "returnAmt",
|
|
|
T.amt_receivable AS "amtReceivable",
|
|
|
T.amt_handle AS "amtHandle",
|
|
|
@@ -2120,11 +2120,11 @@
|
|
|
T.out_status AS "outStatus",
|
|
|
sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) AS "outStatusName",
|
|
|
sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) AS "outTypeName",
|
|
|
- T.outing_qty AS "outingQty",
|
|
|
+ sys.f_remove_zero(T.outing_qty) AS "outingQty",
|
|
|
T.outing_amt AS "outingAmt",
|
|
|
- T.out_qty AS "outQty",
|
|
|
+ sys.f_remove_zero(T.out_qty) AS "outQty",
|
|
|
T.out_amt AS "outAmt",
|
|
|
- T.return_qty AS "returnQty",
|
|
|
+ sys.f_remove_zero(T.return_qty) AS "returnQty",
|
|
|
T.return_amt AS "returnAmt",
|
|
|
T.out_date AS "outDate",
|
|
|
T.remarks AS "remarks",
|
