Merge branch 'dev' into test

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

@@ -637,7 +637,9 @@ public class WmsEnumUtil {
         KT_RETURN(370, "KT_RETURN", "KT退货"),
         KT_REWORK(380, "KT_REWORK", "KT返工"),
         KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
-        KT_SORTING(400, "KT_SORTING", "KT分选");
+        KT_SORTING(400, "KT_SORTING", "KT分选"),
+		VDA_STATIC_CS(400,"VDA_STATIC_CS", "静态盘点"),
+		VDA_CS_SEARCH(410,"VDA_CS_SEARCH", "VDA盘点查询");
 
 
         private int value;

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.pcn.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.mes.pcn.model.MesWorkOrderButtonModel;
+import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
-    private MesWorkOrderButtonModel workOrderButtonModel;
+    private MesButtonFlagModel workOrderButtonModel;
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java

@@ -17,8 +17,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产工单页面按钮控制model")
+@Api("pcn页面按钮控制model")
-public class MesWorkOrderButtonModel implements Serializable {
+public class MesButtonFlagModel implements Serializable {
 
     @ApiParam("修改按钮")
     private boolean updateButton;