试样订单：合同物料行新增是否为试样订单字段

@@ -1216,3 +1216,11 @@ create table if not exists sample_feedback_tracking_detail(
     create_time datetime default now() comment '创建时间',
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
     update_time datetime default now() comment '更新时间'
 ) comment '样品反馈和追踪明细';
 ) comment '样品反馈和追踪明细';
+
+--合同物料行新增字段
+ALTER TABLE tbl_contract_std_processing_line
+    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+
+ALTER TABLE tbl_contract_distributor_line
+    ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
+

@@ -171,6 +171,12 @@ public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine
     @ApiModelProperty(value = "前端用ID")
     @ApiModelProperty(value = "前端用ID")
     private String itemId;
     private String itemId;
 
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
+
     public GetContractDistributorLineBo() {
     public GetContractDistributorLineBo() {
 
 
     }
     }

@@ -217,6 +217,12 @@ public class GetContractStdProcessingLineBo extends BaseBo<ContractStdProcessing
     @ApiModelProperty("前端用ID")
     @ApiModelProperty("前端用ID")
     private String itemId;
     private String itemId;
 
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
+
     public GetContractStdProcessingLineBo() {
     public GetContractStdProcessingLineBo() {
 
 
     }
     }

@@ -111,6 +111,11 @@ public class ContractDistributorLine extends BaseEntity implements BaseDto {
     private String itemId;
     private String itemId;
 
 
     /**
     /**
+     * 是否为试样订单
+     */
+    private Boolean sampleOrder;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -173,6 +173,11 @@ public class ContractStdProcessingLine extends BaseEntity implements BaseDto {
     private String itemId;
     private String itemId;
 
 
     /**
     /**
+     * 是否为试样订单
+     */
+    private Boolean sampleOrder;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -50,7 +50,6 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         return getBaseMapper().query(vo);
         return getBaseMapper().query(vo);
     }
     }
 
 
-    @Cacheable(value = ContractDistributorLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     @Override
     public ContractDistributorLine findById(String id) {
     public ContractDistributorLine findById(String id) {
 
 
@@ -87,6 +86,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         data.setLengthTolPos(vo.getLengthTolPos());
         data.setLengthTolPos(vo.getLengthTolPos());
         data.setLengthTolNeg(vo.getLengthTolNeg());
         data.setLengthTolNeg(vo.getLengthTolNeg());
         data.setItemId(vo.getItemId());
         data.setItemId(vo.getItemId());
+        data.setSampleOrder(vo.getSampleOrder());
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -130,6 +130,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
                 .set(ContractDistributorLine::getLengthTolPos, vo.getLengthTolPos())
                 .set(ContractDistributorLine::getLengthTolPos, vo.getLengthTolPos())
                 .set(ContractDistributorLine::getLengthTolNeg, vo.getLengthTolNeg())
                 .set(ContractDistributorLine::getLengthTolNeg, vo.getLengthTolNeg())
                 .set(ContractDistributorLine::getItemId, vo.getItemId())
                 .set(ContractDistributorLine::getItemId, vo.getItemId())
+                .set(ContractDistributorLine::getSampleOrder, vo.getSampleOrder())
                 .eq(ContractDistributorLine::getId, vo.getId());
                 .eq(ContractDistributorLine::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -50,7 +50,6 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
         return getBaseMapper().query(vo);
         return getBaseMapper().query(vo);
     }
     }
 
 
-    @Cacheable(value = ContractStdProcessingLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     @Override
     public ContractStdProcessingLine findById(String id) {
     public ContractStdProcessingLine findById(String id) {
 
 
@@ -148,6 +147,7 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
         if (!StringUtil.isBlank(vo.getItemId())) {
         if (!StringUtil.isBlank(vo.getItemId())) {
             data.setItemId(vo.getItemId());
             data.setItemId(vo.getItemId());
         }
         }
+        data.setSampleOrder(vo.getSampleOrder());
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -196,6 +196,7 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
                 .set(ContractStdProcessingLine::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
                 .set(ContractStdProcessingLine::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
                 .set(ContractStdProcessingLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(ContractStdProcessingLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(ContractStdProcessingLine::getItemId, StringUtil.isBlank(vo.getItemId()) ? null : vo.getItemId())
                 .set(ContractStdProcessingLine::getItemId, StringUtil.isBlank(vo.getItemId()) ? null : vo.getItemId())
+                .set(ContractStdProcessingLine::getSampleOrder, vo.getSampleOrder())
                 .eq(ContractStdProcessingLine::getId, vo.getId());
                 .eq(ContractStdProcessingLine::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -191,4 +191,10 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty(value = "前端用ID")
     @ApiModelProperty(value = "前端用ID")
     private String itemId;
     private String itemId;
+
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
 }
 }

@@ -224,5 +224,11 @@ public class CreateContractStdProcessingLineVo implements BaseVo, Serializable {
     @Length(message = "前端用ID最多允许50个字符！")
     @Length(message = "前端用ID最多允许50个字符！")
     private String itemId;
     private String itemId;
 
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
+
 }
 }
 
 

@@ -194,5 +194,11 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty(value = "前端用ID")
     @ApiModelProperty(value = "前端用ID")
     private String itemId;
     private String itemId;
+
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
 }
 }
 
 

@@ -232,4 +232,11 @@ public class UpdateContractStdProcessingLineVo implements BaseVo, Serializable {
     @Length(message = "前端用ID最多允许50个字符！")
     @Length(message = "前端用ID最多允许50个字符！")
     private String itemId;
     private String itemId;
 
 
+    /**
+     * 是否为试样订单
+     */
+    @ApiModelProperty(value = "是否为试样订单")
+    private Boolean sampleOrder;
+
+
 }
 }

@@ -33,6 +33,7 @@
         <result column="length_tol_pos" property="lengthTolPos"/>
         <result column="length_tol_pos" property="lengthTolPos"/>
         <result column="length_tol_neg" property="lengthTolNeg"/>
         <result column="length_tol_neg" property="lengthTolNeg"/>
         <result column="item_id" property="itemId"/>
         <result column="item_id" property="itemId"/>
+        <result column="sample_order" property="sampleOrder"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="ContractDistributorLine_sql">
     <sql id="ContractDistributorLine_sql">
@@ -65,7 +66,8 @@
                tb.width_tol_neg,
                tb.width_tol_neg,
                tb.length_tol_pos,
                tb.length_tol_pos,
                tb.length_tol_neg,
                tb.length_tol_neg,
-               tb.item_id
+               tb.item_id,
+               tb.sample_order
         FROM tbl_contract_distributor_line AS tb
         FROM tbl_contract_distributor_line AS tb
     </sql>
     </sql>
 
 

@@ -32,6 +32,7 @@
         <result column="delivery_date" property="deliveryDate"/>
         <result column="delivery_date" property="deliveryDate"/>
         <result column="show_order" property="showOrder"/>
         <result column="show_order" property="showOrder"/>
         <result column="item_id" property="itemId"/>
         <result column="item_id" property="itemId"/>
+        <result column="sample_order" property="sampleOrder"/>
         <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"/>
@@ -71,6 +72,7 @@
             tb.delivery_date,
             tb.delivery_date,
             tb.show_order,
             tb.show_order,
             tb.item_id,
             tb.item_id,
+            tb.sample_order,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,