修改 待 字

product
bawei 1 year ago
parent 5a6202a6ce
commit bdce31fd12

@ -851,6 +851,7 @@
</resultMap>
<select id="getPurchaseorderData" resultMap="getPurchaseorderDataMap">
SET @i = 0;
SELECT
( @i := @i + 1 ) AS Number,
@ -863,12 +864,13 @@ SELECT
IFNULL(
ROUND(
SUM( purchase_price ) / COUNT( id ) * SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
6
2
),
0
) amout,-- IF(is_pay=1,0,ROUND( SUM( purchase_price ) /COUNT( id ) * SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ) , 6 ) ) AS notPaypalAmounts,
) amout,
notPaypalAmounts,
SUM( paypal_amounts ) paypalamounts
-- SUM( paypal_amounts ) paypalamountsss,
ROUND(paypalamounts,2) AS paypalamounts
FROM
jg_poundlist a
LEFT JOIN base_organize z ON a.department_id = z.F_Id
@ -880,13 +882,24 @@ FROM
0,
ROUND(
SUM( purchase_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END ),
6
2
)
) AS notPaypalAmounts,
IF
(
is_pay = 0,
0,
ROUND(
SUM( purchase_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END ),
6
)
) AS paypalamounts,
department_id AS cid
FROM
jg_poundlist
WHERE
to_days( pound_date ) = to_days(
now())
GROUP BY
@ -921,12 +934,12 @@ SELECT
IFNULL(
ROUND(
SUM( sales_price ) / COUNT( id ) * SUM( CASE a.unit WHEN '0' THEN a.settlement WHEN '1' THEN a.settlement / 1000 END ),
6
2
),
0
) amout,
notCollectionAmounts,
SUM( collection_amounts ) collectionamounts
collectionamounts
FROM
jg_poundlist a
LEFT JOIN base_organize z ON a.department_id = z.F_Id
@ -938,9 +951,18 @@ FROM
0,
ROUND(
SUM( sales_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END )-paypal_amounts,
6
2
)
) AS notCollectionAmounts,
IF
(
is_collection = 0,
0,
ROUND(
SUM( sales_price ) / COUNT( id ) * SUM( CASE unit WHEN '0' THEN settlement WHEN '1' THEN settlement / 1000 END )-paypal_amounts,
2
)
) AS collectionamounts,
department_id AS cid
FROM
jg_poundlist

@ -16,7 +16,7 @@
<el-table-column prop="settlement" label="吨位(吨)">
</el-table-column>
<el-table-column prop="amout" label="总额"> </el-table-column>
<el-table-column prop="notPaypalAmounts" label="付款总额">
<el-table-column prop="notPaypalAmounts" label="付款总额">
</el-table-column>
<el-table-column prop="paypalamounts" label="已付款总额">
</el-table-column>

Loading…
Cancel
Save