字段新增

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetLiftingBill/entity/BilletLiftingBill.java

@@ -90,8 +90,28 @@ public class BilletLiftingBill implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "吊运时间")
     private Date liftingTime;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
+    /**备注*/
+    @Excel(name = "目的地", width = 15)
+    @ApiModelProperty(value = "目的地")
+    private String destination;
+    /**备注*/
+    @Excel(name = "车位号", width = 15)
+    @ApiModelProperty(value = "车位号")
+    private Integer positionNum;
+    /**备注*/
+    @Excel(name = "车牌号或所属垛位", width = 15)
+    @ApiModelProperty(value = "车牌号或所属垛位")
+    private String plateOrStack;
+    /**备注*/
+    @Excel(name = "所在层数（1-20）", width = 15)
+    @ApiModelProperty(value = "所在层数（1-20）")
+    private String layer;
+    /**备注*/
+    @Excel(name = "所在位置（1-9）", width = 15)
+    @ApiModelProperty(value = "所在位置（1-9）")
+    private String address;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String remark;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/entity/RollClubOneDetails.java

@@ -111,4 +111,10 @@ public class RollClubOneDetails implements Serializable {
     @Excel(name = "出坯量", width = 15)
     @ApiModelProperty(value = "出坯量")
     private Double blankOutput;
+    /**
+     * 组坯号
+     */
+    @Excel(name = "组坯号", width = 15)
+    @ApiModelProperty(value = "组坯号", required = true)
+    private String assemblyNumber;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/entity/RollClubThreeDetails.java

@@ -129,4 +129,10 @@ public class RollClubThreeDetails implements Serializable {
     @Excel(name = "出坯量", width = 15)
     @ApiModelProperty(value = "出坯量")
     private Double blankOutput;
+    /**
+     * 组坯号
+     */
+    @Excel(name = "组坯号", width = 15)
+    @ApiModelProperty(value = "组坯号", required = true)
+    private String assemblyNumber;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/entity/RollClubTwoDetails.java

@@ -129,4 +129,10 @@ public class RollClubTwoDetails implements Serializable {
     @Excel(name = "出坯量", width = 15)
     @ApiModelProperty(value = "出坯量")
     private Double blankOutput;
+    /**
+     * 组坯号
+     */
+    @Excel(name = "组坯号", width = 15)
+    @ApiModelProperty(value = "组坯号", required = true)
+    private String assemblyNumber;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/entity/RollHeightDetails.java

@@ -123,4 +123,11 @@ public class RollHeightDetails implements Serializable {
     @Excel(name = "垛位", width = 15)
     @ApiModelProperty(value = "垛位")
     private String stackAddr;
+
+    /**
+     * 组坯号
+     */
+    @Excel(name = "组坯号", width = 15)
+    @ApiModelProperty(value = "组坯号", required = true)
+    private String assemblyNumber;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/entity/RollOutShippDetails.java

@@ -130,4 +130,11 @@ public class RollOutShippDetails implements Serializable {
     @Excel(name = "出坯量", width = 15)
     @ApiModelProperty(value = "出坯量")
     private Double blankOutput;
+
+    /**
+     * 组坯号
+     */
+    @Excel(name = "组坯号", width = 15)
+    @ApiModelProperty(value = "组坯号", required = true)
+    private String assemblyNumber;
 }