Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -643,7 +643,8 @@ public class MesEnumUtil {
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
         QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
-        WC_CHECK("WC_CHECK", "开线检查项");
+        WC_CHECK("WC_CHECK", "开线检查项"),
+        BOARD("BOARD", "看板类型");
 
         private String value;
         private String description;

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

@@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SHIPPING_ACTUAL_STATUS {
         CREATE(10, "创建"),
-        CANCEL(20, "已发运");
+        SHIPPED(20, "已发运");
 
         private int value;
         private String description;
@@ -3403,7 +3403,7 @@ public class MesPcnEnumUtil {
         public int getValue() {
             return value;
         }
-        
+
         public String getCode() {
             return code;
         }

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

@@ -6252,4 +6252,115 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 数据导入类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TEMPLATE_IMPORT_TYPE {
+        SINGLE_TABLE(10, "SINGLE_TABLE", "单表"),
+        MULTI_TABLE(20, "MULTI_TABLE", "多表");
+
+        private int value;
+        private String code;
+        private String description;
+
+        TEMPLATE_IMPORT_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 数据更新类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TEMPLATE_UPDATE_TYPE {
+        FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"),
+        DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"),
+        REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入");
+
+        private int value;
+        private String code;
+        private String description;
+
+        TEMPLATE_UPDATE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-mes-pcn</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

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

@@ -8,6 +8,7 @@ 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;
@@ -28,78 +29,78 @@ import java.io.Serializable;
 @Table(name = "if_queue_shipping")
 @Api("JIT发运数据同步")
 public class IfQueueShipping extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -8961182851667690154L;
-    @Column(name = "JIT_NO")
-    @ApiParam("JIT队列编号")
-    private String jitNo;
+	private static final long serialVersionUID = -8961182851667690154L;
+	@Column(name = "JIT_NO")
+	@ApiParam("JIT队列编号")
+	private String jitNo;
 
-    @Column(name = "VIN_CODE")
-    @ApiParam("vin")
-    private String vinCode;
+	@Column(name = "VIN_CODE")
+	@ApiParam("vin")
+	private String vinCode;
 
-    @Column(name = "CUST_FLAG_NO")
-    @ApiParam("客户标识号")
-    private String custFlagNo;
+	@Column(name = "CUST_FLAG_NO")
+	@ApiParam("客户标识号")
+	private String custFlagNo;
 
-    @Column(name = "PART_NO")
-    @ApiParam("物料号")
-    private String partNo;
+	@Column(name = "PART_NO")
+	@ApiParam("物料号")
+	private String partNo;
 
-    @Column(name = "PART_NAME")
-    @ApiParam("物料名称")
-    private String partName;
+	@Column(name = "PART_NAME")
+	@ApiParam("物料名称")
+	private String partName;
 
-    @Column(name = "PRODUCT_SN")
-    @ApiParam("产品条码")
-    private String productSn;
+	@Column(name = "PRODUCT_SN")
+	@ApiParam("产品条码")
+	private String productSn;
 
-    @Column(name = "QTY")
-    @ApiParam("数量")
-    private Double qty;
+	@Column(name = "QTY")
+	@ApiParam("数量")
+	private Double qty;
 
-    @Column(name = "SUPPLIER_CODE")
-    @ApiParam("供应商代码")
-    private String supplierCode;
+	@Column(name = "SUPPLIER_CODE")
+	@ApiParam("供应商代码")
+	private String supplierCode;
 
-    @Column(name = "ACTION_USER")
-    @ApiParam("操作人")
-    private String actionUser;
+	@Column(name = "ACTION_USER")
+	@ApiParam("操作人")
+	private String actionUser;
 
-    @Column(name = "ACTION_DATE_TIME")
-    @ApiParam("操作时间")
-    private String actionDateTime;
+	@Column(name = "ACTION_DATE_TIME")
+	@ApiParam("操作时间")
+	private String actionDateTime;
 
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("产线")
-    private String workCenterCode;
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("产线")
+	private String workCenterCode;
 
-    @Column(name = "PRODUCE_CATEGORY_CODE")
-    @ApiParam("产品位置")
-    private String produceCategoryCode;
+	@Column(name = "PRODUCE_CATEGORY_CODE")
+	@ApiParam("产品位置")
+	private String produceCategoryCode;
 
 
-    @Column(name = "QUEUE_GROUP_NO")
-    @ApiParam("分组队列编号")
-    private String queueGroupNo;
+	@Column(name = "QUEUE_GROUP_NO")
+	@ApiParam("分组队列编号")
+	private String queueGroupNo;
 
-    @Column(name = "JIT_LOT_NO")
-    @ApiParam("JIT队列批次")
-    private String jitLotNo;
+	@Column(name = "JIT_LOT_NO")
+	@ApiParam("JIT队列批次")
+	private String jitLotNo;
 
-    @Column(name = "SYNC_STATUS")
-    @ApiParam("同步状态")
-    private Integer syncStatus;
+	@Column(name = "SYNC_STATUS")
+	@ApiParam("同步状态")
+	private Integer syncStatus;
 
-    @Column(name = "ERROR_MESSAGE")
-    @ApiParam("异常消息")
-    private String errorMessage;
+	@Column(name = "ERROR_MESSAGE")
+	@ApiParam("异常消息")
+	private String errorMessage;
 
-    @Column(name = "ACTION_CODE")
-    @ApiParam("动作代码")
-    private String actionCode;
+	@Column(name = "ACTION_CODE")
+	@ApiParam("动作代码")
+	private String actionCode;
 
-    @Column(name = "IF_CODE")
-    @ApiParam("接口代码")
-    private String ifCode;
+	@Column(name = "IF_CODE")
+	@ApiParam("接口代码")
+	private String ifCode;
 
 }

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

@@ -0,0 +1,52 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD")
+@Api("MES_看板")
+public class MesBoard extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3932883110518753734L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "BOARD_NAME")
+    @ApiParam("看板名称")
+    private String boardName;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "REFRESH_INTERVAL")
+    @ApiParam("刷新时间")
+    private Integer refreshInterval;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+}

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

@@ -0,0 +1,50 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:07 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_EQU_DETAIL")
+@Api("MES_看板设备明细")
+public class MesBoardEquDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2187463105092165451L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam("设备名称")
+    private String equName;
+
+    @ApiParam(value = "横坐标")
+    private Float horizontalAxis = 0f;
+
+    @ApiParam(value = "纵坐标")
+    private Float verticalAxis = 0f;
+}

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

