采购计划：保存审核通过时间

@@ -1942,6 +1942,7 @@ CREATE TABLE `procurement_plan`
     `supply_manager_name`                VARCHAR(50)    DEFAULT NULL COMMENT '供应部主管',
     `management_dept_name`               VARCHAR(50)    DEFAULT NULL COMMENT '供应管理科主管',
     `purchase_dept_name`                 VARCHAR(50)    DEFAULT NULL COMMENT '采购处主管',
+    `approval_pass_time`                 datetime       DEFAULT CURRENT_TIMESTAMP 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',
@@ -1958,7 +1959,8 @@ CREATE TABLE `procurement_plan`
     KEY                                  `idx_pp_process_status` (`process_status`),
     KEY                                  `idx_pp_process_node` (`process_node`),
     KEY                                  `idx_pp_workshop_id` (`workshop_id`),
-    KEY                                  `idx_pp_salesman_quotation_id` (`salesman_quotation_id`)
+    KEY                                  `idx_pp_salesman_quotation_id` (`salesman_quotation_id`),
+    KEY                                  `idx_pp_approval_pass_time` (`approval_pass_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='采购计划主表';
 
 CREATE TABLE `procurement_plan_line`

@@ -430,6 +430,13 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   private String purchaseDeptName;
 
   /**
+   * 审核通过时间（精确到时分秒）
+   */
+  @ApiModelProperty("审核通过时间")
+  @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+  private LocalDateTime approvalPassTime;
+
+  /**
    * 创建人ID
    */
   @ApiModelProperty("创建人ID")

@@ -355,6 +355,11 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private String purchaseDeptName;
 
   /**
+   * 审核通过时间（精确到时分秒，流程 APPROVE_PASS / FINISH 时写入）
+   */
+  private LocalDateTime approvalPassTime;
+
+  /**
    * 是否展示审核按钮(非持久化字段)
    */
   @TableField(exist = false)

@@ -46,6 +46,7 @@ import com.lframework.xingyun.sc.procurement.vo.change.UpdateProcurementPlanChan
 import com.lframework.xingyun.sc.procurement.vo.plan.CreateProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.ProcurementPlanLineVo;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -491,6 +492,7 @@ public class ProcurementPlanChangeServiceImpl extends
       // 变更完成状态
       updatedMain.setChangeStatus("CHANGED");
       updatedMain.setProcessNode(null);
+      updatedMain.setApprovalPassTime(LocalDateTime.now());
       procurementPlanService.update(Wrappers.lambdaUpdate(ProcurementPlan.class)
               .setEntity(updatedMain)
               .eq(ProcurementPlan::getId, planId));
@@ -580,6 +582,7 @@ public class ProcurementPlanChangeServiceImpl extends
           subVo.setManagementDeptName(procurementPlanChange.getManagementDeptName());
           subVo.setSupplyManagerName(procurementPlanChange.getSupplyManagerName());
           subVo.setMarketingManagerName(procurementPlanChange.getMarketingManagerName());
+          subVo.setApprovalPassTime(LocalDateTime.now());
 
           List<ProcurementPlanLineVo> subLineVos = new ArrayList<>();
           for (ProcurementPlanChangeLine cl : wLines) {
@@ -610,6 +613,7 @@ public class ProcurementPlanChangeServiceImpl extends
               .set(ProcurementPlan::getManagementDeptName, procurementPlanChange.getManagementDeptName())
               .set(ProcurementPlan::getSupplyManagerName, procurementPlanChange.getSupplyManagerName())
               .set(ProcurementPlan::getMarketingManagerName, procurementPlanChange.getMarketingManagerName())
+              .set(ProcurementPlan::getApprovalPassTime, LocalDateTime.now())
               .eq(ProcurementPlan::getId, planId));
 
       //todo 废弃原合同；生成新合同

@@ -49,6 +49,7 @@ import com.lframework.xingyun.sc.procurement.vo.plan.QueryProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.UpdateProcurementPlanVo;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -490,6 +491,7 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
             .set(ProcurementPlan::getApprovalStatus, approvalStatus)
             .set(ProcurementPlan::getProcessStatus, approvalStatus.equals("PASS") ? "COMPLETED" : "REFUSE")
             .set(ProcurementPlan::getProcessNode, approvalStatus.equals("PASS") ? null : "GYGLKZG")
+            .set(approvalStatus.equals("PASS"), ProcurementPlan::getApprovalPassTime, LocalDateTime.now())
             .set(approvalStatus.equals("REFUSE"), ProcurementPlan::getPurchaseDeptName, null)
             .set(approvalStatus.equals("REFUSE"), ProcurementPlan::getManagementDeptName, null)
             .set(approvalStatus.equals("REFUSE"), ProcurementPlan::getSupplyManagerName, null)
@@ -513,9 +515,10 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
 
         // 如果未通过的数量为0，说明所有子计划都已审核通过
         if (unApprovedCount == 0) {
-          // 更新主计划的流程状态为 COMPLETED
+          // 更新主计划的流程状态为 COMPLETED，同时写入审核通过时间（防止主计划自身未触发到PASS回调）
           Wrapper<ProcurementPlan> parentWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
                   .set(ProcurementPlan::getProcessStatus, "COMPLETED")
+                  .set(ProcurementPlan::getApprovalPassTime, LocalDateTime.now())
                   .eq(ProcurementPlan::getId, parentId);
           getBaseMapper().update(parentWrapper);
         }

@@ -44,6 +44,8 @@ import com.lframework.xingyun.sc.procurement.vo.replenish.CreateProcurementPlanR
 import com.lframework.xingyun.sc.procurement.vo.replenish.QueryProcurementPlanReplenishVo;
 import com.lframework.xingyun.sc.procurement.vo.replenish.UpdateProcurementPlanReplenishLineVo;
 import com.lframework.xingyun.sc.procurement.vo.replenish.UpdateProcurementPlanReplenishVo;
+
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -417,6 +419,7 @@ public class ProcurementPlanReplenishServiceImpl
       archivedMain.setManagementDeptName(procurementPlanReplenish.getManagementDeptName());
       archivedMain.setSupplyManagerName(procurementPlanReplenish.getSupplyManagerName());
       archivedMain.setMarketingManagerName(procurementPlanReplenish.getMarketingManagerName());
+      archivedMain.setApprovalPassTime(LocalDateTime.now());
       procurementPlanService.save(archivedMain);
 
       //生成买断操作申请单
@@ -490,6 +493,7 @@ public class ProcurementPlanReplenishServiceImpl
           subVo.setMarketingManagerName(procurementPlanReplenish.getMarketingManagerName());
           // 子计划的分厂就是当前组的明细分厂（同组内 workshopId 一样），直接赋值
           subVo.setWorkshopId(CollectionUtil.isNotEmpty(factoryLines) ? factoryLines.get(0).getWorkshopId() : null);
+          subVo.setApprovalPassTime(LocalDateTime.now());
 
           // 子明细：只保留当前分厂，workshopId 保持原明细的，其它字段按原明细 copy
           List<ProcurementPlanLineVo> subLineVoList = new ArrayList<>();

 package com.lframework.xingyun.sc.procurement.vo.plan;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.exceptions.impl.InputErrorException;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.vo.BaseVo;
@@ -7,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
@@ -363,6 +366,10 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable {
   @ApiModelProperty("采购处主管")
   private String purchaseDeptName;
 
+  @ApiModelProperty("审核通过时间")
+  @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+  private LocalDateTime approvalPassTime;
+
   /**
    * 明细信息
    */

@@ -69,6 +69,7 @@
         <result column="supply_manager_name" property="supplyManagerName"/>
         <result column="management_dept_name" property="managementDeptName"/>
         <result column="purchase_dept_name" property="purchaseDeptName"/>
+        <result column="approval_pass_time" property="approvalPassTime"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -145,6 +146,7 @@
             pp.supply_manager_name,
             pp.management_dept_name,
             pp.purchase_dept_name,
+            pp.approval_pass_time,
             pp.create_by_id,
             pp.create_by,
             pp.update_by_id,