Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -283,7 +283,9 @@ public class AndonManageQueue extends BaseBean {
     /**
      * 原因统计 使用Java内存计算（获取原始数据）
      * @param workCenterCode
+     * @param workCenterNameRdd
      * @param workCellCode
+     * @param workCellNameRdd
      * @param alarmCode
      * @param ecCode
      * @param ecNameRdd
@@ -293,9 +295,11 @@ public class AndonManageQueue extends BaseBean {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String workCenterCode,String workCellCode,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
+    public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
         this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
         this.workCellCode = workCellCode;
+        this.workCellNameRdd = workCellNameRdd;
         this.alarmCode = alarmCode;
         this.ecCode = ecCode;
         this.ecNameRdd = ecNameRdd;