采购：业务员报价-添加备注

@@ -1709,6 +1709,7 @@ CREATE TABLE `procurement_salesman_quotation`
     `coordination_reason`        varchar(200)    NOT NULL COMMENT '协调事由',
     `coordination_reason`        varchar(200)    NOT NULL COMMENT '协调事由',
     `invoice_type_status`        varchar(50)     NOT NULL COMMENT '票类状况',
     `invoice_type_status`        varchar(50)     NOT NULL COMMENT '票类状况',
     `total_quantity`             decimal(18, 5)  NOT NULL COMMENT '数量合计',
     `total_quantity`             decimal(18, 5)  NOT NULL COMMENT '数量合计',
+    `remark`                     varchar(1000)   DEFAULT NULL COMMENT '备注',
     `material_condition_enabled` bool            NOT NULL COMMENT '是否启用料质状况',
     `material_condition_enabled` bool            NOT NULL COMMENT '是否启用料质状况',
     `material_condition_copper_rice` varchar(500)         DEFAULT NULL COMMENT '铜米',
     `material_condition_copper_rice` varchar(500)         DEFAULT NULL COMMENT '铜米',
     `material_condition_bright_copper` varchar(500)       DEFAULT NULL COMMENT '光亮铜',
     `material_condition_bright_copper` varchar(500)       DEFAULT NULL COMMENT '光亮铜',

@@ -227,6 +227,11 @@ public class SalesmanQuotation extends BaseEntity implements BaseDto {
     private BigDecimal totalQuantity;
     private BigDecimal totalQuantity;
 
 
     /**
     /**
+     * 备注
+     */
+    private String remark;
+
+    /**
      * 审核状态
      * 审核状态
      */
      */
     private String approvalStatus;
     private String approvalStatus;

@@ -374,6 +374,7 @@ public class SalesmanQuotationServiceImpl
         data.setMaterialConditionWhiteYellow(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionWhiteYellow()));
         data.setMaterialConditionWhiteYellow(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionWhiteYellow()));
         data.setMaterialConditionPhosphorCopper(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionPhosphorCopper()));
         data.setMaterialConditionPhosphorCopper(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionPhosphorCopper()));
         data.setTotalQuantity(calculateTotalQuantity(vo.getQuotationLineList()));
         data.setTotalQuantity(calculateTotalQuantity(vo.getQuotationLineList()));
+        data.setRemark(vo.getRemark());
     }
     }
 
 
     /**
     /**
@@ -417,6 +418,7 @@ public class SalesmanQuotationServiceImpl
         data.setMaterialConditionWhiteYellow(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionWhiteYellow()));
         data.setMaterialConditionWhiteYellow(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionWhiteYellow()));
         data.setMaterialConditionPhosphorCopper(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionPhosphorCopper()));
         data.setMaterialConditionPhosphorCopper(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionPhosphorCopper()));
         data.setTotalQuantity(calculateTotalQuantity(vo.getQuotationLineList()));
         data.setTotalQuantity(calculateTotalQuantity(vo.getQuotationLineList()));
+        data.setRemark(vo.getRemark());
     }
     }
 
 
     /**
     /**

@@ -236,4 +236,12 @@ public class CreateSalesmanQuotationVo implements BaseVo, Serializable {
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")
     private String status;
     private String status;
 
 
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(max = 1000, message = "备注内容最多允许1000个字符！")
+    private String remark;
+
+
 }
 }

@@ -235,4 +235,11 @@ public class UpdateSalesmanQuotationVo implements BaseVo, Serializable {
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")
     private String status;
     private String status;
 
 
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(max = 1000, message = "备注内容最多允许1000个字符！")
+    private String remark;
+
 }
 }

@@ -45,6 +45,7 @@
         <result column="total_quantity" property="totalQuantity"/>
         <result column="total_quantity" property="totalQuantity"/>
         <result column="approval_status" property="approvalStatus"/>
         <result column="approval_status" property="approvalStatus"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -95,6 +96,7 @@
             tb.material_condition_white_yellow,
             tb.material_condition_white_yellow,
             tb.material_condition_phosphor_copper,
             tb.material_condition_phosphor_copper,
             tb.total_quantity,
             tb.total_quantity,
+            tb.remark,
             tb.approval_status,
             tb.approval_status,
             tb.status,
             tb.status,
             tb.create_by_id,
             tb.create_by_id,