Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -694,13 +694,15 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum IS_GENERAL_TASK {
-        CREATE(10, "创建"), INIT(20, "初始化"), IS_GENERAL(30, "已生成"), NO_GENERAL(40, "不生成");
+        CREATE(10, "CREATE", "创建"), INIT(20, "INIT", "初始化"), IS_GENERAL(30, "IS_GENERAL", "已生成"), NO_GENERAL(40, "NO_GENERAL", "不生成");
 
         private int value;
+        private String code;
         private String description;
 
-        IS_GENERAL_TASK(int value, String description) {
+        IS_GENERAL_TASK(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -712,6 +714,10 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -721,6 +727,16 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
 
@@ -1760,8 +1776,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_STATUS {
-        YES(1, "是", "fa fa-success cell-fa fa-check"),
+        YES(1, "TRUE", "fa fa-success cell-fa fa-check"),
-        NO(2, "否", "fa fa-disabled cell-fa fa-times-circle");
+        NO(2, "FALSE", "fa fa-disabled cell-fa fa-times-circle");
 
         private int value;
         private String description;

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.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 :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CUST_PROD_LINE")
+@Api("客户产线代码")
+public class MesCustProdLine extends BaseBean {
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @Column(name="CUST_PROD_LINE_NAME")
+    @ApiParam("客户产线名称")
+    private String custProdLineName;
+}

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

@@ -31,9 +31,9 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam("生产计划单号")
     private String orderNo;
 
-    @Column(name="ORDER_TYPE")
+    @Column(name="PO_TYPE")
     @ApiParam("计划类型")
-    private Integer orderType;
+    private Integer planType;
 
     @Column(name="PROD_CFG_CODE")
     @ApiParam("产品配置代码")
@@ -96,6 +96,6 @@ public class MesPlanOrder extends BaseBean {
     }
 
     public int getOrderTypeVal() {
-        return this.orderType == null ? 0 : this.orderType;
+        return this.planType == null ? 0 : this.planType;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustProdLine;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-19-11:15
+ * @Modify:
+ **/
+@Repository
+public interface MesCustProdLineRepository  extends BaseRepository<MesCustProdLine, Long> {
+}