采购计划：1：新增冻结状态，计划类型；2：生成合同

@@ -1925,6 +1925,8 @@ CREATE TABLE `procurement_plan`
     `approval_status`                    varchar(50)    DEFAULT NULL COMMENT '审核状态',
     `process_status`                     varchar(50)    DEFAULT NULL COMMENT '流程状态',
     `process_node`                       varchar(50)    DEFAULT NULL COMMENT '流程节点',
+    `frozen`                             tinyint(1)     NOT NULL DEFAULT 0 COMMENT '是否冻结 0否 1是',
+    `plan_type`                          varchar(50)    DEFAULT NULL COMMENT '计划类型： 补、变、补 变',
     `create_by_id`                       varchar(32)    DEFAULT NULL COMMENT '创建人ID',
     `create_by`                          varchar(64)    DEFAULT NULL COMMENT '创建人',
     `update_by_id`                       varchar(32)    DEFAULT NULL COMMENT '更新人ID',

@@ -107,6 +107,19 @@ public class ProcurementPlanController extends DefaultBaseController {
   }
 
   /**
+   * 生成合同
+   */
+  @ApiOperation("生成合同")
+  @HasPermission({"procurement:plan:modify"})
+  @PostMapping("/generateContract")
+  public InvokeResult<Void> generateContract(@Valid String id) {
+
+    procurementPlanService.generateContract(id);
+
+    return InvokeResultBuilder.success();
+  }
+
+  /**
    * 删除
    */
   @ApiOperation("删除")

@@ -273,6 +273,16 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private String processNode;
 
   /**
+   * 是否冻结 0否 1是
+   */
+  private Boolean frozen;
+
+  /**
+   * 计划类型 补单 变更 补单+变更
+   */
+  private String planType;
+
+  /**
    * 创建人ID
    */
   @TableField(fill = FieldFill.INSERT)

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.procurement.impl.plan;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
@@ -18,7 +19,6 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanBo;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanLine;
-import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
 import com.lframework.xingyun.sc.procurement.mappers.plan.ProcurementPlanMapper;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanLineService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService;
@@ -212,6 +212,21 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
     getBaseMapper().deleteById(id);
   }
 
+  @Transactional(rollbackFor = Exception.class)
+  @Override
+  public void generateContract(String id) {
+    if (StringUtil.isBlank(id)) {
+      throw new InputErrorException("ID不能为空！");
+    }
+    //todo 后面合同模块需要补充生成合同的逻辑
+    LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
+            .set(ProcurementPlan::getProcessNode, "GYGLKZLGLG")
+            .set(ProcurementPlan::getProcessStatus, "TO_SPLIT")
+            .eq(ProcurementPlan::getId, id);
+
+    getBaseMapper().update(updateWrapper);
+  }
+
   /**
    * 生成采购计划编号（业务要求按日期时间生成，保证唯一）
    *

@@ -770,27 +770,7 @@ public class SalesmanQuotationServiceImpl
         vo.setMaterialConditionWhiteYellow(normalizeMaterialText(enabled, salesmanQuotation.getMaterialConditionWhiteYellow()));
         vo.setMaterialConditionPhosphorCopper(normalizeMaterialText(enabled, salesmanQuotation.getMaterialConditionPhosphorCopper()));
         vo.setProcessStatus("TO_SUPPLEMENT");
-        List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
-        if (CollectionUtil.isNotEmpty(sysRoleList)) {
-            // 1. 提取角色列表中的所有 code，转换为 Set 集合，提升后续判断效率
-            Set<String> roleCodeSet = sysRoleList.stream()
-                    .map(SysRole::getCode)
-                    .collect(Collectors.toSet());
-
-            // 2. 判断是否包含采购主管相关的角色
-            if (roleCodeSet.contains("htcgeczg") || roleCodeSet.contains("htcgyczg")
-                    || roleCodeSet.contains("ltcgczg") || roleCodeSet.contains("ztcgczg")) {
-                vo.setProcessNode("CGCZG");
-            } else if (roleCodeSet.contains("qyjl")) {
-                // 3. 如果没有，继续判断是否包含区域经理
-                vo.setProcessNode("QYJL");
-            } else if (roleCodeSet.contains("nmcgkywy")) {
-                // 4. 如果还没有，继续判断是否包含内贸采购科业务员
-                vo.setProcessNode("YWY");
-            } else {
-                throw new DefaultClientException("当前角色无法生成计划！");
-            }
-        }
+        vo.setProcessNode("GYGLKJHGLY");
 
         // 明细行：按报价明细逐行带入
         List<ProcurementPlanLineVo> lineVoList = new ArrayList<>();

@@ -58,4 +58,11 @@ public interface ProcurementPlanService extends BaseMpService<ProcurementPlan> {
    * @param id
    */
   void deleteById(String id);
+
+  /**
+   * 生成合同
+   *
+   * @param id
+   */
+  void generateContract(String id);
 }

@@ -310,6 +310,18 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable {
   private String processNode;
 
   /**
+   * 是否冻结 0否 1是
+   */
+  @ApiModelProperty("是否冻结 0否 1是")
+  private Boolean frozen;
+
+  /**
+   * 计划类型 正常 补单 变更 补单+变更
+   */
+  @ApiModelProperty("计划类型 补单 变更 补单+变更")
+  private String planType;
+
+  /**
    * 明细信息
    */
   @ApiModelProperty(value = "明细信息", required = true)

@@ -69,4 +69,16 @@ public class QueryProcurementPlanVo extends SortPageVo {
    */
   @ApiModelProperty("流程节点")
   private String processNode;
+
+  /**
+   * 是否冻结 0否 1是
+   */
+  @ApiModelProperty("是否冻结 0否 1是")
+  private Boolean frozen;
+
+  /**
+   * 计划类型 正常 补单 变更 补单+变更
+   */
+  @ApiModelProperty("计划类型：补、变、补 变")
+  private String planType;
 }

@@ -311,6 +311,18 @@ public class UpdateProcurementPlanVo implements BaseVo, Serializable {
   private String processNode;
 
   /**
+   * 是否冻结 0否 1是
+   */
+  @ApiModelProperty("是否冻结 0否 1是")
+  private Boolean frozen;
+
+  /**
+   * 计划类型 补单 变更 补单+变更
+   */
+  @ApiModelProperty("计划类型 补单 变更 补单+变更")
+  private String planType;
+
+  /**
    * 明细信息
    */
   @ApiModelProperty(value = "明细信息", required = true)

@@ -53,6 +53,8 @@
         <result column="approval_status" property="approvalStatus"/>
         <result column="process_status" property="processStatus"/>
         <result column="process_node" property="processNode"/>
+        <result column="frozen" property="frozen"/>
+        <result column="plan_type" property="planType"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -113,6 +115,8 @@
             pp.approval_status,
             pp.process_status,
             pp.process_node,
+            pp.frozen,
+            pp.plan_type,
             pp.create_by_id,
             pp.create_by,
             pp.update_by_id,
@@ -165,6 +169,12 @@
                 <if test="vo.processNode != null and vo.processNode != ''">
                     AND pp.process_node = #{vo.processNode}
                 </if>
+                <if test="vo.frozen != null">
+                    AND pp.frozen = #{vo.frozen}
+                </if>
+                <if test="vo.planType != null and vo.planType != ''">
+                    AND pp.plan_type LIKE CONCAT('%', #{vo.planType}, '%')
+                </if>
             </if>
         </where>
         ORDER BY pp.create_time DESC