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

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

@@ -6758,4 +6758,37 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPC_TYPE {
+
+        UA(10, "UA"),
+        DA(20, "DA");
+
+        private int value;
+        private String code;
+
+        OPC_TYPE(int value, String code) {
+            this.value = value;
+            this.code = code;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -207,10 +207,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("包规数量")
     private Double packageQty;
 
-    @Version
-    @Column(name = "LOCK_VERSION")
-    @ApiParam(value = "乐观锁", example = "1")
-    public Integer lockVersion;
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public Integer lockVersion;
 
     @Transient
     @ApiParam("缺陷代码")

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

@@ -50,6 +50,7 @@ public class WmsPOMaster extends BaseBean {
      */
     @Column(name = "PO_TYPE")
     @ApiParam("单据类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_TYPE.class, refForeignKey = "value", value = "description")
     public String poType;
 
     /**
@@ -89,6 +90,7 @@ public class WmsPOMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生成任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
     @Column(name = "IS_PART")
@@ -121,6 +123,7 @@ public class WmsPOMaster extends BaseBean {
 
     @Column(name = "IS_SN")
     @ApiParam(value = "是否生成条码", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isSn;
 
     @Column(name = "CONTAINER_NO")
@@ -177,6 +180,7 @@ public class WmsPOMaster extends BaseBean {
 
     @Transient
     @ApiParam("看板状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description")
     private Integer boardStatus;
 
     @Transient