生产工单实体

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

@@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * MesWorkOrder实体对应的approvalStatus值  审批状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_APPROVAL_STATUS {
+
+        WAIT_APPROVAL(10, "待审批"),
+        COMPLETE_APPROVAL(20, "已审批"),
+        REJECT_APPROVAL(30, "驳回");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_APPROVAL_STATUS(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;
+        }
+    }
+
+    /**
      * mes-pcn定时任务状态
      *
      */

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT_GROUP")
+@Api("班组")
+public class MesShiftGroup extends BaseBean {
+    @Column(name="GROUP_CODE")
+    @ApiParam("班组代码")
+    private String groupCode;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("班组名称")
+    private String groupName;
+}

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

@@ -111,6 +111,14 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -138,4 +146,8 @@ public class MesWorkOrder extends BaseBean {
     public int getWorkOrderTypeVal() {
         return this.workOrderType == null ? 0 : this.workOrderType;
     }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
 }

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

@@ -3,7 +3,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 cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -129,6 +128,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("班组")
     private String shiftGroup;
 
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")
@@ -171,31 +174,6 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
-
-    @Transient
-    @ApiParam("工单类型枚举")
-    private List<MesEnumUtil.WORK_ORDER_TYPE> workOrderTypeDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_TYPE> getWorkOrderTypeDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_TYPE.values());
-    }
-
-    @Transient
-    @ApiParam("工单状态枚举")
-    private List<MesEnumUtil.WORK_ORDER_STATUS> workOrderStatusDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_STATUS> getWorkOrderStatusDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_STATUS.values());
-    }
-
-    @Transient
-    @ApiParam("工单来源枚举")
-    private List<MesEnumUtil.WORK_ORDER_SOURCE> workOrderSourceDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_SOURCE> getWorkOrderSourceDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
-    }
-
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
     private MesWorkOrderButtonModel workOrderButtonModel;
@@ -228,4 +206,8 @@ public class MesWorkOrder extends BaseBean {
     public int getWorkOrderTypeVal() {
         return this.workOrderType == null ? 0 : this.workOrderType;
     }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
 }