Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachineStatistics.java

@@ -22,6 +22,8 @@ public class PtsMachineStatistics implements Serializable{
 
     private String nodeDes;//工序选项描述
 
+    private String produceId;//产品id
+
     public String getYear() {
         return year;
     }
@@ -93,4 +95,12 @@ public class PtsMachineStatistics implements Serializable{
     public void setNodeDes(String nodeDes) {
         this.nodeDes = nodeDes;
     }
+
+    public String getProduceId() {
+        return produceId;
+    }
+
+    public void setProduceId(String produceId) {
+        this.produceId = produceId;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml

@@ -291,6 +291,7 @@
             tb_rst_pts_machine
         where YEAR (machine_produced_time) = #{year}
         AND machine_produce_type = #{machineType}
+        AND machine_produce_id = #{produceId}
         GROUP BY
             YEAR (machine_produced_time),
             MONTH (machine_produced_time)
@@ -334,6 +335,8 @@
         DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(machine_produced_time)
         and
         machine_produce_type = #{machineType}
+        and
+        machine_produce_id = #{produceId}
         GROUP BY DAY(machine_produced_time)
         UNION
         SELECT DAY (DATE_SUB(CURDATE(), INTERVAL 7 DAY)) AS day,date_format(DATE_SUB(CURDATE(), INTERVAL 7 DAY) ,'%m.%d' )  AS date,'0' as num FROM tb_rst_pts_machine
@@ -367,6 +370,7 @@
         FROM
             tb_rst_pts_machine
         where machine_produce_type = #{machineType}
+        and machine_produce_id = #{produceId}
     </select>
 
     <!--根据工序id统计生成机器时选项被选择的次数-->

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -308,7 +308,6 @@ public class AdminMachineController {
         Produce produce = new Produce();
         if (produceId == null || produceId.equals("")) {
             produce = produceService.getProduceByOne();//默认为第一个产品
-
         } else {
             produce.setProduceId(Integer.valueOf(produceId));
             produce = produceService.getProduce(produce);
@@ -320,6 +319,7 @@ public class AdminMachineController {
         String year = String.valueOf(date.get(Calendar.YEAR));//年
         ptsMachineStatistics.setYear(year);
         ptsMachineStatistics.setMachineType(produce.getProduceType());
+        ptsMachineStatistics.setProduceId(String.valueOf(produce.getProduceId()));
         //查询1-12月每月生产机器数
         List<PtsMachineStatistics> ptsMachineStatisticsList = machineService.monthStatistics(ptsMachineStatistics);
         if (ptsMachineStatisticsList.size() > 0) {