采购计划：正常变更审核通过后数据逻辑处理

@@ -1936,6 +1936,7 @@ CREATE TABLE `procurement_plan`
     `attachment_file_names`              text           DEFAULT NULL COMMENT '附件文件名称集合',
     `change_status`                      varchar(50)    DEFAULT NULL COMMENT '变更状态 CHANGING 变更中 CHANGED 变更完成',
     `replenishment_status`               varchar(50)    DEFAULT NULL COMMENT '补单状态 REPLENISHING 补单中 REPLENISHED 补单完成',
+    `deleted`                            tinyint(1)     NOT NULL DEFAULT 0 COMMENT '是否删除 0否 1是',
     `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',

@@ -394,6 +394,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   private String attachmentFileNames;
 
   /**
+   * 删除标记 true=已删除（变更归档原始数据）false=正常数据
+   */
+  @ApiModelProperty("删除标记")
+  private Boolean deleted;
+
+  /**
    * 创建人ID
    */
   @ApiModelProperty("创建人ID")

@@ -325,6 +325,11 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private String attachmentFileNames;
 
   /**
+   * 删除标记 true=已删除（变更归档原始数据）false=正常数据
+   */
+  private Boolean deleted;
+
+  /**
    * 是否展示审核按钮(非持久化字段)
    */
   @TableField(exist = false)

@@ -21,6 +21,8 @@ import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.entity.SysRole;
 import com.lframework.starter.web.inner.service.system.SysRoleService;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanChangeBo;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanChangeLineBo;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
@@ -40,6 +42,9 @@ import com.lframework.xingyun.sc.procurement.vo.change.CreateProcurementPlanChan
 import com.lframework.xingyun.sc.procurement.vo.change.QueryProcurementPlanChangeVo;
 import com.lframework.xingyun.sc.procurement.vo.change.UpdateProcurementPlanChangeLineVo;
 import com.lframework.xingyun.sc.procurement.vo.change.UpdateProcurementPlanChangeVo;
+import com.lframework.xingyun.sc.procurement.vo.plan.CreateProcurementPlanVo;
+import com.lframework.xingyun.sc.procurement.vo.plan.ProcurementPlanLineVo;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -67,6 +72,8 @@ public class ProcurementPlanChangeServiceImpl extends
   private ProcurementPlanLineService procurementPlanLineService;
   @Resource
   private ProcurementBuyoutApplyService procurementBuyoutApplyService;
+  @Resource
+  private WorkshopService workshopService;
 
 
   private static final List<String> PROCESS_STATUSES = Arrays.asList(
@@ -404,11 +411,173 @@ public class ProcurementPlanChangeServiceImpl extends
               .eq(ProcurementPlanChange::getId, id);
       getBaseMapper().update(updateWrapper);
 
-      Wrapper<ProcurementPlan> parentWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
+      // 变更审核通过流程
+      String planId = entity.getProcurementPlanId();
+      // 原主计划（不带deleted筛选，因为归档/已有的都要读）
+      ProcurementPlan mainPlan = procurementPlanService.getById(planId);
+      if (mainPlan == null) {
+        throw new DefaultClientException("原采购计划不存在！");
+      }
+
+      // 1) 第一次变更时：将"原主计划+原始子计划"复制一份到 deleted=true（只保留一次，多次变更仅第一次归档）
+      int existDeletedCount = procurementPlanService.count(Wrappers.lambdaQuery(ProcurementPlan.class)
+              .eq(ProcurementPlan::getCode, mainPlan.getCode() + "_HIST")
+              .eq(ProcurementPlan::getDeleted, Boolean.TRUE));
+      if (existDeletedCount == 0L) {
+        // 归档主计划（ID新生成，deleted=true，保持原code以区分，加后缀_HIST避免唯一索引冲突）
+        ProcurementPlan archivedMain = BeanUtil.copyProperties(mainPlan, ProcurementPlan.class);
+        archivedMain.setId(IdUtil.getId());
+        archivedMain.setCode(mainPlan.getCode() + "_HIST");
+        archivedMain.setDeleted(Boolean.TRUE);
+        procurementPlanService.save(archivedMain);
+        // 原主计划子表也复制一份
+        List<ProcurementPlanLine> mainLines = procurementPlanLineService.getByProcurementPlanId(planId);
+        if (CollectionUtil.isNotEmpty(mainLines)) {
+          List<ProcurementPlanLine> archivedMainLines = new ArrayList<>();
+          for (ProcurementPlanLine line : mainLines) {
+            ProcurementPlanLine nLine = BeanUtil.copyProperties(line, ProcurementPlanLine.class);
+            nLine.setId(IdUtil.getId());
+            nLine.setProcurementPlanId(archivedMain.getId());
+            archivedMainLines.add(nLine);
+          }
+          procurementPlanLineService.saveBatch(archivedMainLines);
+        }
+      }
+      // 2) 冻结现有子计划(_01 _02)
+      List<ProcurementPlan> existSubList = procurementPlanService.listSubPlan(planId);
+      if (CollectionUtil.isNotEmpty(existSubList)) {
+        // 子计划批量设 frozen=true
+        List<String> existSubIds = existSubList.stream().map(ProcurementPlan::getId).collect(Collectors.toList());
+        procurementPlanService.update(Wrappers.lambdaUpdate(ProcurementPlan.class)
+                .set(ProcurementPlan::getFrozen, Boolean.TRUE)
+                .in(ProcurementPlan::getId, existSubIds));
+      }
+
+      // 3) 同步变更内容到主计划（主计划本身字段+明细行）
+      //   3.1 主计划主表字段：从变更单拷贝（除id/code/procurementPlanId外）
+      ProcurementPlan updatedMain = new ProcurementPlan();
+      BeanUtil.copyProperties(entity, updatedMain, "id", "code", "procurementPlanId", "processStatus", "processNode",
+              "approvalStatus", "changeReason", "changeStatus", "planType", "deleted", "frozen",
+              "createById", "createBy", "createTime", "updateById", "updateBy", "updateTime");
+      // 重新计算明细合计数量
+      List<ProcurementPlanChangeLine> changeLines = procurementPlanChangeLineService.getByChangeId(id);
+      BigDecimal totalQuantity = BigDecimal.ZERO;
+      if (CollectionUtil.isNotEmpty(changeLines)) {
+        for (ProcurementPlanChangeLine cl : changeLines) {
+          if (cl.getQuantity() != null) {
+            totalQuantity = totalQuantity.add(cl.getQuantity());
+          }
+        }
+      }
+      updatedMain.setTotalQuantity(totalQuantity);
+      // 变更完成状态
+      updatedMain.setChangeStatus("CHANGED");
+      updatedMain.setProcessNode(null);
+      procurementPlanService.update(Wrappers.lambdaUpdate(ProcurementPlan.class)
+              .setEntity(updatedMain)
+              .eq(ProcurementPlan::getId, planId));
+
+      //   3.2 主计划明细：先删后插（保留历史deleted=true的不管）
+      procurementPlanLineService.remove(Wrappers.lambdaQuery(ProcurementPlanLine.class)
+              .eq(ProcurementPlanLine::getProcurementPlanId, planId));
+      if (CollectionUtil.isNotEmpty(changeLines)) {
+        List<ProcurementPlanLine> newLines = new ArrayList<>();
+        for (ProcurementPlanChangeLine cl : changeLines) {
+          ProcurementPlanLine nl = BeanUtil.copyProperties(cl, ProcurementPlanLine.class);
+          nl.setId(IdUtil.getId());
+          nl.setProcurementPlanId(planId);
+          newLines.add(nl);
+        }
+        procurementPlanLineService.saveBatch(newLines);
+      }
+
+      // 4) 根据变更后明细的分厂分组，从_(N+1)开始生成新子计划
+      // 确定下一个子计划后缀：现有最大编号 +1
+      int nextSuffix = 1;
+      if (CollectionUtil.isNotEmpty(existSubList)) {
+        int maxSuf = 0;
+        for (ProcurementPlan s : existSubList) {
+          String c = s.getCode();
+          if (c != null && c.contains("_")) {
+            String suf = c.substring(c.lastIndexOf("_") + 1);
+            try {
+              maxSuf = Math.max(maxSuf, Integer.parseInt(suf));
+            } catch (Exception ignore) {
+              // 忽略非数字后缀
+            }
+          }
+        }
+        nextSuffix = maxSuf + 1;
+      }
+
+      // 按分厂分组明细
+      if (CollectionUtil.isNotEmpty(changeLines)) {
+        // workshopId -> workshop code
+        List<String> allWorkshopIds = changeLines.stream()
+                .map(ProcurementPlanChangeLine::getWorkshopId)
+                .filter(StringUtil::isNotBlank)
+                .distinct()
+                .collect(Collectors.toList());
+        Map<String, String> workshop2Code = new HashMap<>();
+        if (CollectionUtil.isNotEmpty(allWorkshopIds)) {
+          List<Workshop> workshopList = workshopService.listByIds(allWorkshopIds);
+          if (CollectionUtil.isNotEmpty(workshopList)) {
+            workshop2Code = workshopList.stream()
+                    .filter(w -> StringUtil.isNotBlank(w.getCode()))
+                    .collect(Collectors.toMap(Workshop::getId, Workshop::getCode, (v1, v2) -> v1));
+          }
+        }
+        // 分厂顺序
+        Map<String, Integer> workOrderMap = new LinkedHashMap<>();
+        workOrderMap.put("yfc", 1);
+        workOrderMap.put("efc", 2);
+        workOrderMap.put("sfc", 3);
+        workOrderMap.put("ztfc", 4);
+        Map<String, List<ProcurementPlanChangeLine>> workshopLines = new LinkedHashMap<>();
+        for (ProcurementPlanChangeLine cl : changeLines) {
+          String code = workshop2Code.getOrDefault(cl.getWorkshopId(), "");
+          workshopLines.computeIfAbsent(code, k -> new ArrayList<>()).add(cl);
+        }
+        List<Map.Entry<String, List<ProcurementPlanChangeLine>>> sortedEntries = workshopLines.entrySet().stream()
+                .sorted(Comparator.comparingInt(e -> workOrderMap.getOrDefault(e.getKey(), Integer.MAX_VALUE)))
+                .collect(Collectors.toList());
+
+        for (Map.Entry<String, List<ProcurementPlanChangeLine>> entry : sortedEntries) {
+          List<ProcurementPlanChangeLine> wLines = entry.getValue();
+          if (CollectionUtil.isEmpty(wLines)) {
+            continue;
+          }
+          String suffixStr = String.format("%02d", nextSuffix);
+          String subCode = mainPlan.getCode() + "_" + suffixStr;
+          nextSuffix++;
+
+          CreateProcurementPlanVo subVo = BeanUtil.copyProperties(entity, CreateProcurementPlanVo.class);
+          subVo.setCode(subCode);
+          subVo.setParentId(planId);
+          subVo.setProcessStatus("COMPLETED");
+          subVo.setProcessNode(null);
+          subVo.setWorkshopId(CollectionUtil.isNotEmpty(wLines) ? wLines.get(0).getWorkshopId() : null);
+
+          List<ProcurementPlanLineVo> subLineVos = new ArrayList<>();
+          for (ProcurementPlanChangeLine cl : wLines) {
+            ProcurementPlanLineVo lv = BeanUtil.copyProperties(cl, ProcurementPlanLineVo.class);
+            subLineVos.add(lv);
+          }
+          subVo.setProcurementPlanLineList(subLineVos);
+          // createSubPlan 内部会保存主表+明细+自动生成买断申请单
+          procurementPlanService.createSubPlan(subVo);
+        }
+      }
+
+      // 5) 主计划标记冻结
+      procurementPlanService.update(Wrappers.lambdaUpdate(ProcurementPlan.class)
+              .set(ProcurementPlan::getFrozen, Boolean.TRUE)
               .set(ProcurementPlan::getChangeStatus, "CHANGED")
-              .eq(ProcurementPlan::getId, entity.getProcurementPlanId());
-      procurementPlanService.update(parentWrapper);
-      //todo 拆分分厂、生产买断操作申请单、生成合同,生成一份原始的计划数据（第一次变更）
+              .set(ProcurementPlan::getProcessStatus, "COMPLETED")
+              .set(ProcurementPlan::getProcessNode, null)
+              .eq(ProcurementPlan::getId, planId));
+
+      //todo 废弃原合同；生成新合同
     } else if ("REFUSE".equals(approvalStatus)) {
       List<SysRole> roles = sysRoleService.getByUserId(entity.getCreateById());
       List<String> roleCodes = CollectionUtil.isEmpty(roles) ? new java.util.ArrayList<>()

@@ -223,7 +223,7 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
    * @param procurementPlanId 采购计划ID
    * @param lineList          明细列表
    */
-  private void saveOrUpdateLines(String procurementPlanId, List<ProcurementPlanUpdateLineVo> lineList) {
+  public void saveOrUpdateLines(String procurementPlanId, List<ProcurementPlanUpdateLineVo> lineList) {
     List<ProcurementPlanLine> oldLineList = procurementPlanLineService
         .getByProcurementPlanId(procurementPlanId);
     Map<String, ProcurementPlanLine> oldLineMap = CollectionUtil.isEmpty(oldLineList)
@@ -648,6 +648,17 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
     procurementBuyoutApplyService.create(buyoutApplyVo);
   }
 
+  @Override
+  public List<ProcurementPlan> listSubPlan(String parentId) {
+    if (StringUtil.isBlank(parentId)) {
+      return Collections.emptyList();
+    }
+    return this.list(Wrappers.lambdaQuery(ProcurementPlan.class)
+            .eq(ProcurementPlan::getParentId, parentId)
+            .eq(ProcurementPlan::getDeleted, false)
+            .orderByAsc(ProcurementPlan::getCode));
+  }
+
   /**
    * 生成采购计划编号（业务要求按日期时间生成，保证唯一）
    *

@@ -5,6 +5,7 @@ import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanBo;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
 import com.lframework.xingyun.sc.procurement.vo.plan.CreateProcurementPlanVo;
+import com.lframework.xingyun.sc.procurement.vo.plan.ProcurementPlanUpdateLineVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.QueryProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.UpdateProcurementPlanVo;
 import java.util.List;
@@ -85,6 +86,14 @@ public interface ProcurementPlanService extends BaseMpService<ProcurementPlan> {
   void update(UpdateProcurementPlanVo vo);
 
   /**
+   * 保存或更新采购计划明细
+   *
+   * @param procurementPlanId 采购计划id
+   * @param lineList          明细
+   */
+  void saveOrUpdateLines(String procurementPlanId, List<ProcurementPlanUpdateLineVo> lineList);
+
+  /**
    * 根据ID删除
    *
    * @param id
@@ -99,6 +108,21 @@ public interface ProcurementPlanService extends BaseMpService<ProcurementPlan> {
   void generateContract(String id);
 
   /**
+   * 子计划创建（不重新buildPlanCode，code=父code+_+后缀）
+   *
+   * @param vo
+   */
+  void createSubPlan(CreateProcurementPlanVo vo);
+
+  /**
+   * 根据主计划ID查询所有子计划（按code升序）
+   *
+   * @param parentId 主计划ID
+   * @return
+   */
+  List<ProcurementPlan> listSubPlan(String parentId);
+
+  /**
    * 提交
    *
    * @param id

@@ -63,6 +63,7 @@
         <result column="salesman_quotation_id" property="salesmanQuotationId"/>
         <result column="attachment_file_ids" property="attachmentFileIds"/>
         <result column="attachment_file_names" property="attachmentFileNames"/>
+        <result column="deleted" property="deleted"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -133,6 +134,7 @@
             pp.salesman_quotation_id,
             pp.attachment_file_ids,
             pp.attachment_file_names,
+            pp.deleted,
             pp.create_by_id,
             pp.create_by,
             pp.update_by_id,
@@ -151,6 +153,7 @@
     <select id="query" resultMap="ProcurementPlan">
         <include refid="ProcurementPlan_sql"/>
         <where>
+            AND pp.deleted = 0
             <if test="vo != null">
                 <if test="vo.code != null and vo.code != ''">
                     AND pp.code LIKE CONCAT('%', #{vo.code}, '%')
@@ -210,6 +213,7 @@
         <include refid="ProcurementPlan_sql"/>
         <where>
             pp.parent_id IS NULL
+            AND pp.deleted = 0
             AND NOT EXISTS (
                 SELECT 1 FROM procurement_plan p
                 WHERE p.id = pp.parent_id
@@ -277,6 +281,7 @@
             AND (pp.change_status = '' OR pp.change_status IS NULL OR pp.change_status = 'CHANGED')
             AND (pp.replenishment_status = '' OR pp.replenishment_status IS NULL OR pp.replenishment_status
             = 'REPLENISHED')
+            AND pp.deleted = 0
             AND NOT EXISTS (
                 SELECT 1 FROM procurement_plan p
                 WHERE p.id = pp.parent_id