采购计划：采购主计划分配分厂

@@ -1927,6 +1927,7 @@ CREATE TABLE `procurement_plan`
     `process_node`                       varchar(50)    DEFAULT NULL COMMENT '流程节点',
     `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',
     `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',
@@ -1941,7 +1942,8 @@ CREATE TABLE `procurement_plan`
     KEY                                  `idx_pp_quoter_id` (`quoter_id`),
     KEY                                  `idx_pp_create_time` (`create_time`),
     KEY                                  `idx_pp_process_status` (`process_status`),
-    KEY                                  `idx_pp_process_node` (`process_node`)
+    KEY                                  `idx_pp_process_node` (`process_node`),
+    KEY                                  `idx_pp_workshop_id` (`workshop_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='采购计划主表';
 
 CREATE TABLE `procurement_plan_line`

@@ -327,6 +327,24 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   private String processNode;
 
   /**
+   * 是否冻结 0否 1是
+   */
+  @ApiModelProperty("是否冻结 0否 1是")
+  private Boolean frozen;
+
+  /**
+   * 计划类型 正常 补单 变更 补单+变更
+   */
+  @ApiModelProperty("计划类型 正常 补单 变更 补单+变更")
+  private String planType;
+
+  /**
+   * 分厂ID
+   */
+  @ApiModelProperty("分厂ID")
+  private String workshopId;
+
+  /**
    * 创建人ID
    */
   @ApiModelProperty("创建人ID")

@@ -278,11 +278,16 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private Boolean frozen;
 
   /**
-   * 计划类型 补单 变更 补单+变更
+   * 计划类型 正常 补单 变更 补单+变更
    */
   private String planType;
 
   /**
+   * 分厂ID
+   */
+  private String workshopId;
+
+  /**
    * 创建人ID
    */
   @TableField(fill = FieldFill.INSERT)

@@ -299,6 +299,7 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
       LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
               .set(ProcurementPlan::getProcessNode, "GYGLKZG")
               .set(ProcurementPlan::getProcessStatus, "TO_SUBMIT_REVIEW")
+              .set(ProcurementPlan::getWorkshopId, allLines.get(0).getWorkshopId())
               .eq(ProcurementPlan::getId, id);
       getBaseMapper().update(updateWrapper);
       //todo 生成买断操作申请单
@@ -326,6 +327,8 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
       subVo.setParentId(mainPlan.getId());
       subVo.setProcessStatus("TO_SUBMIT_REVIEW");
       subVo.setProcessNode("GYGLKZG");
+      // 子计划的分厂就是当前组的明细分厂（同组内 workshopId 一样），直接赋值
+      subVo.setWorkshopId(CollectionUtil.isNotEmpty(factoryLines) ? factoryLines.get(0).getWorkshopId() : null);
 
       // 子明细：只保留当前分厂，workshopId 保持原明细的，其它字段按原明细 copy
       List<ProcurementPlanLineVo> subLineVoList = new ArrayList<>();

@@ -318,8 +318,14 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable {
   /**
    * 计划类型 正常 补单 变更 补单+变更
    */
-  @ApiModelProperty("计划类型 补单 变更 补单+变更")
-  private String planType;
+  @ApiModelProperty("计划类型 正常 补单 变更 补单+变更")
+  private String planType = "正常";
+
+  /**
+   * 分厂ID
+   */
+  @ApiModelProperty("分厂ID")
+  private String workshopId;
 
   /**
    * 明细信息

@@ -81,4 +81,10 @@ public class QueryProcurementPlanVo extends SortPageVo {
    */
   @ApiModelProperty("计划类型：补、变、补 变")
   private String planType;
+
+  /**
+   * 分厂ID
+   */
+  @ApiModelProperty("分厂ID")
+  private String workshopId;
 }

@@ -323,6 +323,12 @@ public class UpdateProcurementPlanVo implements BaseVo, Serializable {
   private String planType;
 
   /**
+   * 分厂ID
+   */
+  @ApiModelProperty("分厂ID")
+  private String workshopId;
+
+  /**
    * 明细信息
    */
   @ApiModelProperty(value = "明细信息", required = true)

@@ -55,6 +55,7 @@
         <result column="process_node" property="processNode"/>
         <result column="frozen" property="frozen"/>
         <result column="plan_type" property="planType"/>
+        <result column="workshop_id" property="workshopId"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -117,6 +118,7 @@
             pp.process_node,
             pp.frozen,
             pp.plan_type,
+            pp.workshop_id,
             pp.create_by_id,
             pp.create_by,
             pp.update_by_id,
@@ -175,6 +177,9 @@
                 <if test="vo.planType != null and vo.planType != ''">
                     AND pp.plan_type LIKE CONCAT('%', #{vo.planType}, '%')
                 </if>
+                <if test="vo.workshopId != null and vo.workshopId != ''">
+                    AND pp.workshop_id = #{vo.workshopId}
+                </if>
             </if>
         </where>
         ORDER BY pp.create_time DESC