@@ -0,0 +1,52 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:01 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_EQU_STATUS")
+@Api("MES_看板设备状态")
+public class MesBoardEquStatus extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8426698586967483537L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam("设备代码")
+    private String equCOde;
+
+    @Column(name = "EQU_STATUS_CODE")
+    @ApiParam("状态代码")
+    private Integer equStatusCode;
+
+    @Column(name = "EQU_STATUS_DESC")
+    @ApiParam("状态描述")
+    private String equStatusDesc;
+
+    @Column(name = "COLOR")
+    @ApiParam("颜色")
+    private String color;
+}

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

@@ -0,0 +1,48 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:19 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_MONITOR_OBJECT")
+@Api("MES_看板监控对象")
+public class MesBoardMonitorObject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4136991652901768961L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "OBJECT_TYPE")
+    @ApiParam("对象类型")
+    private String objectType;
+
+    @Column(name = "OBJECT_VALUE")
+    @ApiParam("对象值")
+    private String objectValue;
+
+    @Column(name = "OBJECT_VALUE_DESC")
+    @ApiParam("对象值描述")
+    private String objectValueDesc;
+}

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

@@ -0,0 +1,40 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:53 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_PICTURE")
+@Api("MES_看板图片")
+public class MesBoardPicture extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5784111763887252647L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("图片路径")
+    private String pictureUrl;
+}

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

@@ -0,0 +1,56 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 6:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_PLAN_CAPACITY")
+@Api("MES_看板计划产能")
+public class MesBoardPlanCapacity extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7355311263972875850L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "PLAN_PEOPLE_NUM")
+    @ApiParam("计划人数")
+    private Integer planPeopleNum;
+
+    @Column(name = "ACTUAL_PEOPLE_NUM")
+    @ApiParam("实际人数")
+    private Integer actualPeopleNum;
+
+    @Column(name = "PLAN_CAPACITY")
+    @ApiParam("计划产量")
+    private Integer planCapacity;
+}

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

@@ -0,0 +1,44 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT")
+@Api("MES_看板班次")
+public class MesBoardShift extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818263404086L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+}

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

@@ -0,0 +1,52 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:13 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT_SECTION")
+@Api("MES_看板班次时段")
+public class MesBoardShiftSection extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -957301986885952078L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Column(name = "IS_SPANDAY")
+    @ApiParam("是否跨天")
+    private Integer isSpanday;
+}

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

@@ -0,0 +1,56 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:24 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY")
+@Api("MES_看板时段计划产量")
+public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1184108324734484237L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时段")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时段")
+    private String endTime;
+
+    @Column(name = "PLAN_CAPACITY")
+    @ApiParam("计划产量")
+    private Integer planCapacity;
+}

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

