Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java

@@ -33,4 +33,10 @@ public class AndonManageRouteErrorRecordModel extends AndonManageRouteErrorRecor
     @ApiParam(value = "处理状态")
     private String handleStatusName;
 
+    @ApiParam("安灯异常时间开始")
+    public String alarmErrorTimeStart;
+
+    @ApiParam("安灯异常时间截止")
+    public String alarmErrorTimeEnd;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java

@@ -69,4 +69,7 @@ public class FsmModel implements Serializable {
     @ApiParam("进入触发方法时默认不需要校验外部触发")
     private boolean checkTriggerTypeFalg = false;
 
+    @ApiParam("状态机停在之后处理异常标志")
+    private boolean handleErrorAfterStopFsmFalg = false;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.andon.sqlpack;
 
 import cn.estsh.i3plus.pojo.andon.bean.*;
+import cn.estsh.i3plus.pojo.andon.model.AndonManageRouteErrorRecordModel;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -1268,6 +1269,26 @@ public class AndonHqlPack {
         return packBean;
     }
 
+    /**
+     * 安灯异常记录
+     * @param record
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAndonManageRouteErrorRecordModel(AndonManageRouteErrorRecordModel record, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(record.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(record.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringLikerPack(record.getAndonOrderNo(), "andonOrderNo", packBean);
+        DdlPreparedPack.getNumEqualPack(record.getHandleStatus(), "handleStatus", packBean);
+        DdlPreparedPack.getStringEqualPack(record.getAlarmCode(), "alarmCode", packBean);
+        DdlPreparedPack.getStringEqualPack(record.getAlarmDetailCode(), "alarmDetailCode", packBean);
+        if (!StringUtils.isEmpty(record.getAlarmErrorTimeStart()) || !StringUtils.isEmpty(record.getAlarmErrorTimeEnd())) {
+            DdlPreparedPack.timeBuilder(record.getAlarmErrorTimeStart(), record.getAlarmErrorTimeEnd(), "alarmErrorTime", packBean, true);
+        }
+        return packBean;
+    }
+
     public static DdlPackBean getConfig(AndonConfig config) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(config, config.getOrganizeCode());
         DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", packBean);