采购计划：问题修改

@@ -2111,7 +2111,6 @@ CREATE TABLE `procurement_plan_change`
     `create_time`                        datetime                DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_time`                        datetime                DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_ppc_code` (`code`),
     KEY                                  `idx_ppc_procurement_plan_id` (`procurement_plan_id`),
     KEY                                  `idx_ppc_company_short_id` (`company_short_id`),
     KEY                                  `idx_ppc_supplier_id` (`supplier_id`),
@@ -2210,7 +2209,6 @@ CREATE TABLE `procurement_plan_replenish`
     `update_by`                          VARCHAR(64)             DEFAULT NULL COMMENT '修改人（仅展示字段）',
     `update_time`                        DATETIME                DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_pp_replenish_code` (`code`),
     KEY                                  `idx_pp_replenish_plan_id` (`procurement_plan_id`),
     KEY                                  `idx_pp_replenish_status` (`approval_status`,`process_node`),
     KEY                                  `idx_pp_replenish_create_time` (`create_time`)

@@ -336,7 +336,7 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   /**
    * 计划类型 正常 补单 变更 补单+变更
    */
-  @ApiModelProperty("计划类型 正常 补单 变更 补单+变更")
+  @ApiModelProperty("计划类型 补单 变更 补单+变更")
   private String planType;
 
   /**
@@ -430,6 +430,18 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   private String purchaseDeptName;
 
   /**
+   * 是否展示审核按钮
+   */
+  @ApiModelProperty("是否展示审核按钮")
+  private Boolean showExamine;
+
+  /**
+   * 是否展示审核详情按钮
+   */
+  @ApiModelProperty("是否展示审核详情按钮")
+  private Boolean showExamineDetail;
+
+  /**
    * 审核通过时间（精确到时分秒）
    */
   @ApiModelProperty("审核通过时间")
@@ -599,18 +611,6 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
     private String workshopName;
 
     /**
-     * 是否展示审核按钮
-     */
-    @ApiModelProperty("是否展示审核按钮")
-    private Boolean showExamine = false;
-
-    /**
-     * 是否展示审核详情按钮
-     */
-    @ApiModelProperty("是否展示审核详情按钮")
-    private Boolean showExamineDetail;
-
-    /**
      * 创建人ID
      */
     @ApiModelProperty("创建人ID")

@@ -342,7 +342,7 @@ public class GetProcurementPlanChangeBo extends BaseBo<ProcurementPlanChange> {
    * 是否展示审核按钮(非持久化字段)
    */
   @ApiModelProperty("是否展示审核按钮")
-  private Boolean showExamine = false;
+  private Boolean showExamine;
 
   /**
    * 是否展示审核详情按钮(非持久化字段)

@@ -343,7 +343,7 @@ public class GetProcurementPlanReplenishBo extends BaseBo<ProcurementPlanRepleni
    * 是否展示审核按钮(非持久化字段)
    */
   @ApiModelProperty("是否展示审核按钮")
-  private Boolean showExamine = false;
+  private Boolean showExamine;
 
   /**
    * 是否展示审核详情按钮(非持久化字段)

@@ -316,7 +316,7 @@ public class ProcurementPlanChange extends BaseEntity implements BaseDto {
    * 是否展示审核按钮(非持久化字段)
    */
   @TableField(exist = false)
-  private Boolean showExamine = false;
+  private Boolean showExamine;
 
   /**
    * 是否展示审核详情按钮(非持久化字段)

@@ -8,7 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.InputErrorException;
 import com.lframework.starter.common.utils.Assert;
@@ -50,6 +54,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -76,6 +81,8 @@ public class ProcurementPlanChangeServiceImpl extends
   private ProcurementBuyoutApplyService procurementBuyoutApplyService;
   @Resource
   private WorkshopService workshopService;
+  @Resource
+  private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
   private static final List<String> PROCESS_STATUSES = Arrays.asList(
@@ -275,7 +282,7 @@ public class ProcurementPlanChangeServiceImpl extends
     BeanUtil.copyProperties(vo, planChange);
     this.updateById(planChange);
     //保存或更新采购计划变更单明细
-    saveOrUpdateLines(vo.getProcurementPlanId(), vo.getLines());
+    saveOrUpdateLines(vo.getId(), vo.getLines());
   }
 
   @Override
@@ -654,21 +661,66 @@ public class ProcurementPlanChangeServiceImpl extends
     try {
       //流程编码
       Object n = map.get("nodeCode");
-      String nodeCode = String.valueOf(n);
+      String nodeCode = n == null ? null : String.valueOf(n);
 
       //审核状态
       Object e = map.get("examStatus");
-      String examStatus = String.valueOf(e);
-      // 创建 ObjectMapper 实例
-      ObjectMapper objectMapper = new ObjectMapper();
-      //先将 Map 序列化为 JSON 字符串，再反序列化为目标对象
-      String json = objectMapper.writeValueAsString(map);
-      UpdateProcurementPlanChangeVo vo = JsonUtil.parseObject(json, UpdateProcurementPlanChangeVo.class);
-      ProcurementPlanChange planChange = new ProcurementPlanChange();
-      BeanUtil.copyProperties(vo, planChange);
-      this.updateById(planChange);
-      //保存或更新采购计划变更单明细
-      saveOrUpdateLines(vo.getProcurementPlanId(), vo.getLines());
+      String examStatus = e == null ? null : String.valueOf(e);
+
+      //业务ID(变更单ID)
+      Object bizIdObj = map.get("bizId");
+      String bizId = bizIdObj == null ? null : String.valueOf(bizIdObj);
+
+      // 优先解析 variables 子 map（前端流程回调 variables 包裹真实 VO 字段）
+      Map<String, Object> variablesMap = null;
+      Object varsObj = map.get("variables");
+      if (varsObj instanceof Map) {
+        variablesMap = (Map<String, Object>) varsObj;
+      }
+
+      if (StringUtil.isBlank(bizId) && variablesMap != null) {
+        Object bizIdInVar = variablesMap.get("bizId");
+        if (bizIdInVar != null) {
+          bizId = String.valueOf(bizIdInVar);
+        }
+      }
+
+      // 将 Map / variablesMap 转 VO
+      UpdateProcurementPlanChangeVo vo = null;
+      if (variablesMap != null) {
+        vo = JsonUtil.parseObject(JsonUtil.toJsonString(variablesMap), UpdateProcurementPlanChangeVo.class);
+      } else {
+        vo = JsonUtil.parseObject(JsonUtil.toJsonString(map), UpdateProcurementPlanChangeVo.class);
+      }
+
+      // 若 bizId 仍为空，用 vo.id 兜底；或从明细里的 procurementPlanChangeId 兜底
+      if (StringUtil.isBlank(bizId)) {
+        if (vo != null && StringUtil.isNotBlank(vo.getId())) {
+          bizId = vo.getId();
+        } else if (vo != null && !CollectionUtil.isEmpty(vo.getLines())) {
+          bizId = vo.getLines().stream()
+                  .filter(l -> l != null && StringUtil.isNotBlank(l.getProcurementPlanChangeId()))
+                  .map(UpdateProcurementPlanChangeLineVo::getProcurementPlanChangeId)
+                  .findFirst().orElse(null);
+        }
+      }
+
+      // 有 VO + 有 bizId + VO有ID 才去更新主表和明细（和补单模块对齐）
+      if (vo != null && StringUtil.isNotBlank(bizId)) {
+        // 如果vo里没有id，手动补回bizId，保证后面 BeanUtil.copyProperties 时 id 有值，updateById 不会失效
+        if (StringUtil.isBlank(vo.getId())) {
+          vo.setId(bizId);
+        }
+
+        // 更新主表字段
+        ProcurementPlanChange planChange = new ProcurementPlanChange();
+        BeanUtil.copyProperties(vo, planChange);
+        this.updateById(planChange);
+
+        //保存或更新采购计划变更单明细
+        saveOrUpdateLines(bizId, vo.getLines());
+      }
+
       if ("PASS".equals(examStatus)) {
         String processNode = null;
         if ("plan_change_qyjl".equals(nodeCode)) {
@@ -685,16 +737,23 @@ public class ProcurementPlanChangeServiceImpl extends
         } else if ("plan_change_gybzg".equals(nodeCode)) {
           processNode = "YSFG";
         }
-        LambdaUpdateWrapper<ProcurementPlanChange> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlanChange.class)
-                .set(ProcurementPlanChange::getProcessNode, processNode)
-                .set("plan_change_qyjl".equals(nodeCode), ProcurementPlanChange::getPurchaseDeptName, SecurityUtil.getCurrentUser().getName())
-                .set("plan_change_gyglkzg".equals(nodeCode), ProcurementPlanChange::getManagementDeptName, SecurityUtil.getCurrentUser().getName())
-                .set("plan_change_gybzg".equals(nodeCode), ProcurementPlanChange::getSupplyManagerName, SecurityUtil.getCurrentUser().getName())
-                .eq(ProcurementPlanChange::getId, vo.getId());
-        getBaseMapper().update(updateWrapper);
+        if (StringUtil.isNotBlank(bizId) && StringUtil.isNotBlank(processNode)) {
+          LambdaUpdateWrapper<ProcurementPlanChange> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlanChange.class)
+                  .set(ProcurementPlanChange::getProcessNode, processNode)
+                  .set("plan_change_qyjl".equals(nodeCode), ProcurementPlanChange::getPurchaseDeptName, SecurityUtil.getCurrentUser().getName())
+                  .set("plan_change_gyglkzg".equals(nodeCode), ProcurementPlanChange::getManagementDeptName, SecurityUtil.getCurrentUser().getName())
+                  .set("plan_change_gybzg".equals(nodeCode), ProcurementPlanChange::getSupplyManagerName, SecurityUtil.getCurrentUser().getName())
+                  .eq(ProcurementPlanChange::getId, bizId);
+          getBaseMapper().update(updateWrapper);
+        }
+      }
+
+      // 回填操作日志
+      if (StringUtil.isNotBlank(bizId)) {
+        OpLogUtil.setVariable("id", bizId);
       }
-    } catch (JsonProcessingException e) {
-      e.printStackTrace();
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
   }
 
@@ -705,8 +764,20 @@ public class ProcurementPlanChangeServiceImpl extends
    * @param lineList     明细列表
    */
   private void saveOrUpdateLines(String planChangeId, List<UpdateProcurementPlanChangeLineVo> lineList) {
+    // 统一计算真正要用的变更单ID：参数优先，其次取 lineVo 里的 procurementPlanChangeId（前端流程回调已带）
+    String finalChangeId = planChangeId;
+    if (StringUtil.isBlank(finalChangeId) && !CollectionUtil.isEmpty(lineList)) {
+      finalChangeId = lineList.stream()
+              .filter(l -> l != null && StringUtil.isNotBlank(l.getProcurementPlanChangeId()))
+              .map(UpdateProcurementPlanChangeLineVo::getProcurementPlanChangeId)
+              .findFirst().orElse(null);
+    }
+    if (StringUtil.isBlank(finalChangeId)) {
+      throw new DefaultClientException("采购计划变更单ID为空，无法保存明细！");
+    }
+
     List<ProcurementPlanChangeLine> oldLineList = procurementPlanChangeLineService
-            .getByChangeId(planChangeId);
+            .getByChangeId(finalChangeId);
     Map<String, ProcurementPlanChangeLine> oldLineMap = CollectionUtil.isEmpty(oldLineList)
             ? Collections.emptyMap()
             : oldLineList.stream().collect(Collectors.toMap(ProcurementPlanChangeLine::getId, v -> v));
@@ -720,17 +791,17 @@ public class ProcurementPlanChangeServiceImpl extends
         }
 
         existIdList.add(lineVo.getId());
-        lineVo.setProcurementPlanChangeId(planChangeId);
         if (StringUtil.isBlank(lineVo.getItemId())) {
           lineVo.setItemId(oldLine.getItemId());
         }
         ProcurementPlanChangeLine updateLine = BeanUtil.copyProperties(lineVo, ProcurementPlanChangeLine.class);
         updateLine.setId(lineVo.getId());
+        updateLine.setProcurementPlanChangeId(finalChangeId);
         procurementPlanChangeLineService.updateById(updateLine);
       } else {
         ProcurementPlanChangeLine createLine = BeanUtil.copyProperties(lineVo, ProcurementPlanChangeLine.class);
         createLine.setId(IdUtil.getId());
-        createLine.setProcurementPlanChangeId(planChangeId);
+        createLine.setProcurementPlanChangeId(finalChangeId);
         procurementPlanChangeLineService.save(createLine);
         existIdList.add(createLine.getId());
       }
@@ -763,31 +834,24 @@ public class ProcurementPlanChangeServiceImpl extends
       return;
     }
 
-    List<String> businessIds = validDatas.stream()
-            .map(ProcurementPlanChange::getId)
-            .collect(Collectors.toList());
-
     // 查询已发起的流程
-    List<?> flowByConditionList =
-            flowInstanceWrapperService.getFlowByBusinessIdList(businessIds);
-    Set<String> flowBusinessIdSet = CollectionUtil.isNotEmpty(flowByConditionList)
-            ? flowByConditionList.stream()
-            .map(obj -> {
-              try {
-                return BeanUtil.getProperty(obj, "businessId");
-              } catch (Exception e) {
-                return null;
-              }
-            })
-            .filter(Objects::nonNull)
-            .map(String::valueOf)
-            .collect(Collectors.toSet())
+    List<String> businessIds = validDatas.stream().map(ProcurementPlanChange::getId).collect(Collectors.toList());
+    List<FlowInstanceWrapper> flowList = flowInstanceWrapperService.getFlowByBusinessIdList(businessIds);
+    Set<String> flowBusinessIdSet = CollectionUtil.isNotEmpty(flowList)
+            ? flowList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toSet())
+            : new HashSet<>();
+
+    List<FlowTaskDto> todoFlowTaskList = flowTaskWrapperMapper.queryTodoList(
+            new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+    Set<String> todoBusinessIdSet = CollectionUtil.isNotEmpty(todoFlowTaskList)
+            ? todoFlowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toSet())
             : new HashSet<>();
 
     for (ProcurementPlanChange planChange : validDatas) {
       boolean hasFlow = flowBusinessIdSet.contains(planChange.getId());
-      planChange.setShowExamineDetail(hasFlow && StringUtil.isNotBlank(planChange.getApprovalStatus()));
-      planChange.setShowExamine(hasFlow && CustomerDevelopStatus.AUDIT.name().equals(planChange.getApprovalStatus()));
+      boolean hasTodo = todoBusinessIdSet.contains(planChange.getId());
+      planChange.setShowExamineDetail(hasFlow && StringUtils.isNotBlank(planChange.getApprovalStatus()));
+      planChange.setShowExamine(hasTodo && CustomerDevelopStatus.AUDIT.name().equals(planChange.getApprovalStatus()));
     }
   }
 

@@ -343,7 +343,7 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
 
     // 1. 校验明细：只要有任意一条明细未配置分厂ID，就不允许拆分
     boolean hasEmptyWorkshopId = allLines.stream()
-            .anyMatch(line -> line.getWorkshopId() == null); // 检查是否存在空的分厂ID
+            .anyMatch(line -> StringUtils.isEmpty(line.getWorkshopId()));// 检查是否存在空的分厂ID
 
     if (hasEmptyWorkshopId) {
       throw new DefaultClientException("部分采购计划明细未选择分厂，请先选择分厂！");

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