diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index d1165b77..f9333981 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -575,6 +575,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl map1 = reportList.get(i); - settlementSum = settlementSum.add(map1.get("settlement") != null ? (BigDecimal) map1.get("settlement") : decimal); + settlementSum = settlementSum.add(map1.get("settlement") != null ? (BigDecimal) map1.get("settlement") : decimalsettlement); amountSum = amountSum.add(map1.get("amount") != null ? (BigDecimal) map1.get("amount") : decimal); } map.put("settlementSum", settlementSum); diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index c15b3e29..2cd19c42 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -130,21 +130,21 @@ END ) AS `rate`, ROUND(IFNULL( SUM(d.amount)/SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ),0), 6 ) AS `price`, - ROUND( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ), 2 ) AS `settlement`, + ROUND( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ), 3 ) AS `settlement`, ( CASE b.unit WHEN 0 THEN '吨' ELSE '千克' END ) AS `unit`, ROUND( a.amount, 2 ) `amount` FROM jg_purchaseorder AS a LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id - AND d.delete_mark = '0' + LEFT JOIN jg_poundlist b ON b.id = d.poundlist_id - AND b.delete_mark = '0' + LEFT JOIN jg_material c ON b.material_id = c.id - AND c.delete_mark = '0' + LEFT JOIN jg_contract e ON a.contract_code = e.id - AND e.delete_mark = '0' + WHERE - a.delete_mark = '0' + a.delete_mark = '0' AND d.delete_mark = '0' AND b.delete_mark = '0' AND c.delete_mark = '0' AND e.delete_mark = '0' GROUP BY a.id, b.material_id, @@ -186,7 +186,7 @@ END ) AS `rate`, ROUND(IFNULL( SUM(d.amount)/SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ),0), 6 ) AS `price`, - ROUND( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ), 2 ) AS `settlement`, + ROUND( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ), 3 ) AS `settlement`, ( CASE b.unit WHEN 0 THEN '吨' ELSE '千克' END ) AS `unit`, ROUND( a.amount, 2 ) `amount` FROM @@ -225,7 +225,7 @@ ( SELECT a.DOCUMENT_NO, - ROUND( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ), 2 ) AS `settlement` + ROUND( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END ), 3 ) AS `settlement` FROM jg_purchaseorder AS a LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id @@ -295,7 +295,7 @@ ROUND( c.gross_weight, 2 ) grossWeight, ROUND( c.tare_weight, 2 ) tareWeight, ROUND( c.buckle_weight, 2 ) buckleWeight, - ROUND( c.settlement, 2 ) settlement, + ROUND( c.settlement, 3 ) settlement, ROUND( c.purchase_price, 2 ) purchasePrice, ( CASE c.unit WHEN 0 THEN '吨' ELSE '千克' END ) AS `unit`, ROUND( IFNULL(c.settlement*c.purchase_price,0), 2 ) purchaseAmount