Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -238,7 +238,9 @@ public class MesPcnEnumUtil {
         PCN_MODULE(180, "PCN_MODULE", ""),
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
         UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
-        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
+        PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"),
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE");
 
         private int value;
         private String code;

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

@@ -75,6 +75,12 @@ public class WmsActionGroup extends BaseBean {
     @AnnoOutputColumn
     private Integer isCommitRefMove;
 
+    // 1=true, 2 = false
+    @Column(name = "IS_AUTO_COMMIT", nullable = false)
+    @ApiParam(value = "是否自动提交", example = "1")
+    @AnnoOutputColumn
+    private Integer isAutoCommit;
+
     @Lob
     @Column(name = "POSITION")
     @ApiParam(value = "GOJS位置")
@@ -99,6 +105,11 @@ public class WmsActionGroup extends BaseBean {
     public int getIsCommitRefMoveVal() {
         return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
     }
+
+    public int getIsAutoCommitVal() {
+        return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
+    }
+
     public int getAutoInitVal() {
         return this.autoInit == null ? 0 : this.autoInit.intValue();
     }