钢坯业务数据结构调整

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/entity/BilletBasicInfo.java

@@ -58,14 +58,26 @@ public class BilletBasicInfo implements Serializable {
 	@Excel(name = "铸机号", width = 15)
     @ApiModelProperty(value = "铸机号",required = true)
     private Integer ccmNo;
+    /**拉速*/
+    @Excel(name = "拉速", width = 15)
+    @ApiModelProperty(value = "拉速",required = true)
+    private String castingSpeed ;
+    /**钢包号*/
+    @Excel(name = "钢包号", width = 15)
+    @ApiModelProperty(value = "钢包号",required = true)
+    private String ladleNo;
 	/**流号*/
 	@Excel(name = "流号", width = 15)
     @ApiModelProperty(value = "流号",required = true)
     private Integer strandNo;
+    /**炉内顺序号*/
+    @Excel(name = "炉内顺序号", width = 15)
+    @ApiModelProperty(value = "炉内顺序号",required = true)
+    private Integer heatnoIndex;
 	/**支号*/
-	@Excel(name = "支号", width = 15)
-    @ApiModelProperty(value = "支号",required = true)
-    private Integer orderNo;
+//	@Excel(name = "支号", width = 15)
+//    @ApiModelProperty(value = "支号",required = true)
+//    private Integer orderNo;
 	/**钢种*/
 	@Excel(name = "钢种", width = 15)
     @ApiModelProperty(value = "钢种",required = true)
@@ -99,9 +111,13 @@ public class BilletBasicInfo implements Serializable {
     @ApiModelProperty(value = "坯号",required = true)
     private String billetNo;
     /**顺序号*/
-    @Excel(name = "顺序号", width = 15)
-    @ApiModelProperty(value = "顺序号",required = true)
-    private String orderNum;
+//    @Excel(name = "顺序号", width = 15)
+//    @ApiModelProperty(value = "顺序号",required = true)
+//    private String orderNum;
+    /**坯号*/
+    @Excel(name = "坯号", width = 15)
+    @ApiModelProperty(value = "坯号",required = true)
+    private Integer strandnoIndex;
     /**开始切割时间*/
     @Excel(name = "开始切割时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -122,12 +138,6 @@ public class BilletBasicInfo implements Serializable {
     public BilletBasicInfo() {
     }
 
-    /**堆垛或车位关联id*/
-//    @Excel(name = "堆垛或车位关联id", width = 15)
-//    @ApiModelProperty(value = "堆垛或车位关联id")
-//    private String stackOrCarId;
-
-
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -205,13 +215,13 @@ public class BilletBasicInfo implements Serializable {
         this.strandNo = strandNo;
     }
 
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
+//    public Integer getOrderNo() {
+//        return orderNo;
+//    }
+//
+//    public void setOrderNo(Integer orderNo) {
+//        this.orderNo = orderNo;
+//    }
 
     public String getGrade() {
         return grade;
@@ -277,13 +287,13 @@ public class BilletBasicInfo implements Serializable {
         this.billetNo = billetNo;
     }
 
-    public String getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(String orderNum) {
-        this.orderNum = orderNum;
-    }
+//    public String getOrderNum() {
+//        return orderNum;
+//    }
+//
+//    public void setOrderNum(String orderNum) {
+//        this.orderNum = orderNum;
+//    }
 
     public Date getCutStartTime() {
         return cutStartTime;
@@ -308,4 +318,36 @@ public class BilletBasicInfo implements Serializable {
     public void setRatingsResult(String ratingsResult) {
         this.ratingsResult = ratingsResult;
     }
+
+    public String getCastingSpeed() {
+        return castingSpeed;
+    }
+
+    public void setCastingSpeed(String castingSpeed) {
+        this.castingSpeed = castingSpeed;
+    }
+
+    public String getLadleNo() {
+        return ladleNo;
+    }
+
+    public void setLadleNo(String ladleNo) {
+        this.ladleNo = ladleNo;
+    }
+
+    public Integer getHeatnoIndex() {
+        return heatnoIndex;
+    }
+
+    public void setHeatnoIndex(Integer heatnoIndex) {
+        this.heatnoIndex = heatnoIndex;
+    }
+
+    public Integer getStrandnoIndex() {
+        return strandnoIndex;
+    }
+
+    public void setStrandnoIndex(Integer strandnoIndex) {
+        this.strandnoIndex = strandnoIndex;
+    }
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/entity/HeatsActuals.java

@@ -58,6 +58,10 @@ public class HeatsActuals implements Serializable {
 	@Excel(name = "炉号", width = 15)
     @ApiModelProperty(value = "炉号",required = true)
     private String heatsCode;
+    /**钢坯总支数*/
+    @Excel(name = "钢坯总支数", width = 15)
+    @ApiModelProperty(value = "钢坯总支数",required = true)
+    private Integer billetSum;
 	/**铸机号*/
 	@Excel(name = "铸机号", width = 15)
     @ApiModelProperty(value = "铸机号",required = true)
@@ -110,6 +114,59 @@ public class HeatsActuals implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "最后切割时间",required = true)
     private Date lastCutTime;
+    /**定尺1*/
+    @Excel(name = "定尺1", width = 15)
+    @ApiModelProperty(value = "定尺1",required = true)
+    private String lengthOne;
+    /**定尺1*/
+    @Excel(name = "定尺1-支数", width = 15)
+    @ApiModelProperty(value = "定尺1-支数",required = true)
+    private String lengthOneSum;
+    /**定尺2*/
+    @Excel(name = "定尺2", width = 15)
+    @ApiModelProperty(value = "定尺2",required = true)
+    private String lengthTwo;
+    /**定尺2-支数*/
+    @Excel(name = "定尺2-支数", width = 15)
+    @ApiModelProperty(value = "定尺2-支数",required = true)
+    private String lengthTwoSum;
+    /**定尺3*/
+    @Excel(name = "定尺3", width = 15)
+    @ApiModelProperty(value = "定尺3",required = true)
+    private String lengthThree;
+    /**定尺3-支数*/
+    @Excel(name = "定尺3-支数", width = 15)
+    @ApiModelProperty(value = "定尺3-支数",required = true)
+    private String lengthThreeSum;
+    /**定尺4*/
+    @Excel(name = "定尺4", width = 15)
+    @ApiModelProperty(value = "定尺4",required = true)
+    private String lengthFour;
+    /**定尺4-支数*/
+    @Excel(name = "定尺4-支数", width = 15)
+    @ApiModelProperty(value = "定尺4-支数",required = true)
+    private String lengthFourSum;
+    /**定尺5*/
+    @Excel(name = "定尺5", width = 15)
+    @ApiModelProperty(value = "定尺5",required = true)
+    private String lengthFive;
+    /**定尺5-支数*/
+    @Excel(name = "定尺5-支数", width = 15)
+    @ApiModelProperty(value = "定尺5-支数",required = true)
+    private String lengthFiveSum;
+    /**定尺6*/
+    @Excel(name = "定尺6", width = 15)
+    @ApiModelProperty(value = "定尺6",required = true)
+    private String lengthSix;
+    /**定尺1-支数*/
+    @Excel(name = "定尺6-支数", width = 15)
+    @ApiModelProperty(value = "定尺6-支数",required = true)
+    private String lengthSixSum;
+    /**编辑条件*/
+    @Excel(name = "编辑条件", width = 15)
+    @ApiModelProperty(value = "编辑条件",required = true)
+    private String opType;
+
 
     public HeatsActuals() {
     }
@@ -261,4 +318,116 @@ public class HeatsActuals implements Serializable {
     public void setLastCutTime(Date lastCutTime) {
         this.lastCutTime = lastCutTime;
     }
+
+    public Integer getBilletSum() {
+        return billetSum;
+    }
+
+    public void setBilletSum(Integer billetSum) {
+        this.billetSum = billetSum;
+    }
+
+    public String getLengthOne() {
+        return lengthOne;
+    }
+
+    public void setLengthOne(String lengthOne) {
+        this.lengthOne = lengthOne;
+    }
+
+    public String getLengthOneSum() {
+        return lengthOneSum;
+    }
+
+    public void setLengthOneSum(String lengthOneSum) {
+        this.lengthOneSum = lengthOneSum;
+    }
+
+    public String getLengthTwo() {
+        return lengthTwo;
+    }
+
+    public void setLengthTwo(String lengthTwo) {
+        this.lengthTwo = lengthTwo;
+    }
+
+    public String getLengthTwoSum() {
+        return lengthTwoSum;
+    }
+
+    public void setLengthTwoSum(String lengthTwoSum) {
+        this.lengthTwoSum = lengthTwoSum;
+    }
+
+    public String getLengthThree() {
+        return lengthThree;
+    }
+
+    public void setLengthThree(String lengthThree) {
+        this.lengthThree = lengthThree;
+    }
+
+    public String getLengthThreeSum() {
+        return lengthThreeSum;
+    }
+
+    public void setLengthThreeSum(String lengthThreeSum) {
+        this.lengthThreeSum = lengthThreeSum;
+    }
+
+    public String getLengthFour() {
+        return lengthFour;
+    }
+
+    public void setLengthFour(String lengthFour) {
+        this.lengthFour = lengthFour;
+    }
+
+    public String getLengthFourSum() {
+        return lengthFourSum;
+    }
+
+    public void setLengthFourSum(String lengthFourSum) {
+        this.lengthFourSum = lengthFourSum;
+    }
+
+    public String getLengthFive() {
+        return lengthFive;
+    }
+
+    public void setLengthFive(String lengthFive) {
+        this.lengthFive = lengthFive;
+    }
+
+    public String getLengthFiveSum() {
+        return lengthFiveSum;
+    }
+
+    public void setLengthFiveSum(String lengthFiveSum) {
+        this.lengthFiveSum = lengthFiveSum;
+    }
+
+    public String getLengthSix() {
+        return lengthSix;
+    }
+
+    public void setLengthSix(String lengthSix) {
+        this.lengthSix = lengthSix;
+    }
+
+    public String getLengthSixSum() {
+        return lengthSixSum;
+    }
+
+    public void setLengthSixSum(String lengthSixSum) {
+        this.lengthSixSum = lengthSixSum;
+    }
+
+    public String getOpType() {
+        return opType;
+    }
+
+    public void setOpType(String opType) {
+        this.opType = opType;
+    }
 }