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

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

@@ -127,8 +127,8 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
-        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
+//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
-        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonAlarmCause, result);
 
         return result;
@@ -394,7 +394,7 @@ public class AndonHqlPack {
     public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+//        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
 
         getStringBuilderPack(andonAlarmDetailType, result);
@@ -430,4 +430,52 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * ANDON_事件原因
+     * @param andonEventCause
+     * @return
+     */
+    public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) {
+        DdlPackBean result = new DdlPackBean();
+        getStringBuilderPack(andonEventCause, result);
+
+        return result;
+    }
+
+    /**
+     * ANDON_停机类型
+     * @param haltType
+     * @return
+     */
+    public static DdlPackBean packAndonHaltType(AndonHaltType haltType) {
+        DdlPackBean result = new DdlPackBean();
+        getStringBuilderPack(haltType, result);
+
+        return result;
+    }
+
+    /**
+     * ANDON_事件现象
+     * @param eventPhenoMenon
+     * @return
+     */
+    public static DdlPackBean packAndonEventPhenoMenon(AndonEventPhenoMenon eventPhenoMenon) {
+        DdlPackBean result = new DdlPackBean();
+        getStringBuilderPack(eventPhenoMenon, result);
+
+        return result;
+    }
+
+    /**
+     * ANDON_ 事件处理方法
+     * @param eventPhenoMenon
+     * @return
+     */
+    public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) {
+        DdlPackBean result = new DdlPackBean();
+        getStringBuilderPack(eventPhenoMenon, result);
+
+        return result;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -117,9 +117,13 @@ public class WmsPart extends BaseBean {
 
     @Column(name="PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
-    public String prodCfgTypeCode;
+    private String prodCfgTypeCode;
 
     @Column(name="PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
-    public String prodCfgTypeName;
+    private String prodCfgTypeName;
+
+    @Column(name="OUT_CLOSE_FLAG")
+    @ApiParam("項目结算标识")
+    private String outCloseFlag;
 }