生产装备汇总

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceInputController.java

@@ -200,8 +200,8 @@ public class StorageDeviceInputController {
     			int sumCounts = Integer.valueOf(a);
     			
     			//使用数量
-    			int useCounts = sumCounts-Integer.parseInt(map.get("userCounts").toString());
-    			
+    			int useCounts = sumCounts-(Integer.parseInt(map.get("userCounts").toString())+Integer.parseInt(map.get("brokenCount").toString()));
+    			System.out.println("****"+Integer.parseInt(map.get("brokenCount").toString()));
     			sumCount = sumCount + sumCounts+",";
     			useCount = useCount + useCounts+",";
     			

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -673,9 +673,17 @@
   <!-- 每个类型的入库数量 -->
   <select id="queryCountByType"  resultType="java.util.Map">
 
-    select SUM(use_count) userCounts,sum(device_manager)sumCounts,device_type from storage_deviceinput 
-    GROUP BY device_type 
-    order by device_type asc
+    SELECT
+		SUM(use_count) userCounts,
+		sum(device_manager) sumCounts,
+		IFNULL(SUM(broken_count), 0) brokenCount,
+		device_type
+    FROM
+	    storage_deviceinput
+    GROUP BY
+	    device_type
+    ORDER BY
+	    device_type ASC
     
   </select>