明细维护出坯量字段

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/entity/RollClubCommon.java

@@ -85,7 +85,7 @@ public class RollClubCommon {
     /**出坯量*/
     @Excel(name = "出坯量", width = 15)
     @ApiModelProperty(value = "出坯量")
-    private Double blankOutput;
+    private Double billetWeight;
     /**装运单ID*/
     @Excel(name = "装运单ID", width = 15)
     @ApiModelProperty(value = "装运单ID")

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -512,6 +512,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			rollClubOne.setSize(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getLength())); //定尺
 			rollClubOne.setSteel(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getGrade())); //钢种
 			rollClubOne.setSpec(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getSpec())); //规格
+			rollClubOne.setBlankOutput(rollClubCommonList.stream().findFirst().orElse(null).getBilletWeight());//出坯量
 			LambdaQueryWrapper<RollClubOne> queryWrapper1 = new LambdaQueryWrapper<>();
 			queryWrapper1.eq(RollClubOne::getCcmNo, billetHotsend.getCcmNo())
 					.eq(RollClubOne::getHeatNo, billetHotsend.getHeatNo())
@@ -540,6 +541,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubOneDetails.setSize(String.valueOf(x.getLength()));
 				rollClubOneDetails.setSteel(x.getGrade());
 				rollClubOneDetails.setCreateTime(new Date());
+				rollClubOneDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollClubOneDetailsList.add(rollClubOneDetails);
 			});
 			rollClubOneDetailsService.saveBatch(rollClubOneDetailsList);
@@ -554,6 +556,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			rollClubTwo.setSize(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getLength())); //定尺
 			rollClubTwo.setSteel(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getGrade())); //钢种
 			rollClubTwo.setSpec(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getSpec())); //规格
+			rollClubTwo.setBlankOutput(rollClubCommonList.stream().findFirst().orElse(null).getBilletWeight());//出坯量
 			LambdaQueryWrapper<RollClubTwo> queryWrapper1 = new LambdaQueryWrapper<>();
 			queryWrapper1.eq(RollClubTwo::getCcmNo, billetHotsend.getCcmNo())
 					.eq(RollClubTwo::getHeatNo, billetHotsend.getHeatNo())
@@ -582,6 +585,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubTwoDetails.setSize(String.valueOf(x.getLength()));
 				rollClubTwoDetails.setSteel(x.getGrade());
 				rollClubTwoDetails.setCreateTime(new Date());
+				rollClubTwoDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollClubTwoDetailsList.add(rollClubTwoDetails);
 			});
 			rollClubTwoDetailsService.saveBatch(rollClubTwoDetailsList);
@@ -596,6 +600,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			rollClubThree.setSize(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getLength())); //定尺
 			rollClubThree.setSteel(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getGrade())); //钢种
 			rollClubThree.setSpec(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getSpec())); //规格
+			rollClubThree.setBlankOutput(rollClubCommonList.stream().findFirst().orElse(null).getBilletWeight());//出坯量
 			LambdaQueryWrapper<RollClubThree> queryWrapper1 = new LambdaQueryWrapper<>();
 			queryWrapper1.eq(RollClubThree::getCcmNo, billetHotsend.getCcmNo())
 					.eq(RollClubThree::getHeatNo, billetHotsend.getHeatNo())
@@ -624,7 +629,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubThreeDetails.setSize(String.valueOf(x.getLength()));
 				rollClubThreeDetails.setSteel(x.getGrade());
 				rollClubThreeDetails.setCreateTime(new Date());
-				rollClubThreeDetails.setUpdateTime(new Date());
+				rollClubThreeDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollClubThreeDetailsList.add(rollClubThreeDetails);
 			});
 			rollClubThreeDetailsService.saveBatch(rollClubThreeDetailsList);
@@ -641,6 +646,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			rollHeight.setSize(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getLength())); //定尺
 			rollHeight.setSteel(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getGrade())); //钢种
 			rollHeight.setSpec(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getSpec())); //规格
+			rollHeight.setBlankOutput(rollClubCommonList.stream().findFirst().orElse(null).getBilletWeight());//出坯量
 			LambdaQueryWrapper<RollHeight> queryWrapper1 = new LambdaQueryWrapper<>();
 			queryWrapper1.eq(RollHeight::getCcmNo, billetHotsend.getCcmNo())
 					.eq(RollHeight::getHeatNo, billetHotsend.getHeatNo())
@@ -669,7 +675,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollHeightDetails.setSize(String.valueOf(x.getLength()));
 				rollHeightDetails.setSteel(x.getGrade());
 				rollHeightDetails.setCreateTime(new Date());
-				rollHeightDetails.setUpdateTime(new Date());
+				rollHeightDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollHeightDetailsList.add(rollHeightDetails);
 			});
 			rollHeightDetailsService.saveBatch(rollHeightDetailsList);
