Commit 8933201b authored by lisong's avatar lisong

修改耗材报废管理统计bug

parent 05df5a18
...@@ -991,7 +991,7 @@ ...@@ -991,7 +991,7 @@
( (
SELECT SELECT
CONCAT( temp.NAME, '类' ) AS `name`, CONCAT( temp.NAME, '类' ) AS `name`,
SUM(temp.amount) AS `value`, FORMAT(IFNULL(SUM(temp.amount),0),0) AS `value`,
CODE CODE
FROM FROM
( (
...@@ -1079,7 +1079,7 @@ ...@@ -1079,7 +1079,7 @@
AND update_date LIKE CONCAT( DATE_FORMAT( CURRENT_DATE, '%Y-%m' ), '%' )) monthScrap, AND update_date LIKE CONCAT( DATE_FORMAT( CURRENT_DATE, '%Y-%m' ), '%' )) monthScrap,
( (
SELECT SELECT
SUM(sd.amount) FORMAT(IFNULL(SUM(sd.amount),0),0)
FROM FROM
wl_equipment_specific es wl_equipment_specific es
LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
...@@ -1106,7 +1106,7 @@ ...@@ -1106,7 +1106,7 @@
) scrap, ) scrap,
( (
SELECT SELECT
ifnull(SUM(sd.amount), 0) FORMAT(IFNULL(SUM(sd.amount),0),0)
FROM FROM
wl_equipment_specific es wl_equipment_specific es
LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
...@@ -1122,7 +1122,7 @@ ...@@ -1122,7 +1122,7 @@
AND 30 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )) oneImminent, AND 30 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )) oneImminent,
( (
SELECT SELECT
ifnull(SUM(sd.amount), 0) FORMAT(IFNULL(SUM(sd.amount),0),0)
FROM FROM
wl_equipment_specific es wl_equipment_specific es
LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
...@@ -1138,7 +1138,7 @@ ...@@ -1138,7 +1138,7 @@
AND 60 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )) twoImminent, AND 60 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )) twoImminent,
( (
SELECT SELECT
ifnull(SUM(sd.amount), 0) FORMAT(IFNULL(SUM(sd.amount),0),0)
FROM FROM
wl_equipment_specific es wl_equipment_specific es
LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment