报价：业务员报价-取消

@@ -1718,6 +1718,8 @@ CREATE TABLE `procurement_salesman_quotation`
     `material_condition_scrap` varchar(500)               DEFAULT NULL COMMENT '角料',
     `material_condition_scrap` varchar(500)               DEFAULT NULL COMMENT '角料',
     `material_condition_white_yellow` varchar(500)        DEFAULT NULL COMMENT '镀白黄',
     `material_condition_white_yellow` varchar(500)        DEFAULT NULL COMMENT '镀白黄',
     `material_condition_phosphor_copper` varchar(500)     DEFAULT NULL COMMENT '磷铜',
     `material_condition_phosphor_copper` varchar(500)     DEFAULT NULL COMMENT '磷铜',
+    `approval_status` varchar(50)                         DEFAULT NULL COMMENT '审核状态',
+    `status` varchar(50)                                  DEFAULT NULL COMMENT '状态',
     `create_by_id`               varchar(32)              DEFAULT NULL COMMENT '创建人ID',
     `create_by_id`               varchar(32)              DEFAULT NULL COMMENT '创建人ID',
     `create_by`                  varchar(64)              DEFAULT NULL COMMENT '创建人',
     `create_by`                  varchar(64)              DEFAULT NULL COMMENT '创建人',
     `update_by_id`               varchar(32)              DEFAULT NULL COMMENT '更新人ID',
     `update_by_id`               varchar(32)              DEFAULT NULL COMMENT '更新人ID',

@@ -105,4 +105,15 @@ public class SalesmanQuotationController extends DefaultBaseController {
         salesmanQuotationService.update(vo);
         salesmanQuotationService.update(vo);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"procure-manage:sales-price:cancel"})
+    @PostMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
+        salesmanQuotationService.cancel(id);
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -227,6 +227,16 @@ public class SalesmanQuotation extends BaseEntity implements BaseDto {
     private BigDecimal totalQuantity;
     private BigDecimal totalQuantity;
 
 
     /**
     /**
+     * 审核状态
+     */
+    private String approvalStatus;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
      * 报价明细列表
      * 报价明细列表
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

 package com.lframework.xingyun.sc.procurement.impl.quotation;
 package com.lframework.xingyun.sc.procurement.impl.quotation;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
@@ -20,6 +21,7 @@ import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.basedata.entity.BreedRelationship;
 import com.lframework.xingyun.basedata.entity.BreedRelationship;
 import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
 import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
+import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
@@ -187,6 +189,28 @@ public class SalesmanQuotationServiceImpl
     }
     }
 
 
     /**
     /**
+     * 取消
+     */
+    @OpLog(type = OtherOpLogType.class, name = "取消业务员报价，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void cancel(String id) {
+        SalesmanQuotation data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("业务员报价不存在！");
+        }
+        Wrapper<SalesmanQuotation> wrapper = Wrappers.lambdaUpdate(SalesmanQuotation.class)
+                .set(SalesmanQuotation::getApprovalStatus, CustomerDevelopStatus.CANCEL.name())
+                .eq(SalesmanQuotation::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(data);
+    }
+
+
+    /**
      * 构建新增实体
      * 构建新增实体
      *
      *
      * @param vo 新增参数
      * @param vo 新增参数

@@ -55,6 +55,11 @@ public interface SalesmanQuotationService extends BaseMpService<SalesmanQuotatio
     void update(UpdateSalesmanQuotationVo vo);
     void update(UpdateSalesmanQuotationVo vo);
 
 
     /**
     /**
+     * 取消
+     */
+    void cancel(String id);
+
+    /**
      * 生成编号
      * 生成编号
      *
      *
      * @return 编号
      * @return 编号

@@ -224,4 +224,16 @@ public class CreateSalesmanQuotationVo implements BaseVo, Serializable {
     @NotEmpty(message = "报价明细不能为空！")
     @NotEmpty(message = "报价明细不能为空！")
     private List<CreateSalesmanQuotationLineVo> quotationLineList;
     private List<CreateSalesmanQuotationLineVo> quotationLineList;
 
 
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String approvalStatus;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
 }
 }

@@ -62,4 +62,17 @@ public class QuerySalesmanQuotationVo extends PageVo implements BaseVo, Serializ
      */
      */
     @ApiModelProperty("报价时间结束")
     @ApiModelProperty("报价时间结束")
     private LocalDate quoteDateEnd;
     private LocalDate quoteDateEnd;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String approvalStatus;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
 }
 }

@@ -223,4 +223,16 @@ public class UpdateSalesmanQuotationVo implements BaseVo, Serializable {
     @NotEmpty(message = "报价明细不能为空！")
     @NotEmpty(message = "报价明细不能为空！")
     private List<UpdateSalesmanQuotationLineVo> quotationLineList;
     private List<UpdateSalesmanQuotationLineVo> quotationLineList;
 
 
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty("审核状态")
+    private String approvalStatus;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
 }
 }

@@ -43,6 +43,8 @@
         <result column="material_condition_white_yellow" property="materialConditionWhiteYellow"/>
         <result column="material_condition_white_yellow" property="materialConditionWhiteYellow"/>
         <result column="material_condition_phosphor_copper" property="materialConditionPhosphorCopper"/>
         <result column="material_condition_phosphor_copper" property="materialConditionPhosphorCopper"/>
         <result column="total_quantity" property="totalQuantity"/>
         <result column="total_quantity" property="totalQuantity"/>
+        <result column="approval_status" property="approvalStatus"/>
+        <result column="status" property="status"/>
         <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"/>
@@ -93,6 +95,8 @@
             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.approval_status,
+            tb.status,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,
@@ -132,6 +136,12 @@
             <if test="vo.quoteDateEnd != null">
             <if test="vo.quoteDateEnd != null">
                 AND DATE(tb.quote_time) <![CDATA[ <= ]]> #{vo.quoteDateEnd}
                 AND DATE(tb.quote_time) <![CDATA[ <= ]]> #{vo.quoteDateEnd}
             </if>
             </if>
+            <if test="vo.approvalStatus != null and vo.approvalStatus != ''">
+                AND tb.approval_status = #{vo.approvalStatus}
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
         </where>
         </where>
         ORDER BY tb.create_time DESC
         ORDER BY tb.create_time DESC
     </select>
     </select>