Merge remote-tracking branch 'origin/main'

business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java

@@ -313,4 +313,8 @@ public class CrmPdiPlan implements Serializable {
 
     @Schema(description = "原卷号")
     private String originCoilid;
+
+    //锌层厚度 zinc_coating_thickness
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
 }

business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
@@ -130,4 +131,7 @@ public class CrmPdoExcoil implements Serializable {
 
     @Schema(description = "计划来源：L3-L3计划，MANUAL-人工")
     private String planOrigin;
+
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
 }

business/src/main/java/com/fizz/business/dto/PdiPlanSubDTO.java

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 子计划数据
@@ -57,4 +58,7 @@ public class PdiPlanSubDTO implements Serializable {
 
     @Schema(description = "实际重量")
     private Double actualWeight;
+
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
 }

business/src/main/java/com/fizz/business/dto/PdoExCoilSubDTO.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -71,4 +72,7 @@ public class PdoExCoilSubDTO implements Serializable {
 
     @Schema(description = "结束时间")
     private LocalDateTime endTime;
+
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
 }

business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java

@@ -115,5 +115,5 @@ public class CrmPdiPlanForm {
     private BigDecimal tailendGaugeLength; // 尾端测厚长度(mm)
     private String origin; // 产地
     private String originCoilid; // 原卷号
-
+    private BigDecimal zincCoatingThickness;//锌层厚度
 }

business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java

@@ -3,6 +3,7 @@ package com.fizz.business.form;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -18,4 +19,7 @@ public class CrmPdoExcoilForm {
     @Schema(description = "结束日期")
     private String endDate;
 
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
+
 }

business/src/main/java/com/fizz/business/service/impl/PdoExCoilServiceImpl.java

@@ -50,7 +50,7 @@ public class PdoExCoilServiceImpl implements PdoExCoilService {
 
         double aimWeightTop = 1;
         double aimWeightBottom = 1;
-
+        pdoExCoilDTO.setZincCoatingThickness(plan.getZincCoatingThickness());
         pdoExCoilDTO.setPlanOrigin(plan.getUnitCode());
         pdoExCoilDTO.setUnitCode(plan.getUnitCode());
         pdoExCoilDTO.setProcessCode(SYSTEM_MODULE);

business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java

@@ -311,4 +311,7 @@ public class CrmPdiPlanVO {
 
     @Schema(description = "原卷号")
     private String originCoilid;
+
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
 }

business/src/main/java/com/fizz/business/vo/PdiPlanSetupInfoVO.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -145,4 +146,7 @@ public class PdiPlanSetupInfoVO {
     @Schema(description = "设定值列表")
     List<ModSetupResultVO> lists;
 
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
+
 }

business/src/main/java/com/fizz/business/vo/PdiPlanVO.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -157,4 +158,7 @@ public class PdiPlanVO implements Serializable {
 
     @Schema(description = "实验类别")
     private String experimentType;
+
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
 }

business/src/main/java/com/fizz/business/vo/Plan2PdoVO.java

@@ -3,6 +3,7 @@ package com.fizz.business.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 
@@ -80,5 +81,8 @@ public class Plan2PdoVO {
     @Schema(description = "热卷温度")
     private Double hotCoilTemp;
 
+    @Schema(description = "锌层厚度")
+    private BigDecimal zincCoatingThickness;
+
 
 }