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

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

@@ -5544,8 +5544,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCE_CATEGORY_NAME {
 
-        FL("FL", "前右"),
-        FR("FR", "前左"),
+        FL("FL", "前左"),
+        FR("FR", "前右"),
         RL("RL", "后左"),
         RR("RR", "后右");
 
@@ -5575,11 +5575,11 @@ public class MesPcnEnumUtil {
             return tmp;
         }
 
-        public static String descriptionOfValue(String description) {
+        public static String descriptionOfValue(String value) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(description)) {
-                    tmp = values()[i].value;
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
                 }
             }
             return tmp;

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

@@ -121,7 +121,7 @@ public class WmsASNMasterDetails extends BaseBean {
     public Double recQty;
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 

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

@@ -384,7 +384,7 @@ public class WmsDocMovementDetails extends BaseBean {
     }
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 

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

@@ -237,7 +237,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     private String createDateTime;
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 

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

@@ -205,7 +205,7 @@ public class WmsMoveSn extends BaseBean {
     private String transTypeName;
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 

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

@@ -160,7 +160,7 @@ public class WmsPOMasterDetails extends BaseBean {
     //private Double getInputRcQty(){ return this.inputRcQty == null ? new Double(0) : this.inputRcQty; }
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     private transient Integer lockVersion;
 

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

@@ -83,7 +83,7 @@ public class WmsQCDetails extends BaseBean {
     public Double rejectQty;
 
     @Version
-    @Column(name = "LOCK_VERSION")
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
 }