采购计划：建立计划和报价的关联

@@ -1928,6 +1928,7 @@ CREATE TABLE `procurement_plan`
     `frozen`                             tinyint(1)     NOT NULL DEFAULT 0 COMMENT '是否冻结 0否 1是',
     `plan_type`                          varchar(50)    DEFAULT NULL COMMENT '计划类型： 补、变、补 变',
     `workshop_id`                        varchar(50)    DEFAULT NULL COMMENT '分厂ID',
+    `salesman_quotation_id`              varchar(32)    DEFAULT NULL COMMENT '关联业务员报价单ID',
     `attachment_file_ids`                text           DEFAULT NULL COMMENT '附件文件ID集合',
     `attachment_file_names`              text           DEFAULT NULL COMMENT '附件文件名称集合',
     `create_by_id`                       varchar(32)    DEFAULT NULL COMMENT '创建人ID',
@@ -1945,7 +1946,8 @@ CREATE TABLE `procurement_plan`
     KEY                                  `idx_pp_create_time` (`create_time`),
     KEY                                  `idx_pp_process_status` (`process_status`),
     KEY                                  `idx_pp_process_node` (`process_node`),
-    KEY                                  `idx_pp_workshop_id` (`workshop_id`)
+    KEY                                  `idx_pp_workshop_id` (`workshop_id`),
+    KEY                                  `idx_pp_salesman_quotation_id` (`salesman_quotation_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='采购计划主表';
 
 CREATE TABLE `procurement_plan_line`
@@ -1961,6 +1963,7 @@ CREATE TABLE `procurement_plan_line`
     `coordination_range`       decimal(18, 10) DEFAULT NULL COMMENT '协调幅度',
     `estimated_loss`           decimal(18, 10) DEFAULT NULL COMMENT '买断料预计损耗',
     `application_attrition`    decimal(18, 10) DEFAULT NULL COMMENT '申请损耗(%)',
+    `paint_damage_ratio`       decimal(18, 10) DEFAULT NULL COMMENT '漆损率(%)',
     `workshop_id`              varchar(50)     DEFAULT NULL COMMENT '分厂',
     `item_id`                  varchar(32)    NOT NULL COMMENT '前端行标识',
     `create_by_id`             varchar(32)     DEFAULT NULL COMMENT '创建人ID',

@@ -345,6 +345,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   private String workshopId;
 
   /**
+   * 关联业务员报价单ID
+   */
+  @ApiModelProperty("关联业务员报价单ID")
+  private String salesmanQuotationId;
+
+  /**
    * 附件文件ID集合
    */
   @ApiModelProperty("附件文件ID集合")
@@ -495,6 +501,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
     private BigDecimal applicationAttrition;
 
     /**
+     * 漆损率(%)
+     */
+    @ApiModelProperty("漆损率(%)")
+    private BigDecimal paintDamageRatio;
+
+    /**
      * 分厂
      */
     @ApiModelProperty("分厂")

@@ -288,6 +288,11 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private String workshopId;
 
   /**
+   * 关联业务员报价单ID
+   */
+  private String salesmanQuotationId;
+
+  /**
    * 附件文件ID集合
    */
   private String attachmentFileIds;

@@ -72,6 +72,11 @@ public class ProcurementPlanLine extends BaseEntity implements BaseDto {
   private BigDecimal applicationAttrition;
 
   /**
+   * 漆损率(%)
+   */
+  private BigDecimal paintDamageRatio;
+
+  /**
    * 分厂
    */
   private String workshopId;

@@ -771,6 +771,8 @@ public class SalesmanQuotationServiceImpl
         vo.setMaterialConditionPhosphorCopper(normalizeMaterialText(enabled, salesmanQuotation.getMaterialConditionPhosphorCopper()));
         vo.setProcessStatus("TO_SUPPLEMENT");
         vo.setProcessNode("GYGLKJHGLY");
+        // 关联业务员报价单ID（生成计划时关联回写，可反向溯源）
+        vo.setSalesmanQuotationId(id);
 
         // 明细行：按报价明细逐行带入
         List<ProcurementPlanLineVo> lineVoList = new ArrayList<>();
@@ -808,6 +810,8 @@ public class SalesmanQuotationServiceImpl
             }
             lineVo.setCoordinationRange(coordinationRange);
             lineVo.setApplicationAttrition(line.getApplicationAttrition());
+            // 漆损率：从报价明细带过来
+            lineVo.setPaintDamageRatio(line.getPaintDamageRatio());
             lineVo.setItemId(line.getItemId());
             lineVoList.add(lineVo);
         }

@@ -328,6 +328,12 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable {
   private String workshopId;
 
   /**
+   * 关联业务员报价单ID
+   */
+  @ApiModelProperty("关联业务员报价单ID")
+  private String salesmanQuotationId;
+
+  /**
    * 明细信息
    */
   @ApiModelProperty(value = "明细信息", required = true)

@@ -90,6 +90,13 @@ public class ProcurementPlanLineVo implements BaseVo, Serializable {
     private BigDecimal applicationAttrition;
 
     /**
+     * 漆损率(%)
+     */
+    @ApiModelProperty("漆损率(%)")
+    @Digits(integer = 8, fraction = 10, message = "漆损率最多支持8位整数和10位小数！")
+    private BigDecimal paintDamageRatio;
+
+    /**
      * 分厂
      */
     @ApiModelProperty("分厂")

@@ -14,6 +14,7 @@
         <result column="coordination_range" property="coordinationRange"/>
         <result column="estimated_loss" property="estimatedLoss"/>
         <result column="application_attrition" property="applicationAttrition"/>
+        <result column="paint_damage_ratio" property="paintDamageRatio"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="item_id" property="itemId"/>
         <result column="create_by_id" property="createById"/>
@@ -37,6 +38,7 @@
             ppl.coordination_range,
             ppl.estimated_loss,
             ppl.application_attrition,
+            ppl.paint_damage_ratio,
             ppl.workshop_id,
             ppl.item_id,
             ppl.create_by_id,

@@ -56,6 +56,7 @@
         <result column="frozen" property="frozen"/>
         <result column="plan_type" property="planType"/>
         <result column="workshop_id" property="workshopId"/>
+        <result column="salesman_quotation_id" property="salesmanQuotationId"/>
         <result column="attachment_file_ids" property="attachmentFileIds"/>
         <result column="attachment_file_names" property="attachmentFileNames"/>
         <result column="create_by_id" property="createById"/>
@@ -121,6 +122,7 @@
             pp.frozen,
             pp.plan_type,
             pp.workshop_id,
+            pp.salesman_quotation_id,
             pp.attachment_file_ids,
             pp.attachment_file_names,
             pp.create_by_id,