Task#764+枚举TRUE_OR_FALSE

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

@@ -2475,4 +2475,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 任务数据来源：检查子数据
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRUE_OR_FALSE {
+        TRUE(1, "是"), FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        TRUE_OR_FALSE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -24,11 +23,11 @@ import javax.persistence.Transient;
  **/
 @Data
 @Entity
-@Table(name="WMS_BOM")
+@Table(name = "WMS_BOM")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="物料清单",description = "物料清单")
+@Api(value = "物料清单", description = "物料清单")
 public class WmsBom extends BaseBean {
 
     @Column(name = "PART_NO")
@@ -63,19 +62,23 @@ public class WmsBom extends BaseBean {
     @ApiParam(value = "子用量")
     private Double itemQty;
 
+    @Column(name = "BOM_NUM")
+    @ApiParam(value = "BOM编号")
+    private String bomNum;
+
     @Column(name = "BOM_VERSION")
     @ApiParam(value = "BOM版本号")
     private String bomVersion;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="有效起始日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     @Column(name = "EFF_START_TIME")
     private String effStartTime;
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="有效截止日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59")
     @AnnoOutputColumn(hidden = true)
     @Column(name = "EFF_END_TIME")
     private String effEndTime;

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

@@ -0,0 +1,81 @@
+package cn.estsh.i3plus.pojo.wms.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 全量BOM
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/6/19 21:23
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_BOM_TOTAL")
+@Api("全量BOM")
+public class WmsBomTotal extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("父物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("父物料描述")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam("计量单位")
+    private String UNIT;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam(value = "子物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam(value = "子料物料描述")
+    private String itemPartName;
+
+    @Column(name = "ITEM_UNIT")
+    @ApiParam(value = "子计量单位")
+    private String itemUnit;
+
+    @Column(name = "ITEM_QTY")
+    @ApiParam(value = "子用量")
+    private Double itemQty;
+
+    @Column(name = "BOM_NUM")
+    @ApiParam(value = "BOM编号")
+    private String bomNum;
+
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    private String bomVersion;
+
+    @Column(name = "EFF_START_TIME")
+    @ApiParam(value = "有效起始日期")
+    private String effStartTime;
+
+    @Column(name = "EFF_END_TIME")
+    @ApiParam(value = "有效截止日期")
+    private String effEndTime;
+
+    @Column(name = "SID")
+    @ApiParam(value = "SID")
+    private String sid;
+}

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.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 dragon
+ * @CreateDate 2019/6/19 21:23
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PRODUCT_VERSION")
+@Api("生产版本")
+public class WmsProductVersion extends BaseBean {
+
+    @Column(name = "ERP_WORK_CENTER")
+    @ApiParam("ERP工作中心")
+    private String erpWorkCenter;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PV_CODE")
+    @ApiParam("生产版本")
+    private String pvCode;
+
+    @Column(name = "PV_NAME")
+    @ApiParam("生产版本描述")
+    private String pvName;
+
+    @Column(name = "BOM_NUM")
+    @ApiParam(value = "BOM编号")
+    private String bomNum;
+
+}