@@ -0,0 +1,44 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:43 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_TYPE")
+@Api("MES_看板类型")
+public class MesBoardType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3652595133806144706L;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "BOARD_TYPE_NAME")
+    @ApiParam("看板类型名称")
+    private String boardTypeName;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+}

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

@@ -0,0 +1,44 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:47 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_TYPE_BASE_CFG")
+@Api("MES_看板类型基础配置")
+public class MesBoardTypeBaseCfg extends BaseBean implements Serializable  {
+
+    private static final long serialVersionUID = 5405378688706555644L;
+
+    @Column(name = "BOARD_TYPE")
+    @ApiParam("看板类型")
+    private String boardType;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
+}

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

@@ -31,11 +31,11 @@ import java.io.Serializable;
 })
 @Api("工作单元组件参数配置")
 public class MesWorkCellModuleParam extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 4836155960343256982L;
+	private static final long serialVersionUID = 4836155960343256982L;
 
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("产线")
-    private String workCenterCode;
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("产线")
+	private String workCenterCode;
 
 	@Column(name = "WORK_CELL_CODE")
 	@ApiParam("工作单元代码")

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

@@ -16,27 +16,27 @@ import java.io.Serializable;
 @Data
 @Api("JIT发运队列列表Model")
 public class QueueShippingModel implements Serializable {
-    private Long id;
+	private Long id;
 
-    @ApiParam("显示颜色")
-    private String color;
+	@ApiParam("显示颜色")
+	private String color;
 
-    @ApiParam("队列编号")
-    private String jisActualNo;
+	@ApiParam("队列编号")
+	private String jisActualNo;
 
-    @ApiParam("产品位置代码")
-    private String produceCtgyCode;
+	@ApiParam("产品位置代码")
+	private String produceCtgyCode;
 
-    @ApiParam("产品位置")
-    private String prodCfgName;
+	@ApiParam("产品位置")
+	private String prodCfgName;
 
-    @ApiParam("起始vin")
-    private String vin;
+	@ApiParam("起始vin")
+	private String vin;
 
-    @ApiParam("结束vin")
-    private String endVin;
+	@ApiParam("结束vin")
+	private String endVin;
 
-    @ApiParam("料架号")
-    private String queueGroupNo;
+	@ApiParam("料架号")
+	private String queueGroupNo;
 
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 10:49 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardEquDetailRepository extends BaseRepository<MesBoardEquDetail, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 10:50 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardEquStatusRepository extends BaseRepository<MesBoardEquStatus, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardMonitorObject;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 10:51 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardMonitorObjectRepository extends BaseRepository<MesBoardMonitorObject, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardPicture;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 10:52 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardPictureRepository extends BaseRepository<MesBoardPicture, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardPlanCapacity;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 10:53 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardPlanCapacityRepository extends BaseRepository<MesBoardPlanCapacity, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoard;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 8:53 下午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardRepository extends BaseRepository<MesBoard, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardShift;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 10:59 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardShiftRepository extends BaseRepository<MesBoardShift, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 11:07 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardShiftSectionCapacityRepository extends BaseRepository<MesBoardShiftSectionCapacity, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSection;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 11:00 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardShiftSectionRepository extends BaseRepository<MesBoardShiftSection, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardTypeBaseCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 9:55 下午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardTypeBaseCfgRepository extends BaseRepository<MesBoardTypeBaseCfg, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/21 11:11 上午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardTypeRepository extends BaseRepository<MesBoardType, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2473,4 +2473,25 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesPartFormula.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    /**
+     * 看板
+     *
+     * @param board
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesBoard(MesBoard board, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(board, organizeCode);
+        if (!StringUtils.isEmpty(board.getBoardCode())) {
+            DdlPreparedPack.getStringLikerPack(board.getBoardCode(), "boardCode", packBean);
+        }
+        if (!StringUtils.isEmpty(board.getBoardName())) {
+            DdlPreparedPack.getStringLikerPack(board.getBoardName(), "boardName", packBean);
+        }
+        if (!StringUtils.isEmpty(board.getBoardType())) {
+            DdlPreparedPack.getStringLikerPack(board.getBoardType(), "boardType", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-model</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/i3plus-pojo-softswitch/pom.xml

@@ -12,6 +12,7 @@
 
     <artifactId>i3plus-pojo-softswitch</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-DEV-SNAPSHOT</version>
 
     <dependencies>
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java

@@ -34,4 +34,7 @@ public class BasBeanFieldModel {
 
     @ApiParam("实例字段名称")
     public String propertyName;
+
+    @ApiParam("实例类全名")
+    public String entityClassName;
 }