Merge branch 'dev'

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

@@ -1305,7 +1305,10 @@ public class MesEnumUtil {
         MES_WORK_CENTER(150, "生产线"),
         MES_WORK_CELL(160, "工位"),
         MES_WC_EQUIPMENT(170, "工位设备关系表"),
-        MES_SHIFT(180, "班次");
+        MES_SHIFT(180, "班次"),
+        MES_SHIFT_GROUP(190, "班组"),
+        MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"),
+        MES_PROCESS_BOM(210, "工序BOM表");
 
         private int value;
         private String description;
@@ -3481,4 +3484,50 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * MesWorkCellParamCfg 工作单元参数配置 是否必须校验
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_WORK_CELL_PARAM_CFG_IS_CHECK {
+
+        RUNNING(1, "是"),
+        STOPPED(2, "否");
+
+        private int value;
+        private String description;
+
+        MES_WORK_CELL_PARAM_CFG_IS_CHECK(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -9,14 +8,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * @Description:

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.model.mes;
 
 
-
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -71,6 +70,10 @@ public class StationRequestBean implements Serializable {
     @ApiParam("托盘号")
     private String tray;
 
+    @ApiParam("完成数量")
+    private Integer finishCount;
+
     @ApiParam("工步列表")
     private List<StepModel> stepList;
+
 }

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

@@ -95,7 +95,23 @@ public class WmsQCMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isPart;
 
+    @Transient
+    @ApiParam(value = "零件号")
+    public String partNo;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
+
+    public WmsQCMaster () {
+
+    }
+
+    public WmsQCMaster (String orderNo, String vendorNo, String refType, String refSrc, String partNo) {
+        this.orderNo = orderNo;
+        this.vendorNo = vendorNo;
+        this.refType = refType;
+        this.refSrc = refSrc;
+        this.partNo = partNo;
+    }
 }