@@ -687,6 +693,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			rollOutShipp.setSize(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getLength())); //定尺
 			rollOutShipp.setSteel(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getGrade())); //钢种
 			rollOutShipp.setSpec(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getSpec())); //规格
+			rollOutShipp.setBlankOutput(rollClubCommonList.stream().findFirst().orElse(null).getBilletWeight());//出坯量
 			LambdaQueryWrapper<RollOutShipp> queryWrapper1 = new LambdaQueryWrapper<>();
 			queryWrapper1.eq(RollOutShipp::getCcmNo, billetHotsend.getCcmNo())
 					.eq(RollOutShipp::getHeatNo, billetHotsend.getHeatNo())
@@ -715,6 +722,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollOutShippDetails.setSize(String.valueOf(x.getLength()));
 				rollOutShippDetails.setSteel(x.getGrade());
 				rollOutShippDetails.setCreateTime(new Date());
+				rollOutShippDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollOutShippDetailsList.add(rollOutShippDetails);
 			});
 			rollOutShippDetailsService.saveBatch(rollOutShippDetailsList);

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

@@ -106,4 +106,9 @@ public class RollClubOneDetails implements Serializable {
     @Excel(name = "车牌号", width = 15)
     @ApiModelProperty(value = "车牌号")
     private String licensePlate;
+
+    /**出坯量*/
+    @Excel(name = "出坯量", width = 15)
+    @ApiModelProperty(value = "出坯量")
+    private Double blankOutput;
 }

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

@@ -125,4 +125,8 @@ public class RollClubThreeDetails implements Serializable {
     @Excel(name = "车牌号", width = 15)
     @ApiModelProperty(value = "车牌号")
     private String licensePlate;
+    /**出坯量*/
+    @Excel(name = "出坯量", width = 15)
+    @ApiModelProperty(value = "出坯量")
+    private Double blankOutput;
 }

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

@@ -125,4 +125,8 @@ public class RollClubTwoDetails implements Serializable {
     @Excel(name = "车牌号", width = 15)
     @ApiModelProperty(value = "车牌号")
     private String licensePlate;
+    /**出坯量*/
+    @Excel(name = "出坯量", width = 15)
+    @ApiModelProperty(value = "出坯量")
+    private Double blankOutput;
 }

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

@@ -106,4 +106,8 @@ public class RollHeightDetails implements Serializable {
     @Excel(name = "车牌号", width = 15)
     @ApiModelProperty(value = "车牌号")
     private String licensePlate;
+    /**出坯量*/
+    @Excel(name = "出坯量", width = 15)
+    @ApiModelProperty(value = "出坯量")
+    private Double blankOutput;
 }

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

@@ -125,4 +125,9 @@ public class RollOutShippDetails implements Serializable {
     @Excel(name = "车牌号", width = 15)
     @ApiModelProperty(value = "车牌号")
     private String licensePlate;
+
+    /**出坯量*/
+    @Excel(name = "出坯量", width = 15)
+    @ApiModelProperty(value = "出坯量")
+    private Double blankOutput;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -633,6 +633,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollClubTwoDetails.setCreateTime(new Date());
                 rollClubTwoDetails.setUpdateTime(new Date());
                 rollClubTwoDetails.setId(String.valueOf(IdWorker.getId()));
+                rollClubTwoDetails.setBlankOutput(billetBasicInfo.getBilletWeight());//出坯量
                 addRollClubTwoDetailsList.add(rollClubTwoDetails);
             }else if ("roll_club_three".equals(loadingParams.getDestinationTable())){
                 RollClubThreeDetails rollClubThreeDetails = new RollClubThreeDetails();
@@ -648,6 +649,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollClubThreeDetails.setCreateTime(new Date());
                 rollClubThreeDetails.setUpdateTime(new Date());
                 rollClubThreeDetails.setId(String.valueOf(IdWorker.getId()));
+                rollClubThreeDetails.setBlankOutput(billetBasicInfo.getBilletWeight());//出坯量
                 addRollClubThreeDetailsList.add(rollClubThreeDetails);
             }else if ("roll_out_shipp".equals(loadingParams.getDestinationTable())){
                 RollOutShippDetails rollOutShippDetails = new RollOutShippDetails();
@@ -663,6 +665,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollOutShippDetails.setId(String.valueOf(IdWorker.getId()));
                 rollOutShippDetails.setCreateTime(new Date());
                 rollOutShippDetails.setUpdateTime(new Date());
+                rollOutShippDetails.setBlankOutput(billetBasicInfo.getBilletWeight());//出坯量
                 addRollOutShippDetailsList.add(rollOutShippDetails);
             }
         });