采购计划：查询可变更、可补单的计划数据

@@ -1931,6 +1931,8 @@ CREATE TABLE `procurement_plan`
     `salesman_quotation_id`              varchar(32)    DEFAULT NULL COMMENT '关联业务员报价单ID',
     `salesman_quotation_id`              varchar(32)    DEFAULT NULL COMMENT '关联业务员报价单ID',
     `attachment_file_ids`                text           DEFAULT NULL COMMENT '附件文件ID集合',
     `attachment_file_ids`                text           DEFAULT NULL COMMENT '附件文件ID集合',
     `attachment_file_names`              text           DEFAULT NULL COMMENT '附件文件名称集合',
     `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 补单完成',
     `create_by_id`                       varchar(32)    DEFAULT NULL COMMENT '创建人ID',
     `create_by_id`                       varchar(32)    DEFAULT NULL COMMENT '创建人ID',
     `create_by`                          varchar(64)    DEFAULT NULL COMMENT '创建人',
     `create_by`                          varchar(64)    DEFAULT NULL COMMENT '创建人',
     `update_by_id`                       varchar(32)    DEFAULT NULL COMMENT '更新人ID',
     `update_by_id`                       varchar(32)    DEFAULT NULL COMMENT '更新人ID',

@@ -334,6 +334,18 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   private String planType;
   private String planType;
 
 
   /**
   /**
+   * 变更状态 空/未变更  CHANGING 变更中  CHANGED 变更完成
+   */
+  @ApiModelProperty("变更状态 空/未变更  CHANGING 变更中  CHANGED 变更完成")
+  private String changeStatus;
+
+  /**
+   * 补单状态 空/未补单  REPLENISHING 补单中  REPLENISHED 补单完成
+   */
+  @ApiModelProperty("补单状态 空/未补单  REPLENISHING 补单中  REPLENISHED 补单完成")
+  private String replenishmentStatus;
+
+  /**
    * 分厂ID
    * 分厂ID
    */
    */
   @ApiModelProperty("分厂ID")
   @ApiModelProperty("分厂ID")

@@ -71,6 +71,28 @@ public class ProcurementPlanController extends DefaultBaseController {
   }
   }
 
 
   /**
   /**
+   * 查询可以变更/补单的采购计划数据
+   */
+  @ApiOperation("查询可变更/补单列表")
+  @HasPermission({"plan-manage:domestic-plan:query"})
+  @GetMapping("/queryCanChangeOrReplenishment")
+  public InvokeResult<PageResult<GetProcurementPlanBo>> queryCanChangeOrReplenishment(@Valid QueryProcurementPlanVo vo) {
+
+    PageResult<ProcurementPlan> pageResult = procurementPlanService.queryCanChangeOrReplenishmentList(getPageIndex(vo),
+            getPageSize(vo), vo);
+
+    List<ProcurementPlan> datas = pageResult.getDatas();
+    List<GetProcurementPlanBo> results = null;
+
+    if (!CollectionUtil.isEmpty(datas)) {
+      results = datas.stream().map(GetProcurementPlanBo::new).collect(Collectors.toList());
+      fillBuyoutButtons(results, datas);
+    }
+
+    return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+  }
+
+  /**
    * 根据ID查询
    * 根据ID查询
    */
    */
   @ApiOperation("根据ID查询")
   @ApiOperation("根据ID查询")

@@ -283,6 +283,16 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private String planType;
   private String planType;
 
 
   /**
   /**
+   * 变更状态 空/未变更  CHANGING 变更中  CHANGED 变更完成
+   */
+  private String changeStatus;
+
+  /**
+   * 补单状态 空/未补单  REPLENISHING 补单中  REPLENISHED 补单完成
+   */
+  private String replenishmentStatus;
+
+  /**
    * 分厂ID
    * 分厂ID
    */
    */
   private String workshopId;
   private String workshopId;

 package com.lframework.xingyun.sc.procurement.impl.change;
 package com.lframework.xingyun.sc.procurement.impl.change;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
@@ -120,6 +121,11 @@ public class ProcurementPlanChangeServiceImpl extends
     if (!CollectionUtil.isEmpty(lines)) {
     if (!CollectionUtil.isEmpty(lines)) {
       procurementPlanChangeLineService.saveBatch(lines);
       procurementPlanChangeLineService.saveBatch(lines);
     }
     }
+    //更新采购计划变更状态为  变更中
+    Wrapper<ProcurementPlan> parentWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
+            .set(ProcurementPlan::getChangeStatus, "CHANGING")
+            .eq(ProcurementPlan::getId, vo.getProcurementPlanId());
+    procurementPlanService.update(parentWrapper);
 
 
     return planChange.getId();
     return planChange.getId();
   }
   }

@@ -94,6 +94,28 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
   }
   }
 
 
   @Override
   @Override
+  public PageResult<ProcurementPlan> queryCanChangeOrReplenishmentList(Integer pageIndex, Integer pageSize,
+                                                                       QueryProcurementPlanVo vo) {
+
+    Assert.greaterThanZero(pageIndex);
+    Assert.greaterThanZero(pageSize);
+
+    PageHelperUtil.startPage(pageIndex, pageSize);
+    List<ProcurementPlan> datas = this.queryCanChangeOrReplenishmentList(vo);
+    if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
+      fillShowExamineInfo(datas);
+    }
+
+    return PageResultUtil.convert(new PageInfo<>(datas));
+  }
+
+  @Override
+  public List<ProcurementPlan> queryCanChangeOrReplenishmentList(QueryProcurementPlanVo vo) {
+
+    return getBaseMapper().queryCanChangeOrReplenishmentList(vo);
+  }
+
+  @Override
   public GetProcurementPlanBo getDetail(String id) {
   public GetProcurementPlanBo getDetail(String id) {
     if (StringUtil.isBlank(id)) {
     if (StringUtil.isBlank(id)) {
       throw new InputErrorException("ID不能为空！");
       throw new InputErrorException("ID不能为空！");
@@ -423,6 +445,32 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
             .set(ProcurementPlan::getProcessNode, approvalStatus.equals("PASS") ? null : "GYGLKZG")
             .set(ProcurementPlan::getProcessNode, approvalStatus.equals("PASS") ? null : "GYGLKZG")
             .eq(ProcurementPlan::getId, id);
             .eq(ProcurementPlan::getId, id);
     getBaseMapper().update(wrapper);
     getBaseMapper().update(wrapper);
+
+    //如果是子计划且审核通过，检查主计划下所有子计划是否都已通过
+    if ("PASS".equals(approvalStatus)) {
+      ProcurementPlan currentPlan = this.getById(id);
+
+      // 判断当前计划是否为子计划（parentId不为空）
+      if (currentPlan != null && StringUtils.isNotBlank(currentPlan.getParentId())) {
+        String parentId = currentPlan.getParentId();
+
+        // 查询主计划下，除了当前子计划外，是否还有未通过（非PASS状态）的子计划
+        long unApprovedCount = this.count(Wrappers.<ProcurementPlan>lambdaQuery()
+                .eq(ProcurementPlan::getParentId, parentId)
+                .ne(ProcurementPlan::getId, id) // 排除自己
+                .ne(ProcurementPlan::getApprovalStatus, "PASS") // 查找未通过的
+        );
+
+        // 如果未通过的数量为0，说明所有子计划都已审核通过
+        if (unApprovedCount == 0) {
+          // 更新主计划的流程状态为 COMPLETED
+          Wrapper<ProcurementPlan> parentWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
+                  .set(ProcurementPlan::getProcessStatus, "COMPLETED")
+                  .eq(ProcurementPlan::getId, parentId);
+          getBaseMapper().update(parentWrapper);
+        }
+      }
+    }
   }
   }
 
 
   @Transactional(rollbackFor = Exception.class)
   @Transactional(rollbackFor = Exception.class)
@@ -535,6 +583,12 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
       getBaseMapper().update(updateWrapper);
       getBaseMapper().update(updateWrapper);
     }
     }
 
 
+    // 更新主计划状态为"已中止"
+    LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
+            .set(ProcurementPlan::getProcessStatus, "ABORTED")
+            .eq(ProcurementPlan::getId, mainPlanId);
+    getBaseMapper().update(updateWrapper);
+
     OpLogUtil.setVariable("id", id);
     OpLogUtil.setVariable("id", id);
     OpLogUtil.setExtra(currentPlan);
     OpLogUtil.setExtra(currentPlan);
   }
   }

@@ -16,5 +16,13 @@ public interface ProcurementPlanMapper extends BaseMapper<ProcurementPlan> {
    */
    */
   List<ProcurementPlan> query(@Param("vo") QueryProcurementPlanVo vo);
   List<ProcurementPlan> query(@Param("vo") QueryProcurementPlanVo vo);
 
 
+  /**
+   * 查询可变更/可补单列表
+   *
+   * @param vo
+   * @return
+   */
+  List<ProcurementPlan> queryCanChangeOrReplenishmentList(@Param("vo") QueryProcurementPlanVo vo);
+
   ProcurementPlan findById(@Param("id") String id);
   ProcurementPlan findById(@Param("id") String id);
 }
 }

@@ -22,6 +22,16 @@ public interface ProcurementPlanService extends BaseMpService<ProcurementPlan> {
   PageResult<ProcurementPlan> query(Integer pageIndex, Integer pageSize, QueryProcurementPlanVo vo);
   PageResult<ProcurementPlan> query(Integer pageIndex, Integer pageSize, QueryProcurementPlanVo vo);
 
 
   /**
   /**
+   * 查询可变更/可补单列表
+   *
+   * @param pageIndex
+   * @param pageSize
+   * @param vo
+   * @return
+   */
+  PageResult<ProcurementPlan> queryCanChangeOrReplenishmentList(Integer pageIndex, Integer pageSize, QueryProcurementPlanVo vo);
+
+  /**
    * 查询列表
    * 查询列表
    *
    *
    * @param vo
    * @param vo
@@ -30,6 +40,14 @@ public interface ProcurementPlanService extends BaseMpService<ProcurementPlan> {
   List<ProcurementPlan> query(QueryProcurementPlanVo vo);
   List<ProcurementPlan> query(QueryProcurementPlanVo vo);
 
 
   /**
   /**
+   * 查询可变更/可补单列表
+   *
+   * @param vo
+   * @return
+   */
+  List<ProcurementPlan> queryCanChangeOrReplenishmentList(QueryProcurementPlanVo vo);
+
+  /**
    * 根据ID查询详情
    * 根据ID查询详情
    *
    *
    * @param id
    * @param id

@@ -87,4 +87,12 @@ public class QueryProcurementPlanVo extends SortPageVo {
    */
    */
   @ApiModelProperty("分厂ID")
   @ApiModelProperty("分厂ID")
   private String workshopId;
   private String workshopId;
+
+  /**
+   * 查询类型
+   * CHANGE：变更
+   * REPLENISHMENT：补货
+   */
+  @ApiModelProperty("查询类型：CHANGE变更 REPLENISHMENT补货")
+  private String queryType;
 }
 }

@@ -55,6 +55,8 @@
         <result column="process_node" property="processNode"/>
         <result column="process_node" property="processNode"/>
         <result column="frozen" property="frozen"/>
         <result column="frozen" property="frozen"/>
         <result column="plan_type" property="planType"/>
         <result column="plan_type" property="planType"/>
+        <result column="change_status" property="changeStatus"/>
+        <result column="replenishment_status" property="replenishmentStatus"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="workshop_id" property="workshopId"/>
         <result column="salesman_quotation_id" property="salesmanQuotationId"/>
         <result column="salesman_quotation_id" property="salesmanQuotationId"/>
         <result column="attachment_file_ids" property="attachmentFileIds"/>
         <result column="attachment_file_ids" property="attachmentFileIds"/>
@@ -121,6 +123,8 @@
             pp.process_node,
             pp.process_node,
             pp.frozen,
             pp.frozen,
             pp.plan_type,
             pp.plan_type,
+            pp.change_status,
+            pp.replenishment_status,
             pp.workshop_id,
             pp.workshop_id,
             pp.salesman_quotation_id,
             pp.salesman_quotation_id,
             pp.attachment_file_ids,
             pp.attachment_file_ids,
@@ -195,4 +199,63 @@
         <include refid="ProcurementPlan_sql"/>
         <include refid="ProcurementPlan_sql"/>
         WHERE pp.id = #{id}
         WHERE pp.id = #{id}
     </select>
     </select>
+
+    <select id="queryCanChangeOrReplenishmentList" resultMap="ProcurementPlan">
+        <include refid="ProcurementPlan_sql"/>
+        <where>
+            pp.parent_id IS NULL
+            <if test="vo != null">
+                <if test="vo.code != null and vo.code != ''">
+                    AND pp.code LIKE CONCAT('%', #{vo.code}, '%')
+                </if>
+                <if test="vo.companyShortId != null and vo.companyShortId != ''">
+                    AND pp.company_short_id = #{vo.companyShortId}
+                </if>
+                <if test="vo.companyName != null and vo.companyName != ''">
+                    AND (
+                    bdcs.company_name LIKE CONCAT('%', #{vo.companyName}, '%')
+                    OR bdcs.short_name LIKE CONCAT('%', #{vo.companyName}, '%')
+                    )
+                </if>
+                <if test="vo.purchaseDepartment != null and vo.purchaseDepartment != ''">
+                    AND pp.purchase_department = #{vo.purchaseDepartment}
+                </if>
+                <if test="vo.startDate != null">
+                    AND pp.date >= #{vo.startDate}
+                </if>
+                <if test="vo.endDate != null">
+                    <![CDATA[
+                    AND pp.date <= #{vo.endDate}
+                    ]]>
+                </if>
+                <if test="vo.supplierId != null and vo.supplierId != ''">
+                    AND pp.supplier_id = #{vo.supplierId}
+                </if>
+                <if test="vo.supplierName != null and vo.supplierName != ''">
+                    AND pdc.unit_name LIKE CONCAT('%', #{vo.supplierName}, '%')
+                </if>
+                <if test="vo.workshopId != null and vo.workshopId != ''">
+                    AND pp.workshop_id = #{vo.workshopId}
+                </if>
+                <choose>
+                    <when test="vo.queryType == 'CHANGE'">
+                        AND pp.process_status IN ('COMPLETED', 'ABORTED')
+                        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')
+                    </when>
+                    <when test="vo.queryType == 'REPLENISHMENT'">
+                        AND pp.process_status IN ('COMPLETED', 'ABORTED')
+                        AND (pp.replenishment_status = '' OR pp.replenishment_status IS NULL OR pp.replenishment_status
+                        = 'REPLENISHED')
+                        AND (pp.change_status = '' OR pp.change_status IS NULL OR pp.change_status = 'CHANGED')
+                    </when>
+                    <otherwise>
+                        AND 1 = 0
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+        ORDER BY pp.create_time DESC
+    </select>
 </mapper>
 </mapper>