Finish Task #1876 edi webservice解析 Cost:32h

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

@@ -4,8 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
-import lombok.Data;
+import lombok.*;
-import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -28,12 +27,13 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_JIT_ACTUAL")
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Api("MES_客户JIT生产队列")
 public class MesQueueJitActual extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 655875369308810110L;
 
-
     @Column(name = "JIS_ACTUAL_NO")
     @ApiParam("队列编号")
     private String jisActualNo;
@@ -71,7 +71,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     private String custCode;
 
     @Column(name = "CUST_PLANT_CODE")
-    @ApiParam("客户产线代码")
+    @ApiParam("客户工厂代码")
     private String custPlantCode;
 
     @Column(name = "MEMO")
@@ -86,6 +86,38 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("JIT排序号")
     private String jitSeq;
 
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @Column(name = "SUPPLIER_NAME")
+    @ApiParam("供应商名称")
+    private String supplierName;
+
+    @Column(name = "VEHICLE_CODE")
+    @ApiParam("车型代码")
+    private String vehicleCode;
+
+    @Column(name = "VEHICLE_NAME")
+    @ApiParam("车型名称")
+    private String vehicleName;
+
+    @Column(name = "MODEL_YEAR")
+    @ApiParam("年度型")
+    private String modelYear;
+
+    @Column(name = "CAR_MODEL_CODE")
+    @ApiParam("车系编号")
+    private String carModelCode;
+
+    @Column(name = "CAR_SERIES")
+    @ApiParam("车系名称")
+    private String carSeries;
+
+    @Column(name = "CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;

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

@@ -0,0 +1,62 @@
+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.*;
+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 :
+ * @Reference :
+ * @Author : joke
+ * @CreateDate : 2020-03-06 10:01 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
+@Api("客户JIT生产队列散件清单")
+public class MesQueueJitActualBom extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1604529847020812472L;
+
+    @Column(name = "JIS_PLAN_NO")
+    @ApiParam("队列编号")
+    private String jisPlanNo;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "CUST_PART_NO")
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Double qty;
+
+    @Column(name = "PART_COLOR_VALUE")
+    @ApiParam("零件色值")
+    private String partColorValue;
+}

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

@@ -3,8 +3,7 @@ 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.*;
-import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -26,6 +25,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL")
 @Api("MES_客户JIT生产队列明细")
 public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@@ -47,6 +49,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("产品位置代码")
     private String produceCtgyCode;
 
+    @Column(name = "PRODUCE_CTGY_Name")
+    @ApiParam("产品位置名称")
+    private String produceCtgyName;
+
     @Transient
     @ApiParam("产品位置")
     private String prodCfgName;
@@ -67,11 +73,23 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("分组序号")
     private String groupSeq;
 
-    @Column(name = "status")
+    @Column(name = "STATUS")
     @ApiParam("状态")
     private Integer status;
 
-    @Column(name = "seq")
+    @Column(name = "SEQ")
     @ApiParam("主序编号")
     private String seq;
+
+    @Column(name = "PRODUCE_COLOR")
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Column(name = "OPTION_CODE")
+    @ApiParam("选项代码")
+    private String optionCode;
+
+    @Column(name = "ASSY_NO")
+    @ApiParam("组件编号")
+    private String assyNo;
 }

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActualBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/5/21 20:17
+ * @desc
+ */
+@Repository
+public interface MesQueueJitActualBomRepository extends BaseRepository<MesQueueJitActualBom, Long> {
+}