采购计划：测试问题修复

房远帅
1 parent 6431f675
Showing 10 changed files with 208 additions and 151 deletions
xingyun-api/src/main/resources/db/chujiang/base.sql
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementPlan.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/replenish/ProcurementPlanReplenishLine.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/change/ProcurementPlanChangeServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/replenish/ProcurementPlanReplenishServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/summary/DomesticPlanSummaryServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/plan/CreateProcurementPlanVo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/replenish/CreateProcurementPlanReplenishVo.java
xingyun-sc/src/main/resources/mappers/procurement/plan/ProcurementPlanMapper.xml
--- a/xingyun-api/src/main/resources/db/chujiang/base.sql
View file @7514592
+++ b/xingyun-api/src/main/resources/db/chujiang/base.sql
View file @7514592
@@ -1950,7 +1950,6 @@ CREATE TABLE `procurement_plan`
     `create_time`                        datetime       DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_time`                        datetime       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_pp_code` (`code`),
     KEY                                  `idx_pp_company_short_id` (`company_short_id`),
     KEY                                  `idx_pp_supplier_id` (`supplier_id`),
     KEY                                  `idx_pp_date` (`date`),
@@ -2018,7 +2017,6 @@ CREATE TABLE `procurement_buyout_apply`
     `create_time`              datetime              DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_time`              datetime              DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`id`),
-    UNIQUE KEY `uk_pba_code` (`code`),
     KEY                        `idx_pba_plan_id` (`procurement_plan_id`),
     KEY                        `idx_pba_supplier_id` (`supplier_id`),
     KEY                        `idx_pba_date` (`date`),
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementPlan.java
View file @7514592
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementPlan.java
View file @7514592
@@ -374,13 +374,13 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   /**
    * 创建人ID
    */
-  @TableField(fill = FieldFill.INSERT)
+  @TableField(fill = FieldFill.DEFAULT)
   private String createById;
   /**
    * 创建人
    */
-  @TableField(fill = FieldFill.INSERT)
+  @TableField(fill = FieldFill.DEFAULT)
   private String createBy;
   /**
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/replenish/ProcurementPlanReplenishLine.java
View file @7514592
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/replenish/ProcurementPlanReplenishLine.java
View file @7514592
@@ -84,6 +84,7 @@ public class ProcurementPlanReplenishLine extends BaseEntity implements BaseDto 
   /**
    * 分厂名称
    */
+  @TableField(exist = false)
   private String workshopName;
   /**
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/change/ProcurementPlanChangeServiceImpl.java
View file @7514592
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/change/ProcurementPlanChangeServiceImpl.java
View file @7514592
@@ -455,6 +455,8 @@ public class ProcurementPlanChangeServiceImpl extends
         archivedMain.setId(IdUtil.getId());
         archivedMain.setCode(mainPlan.getCode() + "_HIST");
         archivedMain.setDeleted(Boolean.TRUE);
+        archivedMain.setCreateBy(mainPlan.getCreateBy());
+        archivedMain.setCreateById(mainPlan.getCreateById());
         procurementPlanService.save(archivedMain);
         // 原主计划子表也复制一份
         List<ProcurementPlanLine> mainLines = procurementPlanLineService.getByProcurementPlanId(planId);
@@ -538,67 +540,70 @@ public class ProcurementPlanChangeServiceImpl extends
       }
       ProcurementPlanChange procurementPlanChange = this.getById(id);
       // 按分厂分组明细
+      List<String> allWorkshopIds = new ArrayList<>();
       if (CollectionUtil.isNotEmpty(changeLines)) {
         // workshopId -> workshop code
-        List<String> allWorkshopIds = changeLines.stream()
+        allWorkshopIds = changeLines.stream()
                 .map(ProcurementPlanChangeLine::getWorkshopId)
                 .filter(StringUtil::isNotBlank)
                 .distinct()
                 .collect(Collectors.toList());
         Map<String, String> workshop2Code = new HashMap<>();
-        if (CollectionUtil.isNotEmpty(allWorkshopIds)) {
+        if (CollectionUtil.isNotEmpty(allWorkshopIds) && allWorkshopIds.size() > 1) {
           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;
+          // 分厂顺序
+          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);
           }
-          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);
-          subVo.setPlanType("变");
-          subVo.setPurchaseDeptName(procurementPlanChange.getPurchaseDeptName());
-          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) {
-            ProcurementPlanLineVo lv = BeanUtil.copyProperties(cl, ProcurementPlanLineVo.class);
-            subLineVos.add(lv);
+          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);
+            subVo.setPlanType("变");
+            subVo.setPurchaseDeptName(procurementPlanChange.getPurchaseDeptName());
+            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) {
+              ProcurementPlanLineVo lv = BeanUtil.copyProperties(cl, ProcurementPlanLineVo.class);
+              subLineVos.add(lv);
+            }
+            subVo.setProcurementPlanLineList(subLineVos);
+            subVo.setCreateBy(mainPlan.getCreateBy());
+            subVo.setCreateById(mainPlan.getCreateById());
+            // createSubPlan 内部会保存主表+明细+自动生成买断申请单
+            procurementPlanService.createSubPlan(subVo);
           }
-          subVo.setProcurementPlanLineList(subLineVos);
-          // createSubPlan 内部会保存主表+明细+自动生成买断申请单
-          procurementPlanService.createSubPlan(subVo);
         }
       }
@@ -611,7 +616,7 @@ public class ProcurementPlanChangeServiceImpl extends
         planType = "变 补";
       }
       procurementPlanService.update(Wrappers.lambdaUpdate(ProcurementPlan.class)
-              .set(ProcurementPlan::getFrozen, Boolean.TRUE)
+              .set(ProcurementPlan::getFrozen, allWorkshopIds.size() > 1 ? Boolean.TRUE : Boolean.FALSE)
               .set(ProcurementPlan::getChangeStatus, "CHANGED")
               .set(ProcurementPlan::getProcessStatus, "COMPLETED")
               .set(ProcurementPlan::getProcessNode, null)
@@ -794,10 +799,23 @@ public class ProcurementPlanChangeServiceImpl extends
         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);
+        log.error("workshopId====" + lineVo.getWorkshopId());
+        LambdaUpdateWrapper<ProcurementPlanChangeLine> updateWrapper = new LambdaUpdateWrapper<>(ProcurementPlanChangeLine.class);
+        updateWrapper.eq(ProcurementPlanChangeLine::getId, lineVo.getId())
+                .set(ProcurementPlanChangeLine::getProcurementPlanChangeId, finalChangeId)
+                .set(ProcurementPlanChangeLine::getProductId, lineVo.getProductId())
+                .set(ProcurementPlanChangeLine::getMaterialType, lineVo.getMaterialType())
+                .set(ProcurementPlanChangeLine::getQuantity, lineVo.getQuantity())
+                .set(ProcurementPlanChangeLine::getActualPurchasePrice, lineVo.getActualPurchasePrice())
+                .set(ProcurementPlanChangeLine::getIncludingShippingPrice, lineVo.getIncludingShippingPrice())
+                .set(ProcurementPlanChangeLine::getPriceListPrices, lineVo.getPriceListPrices())
+                .set(ProcurementPlanChangeLine::getCoordinationRange, lineVo.getCoordinationRange())
+                .set(ProcurementPlanChangeLine::getEstimatedLoss, lineVo.getEstimatedLoss())
+                .set(ProcurementPlanChangeLine::getApplicationAttrition, lineVo.getApplicationAttrition())
+                .set(ProcurementPlanChangeLine::getPaintDamageRatio, lineVo.getPaintDamageRatio())
+                .set(ProcurementPlanChangeLine::getWorkshopId, lineVo.getWorkshopId())
+                .set(ProcurementPlanChangeLine::getItemId, lineVo.getItemId());
+        procurementPlanChangeLineService.update(updateWrapper);
       } else {
         ProcurementPlanChangeLine createLine = BeanUtil.copyProperties(lineVo, ProcurementPlanChangeLine.class);
         createLine.setId(IdUtil.getId());
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
View file @7514592
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
View file @7514592
@@ -34,7 +34,6 @@ import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanBo;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.procurement.dto.DomesticReviewerDto;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
-import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanChange;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanLine;
 import com.lframework.xingyun.sc.procurement.mappers.plan.ProcurementPlanMapper;
 import com.lframework.xingyun.sc.procurement.service.buyout.ProcurementBuyoutApplyService;
@@ -196,6 +195,12 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
         plan.setPurchaseDeptName(reviewer.getProcurementOffice());
       }
     }
+    if (StringUtils.isEmpty(plan.getCreateBy())) {
+      plan.setCreateBy(SecurityUtil.getCurrentUser().getName());
+    }
+    if (StringUtils.isEmpty(plan.getCreateById())) {
+      plan.setCreateBy(SecurityUtil.getCurrentUser().getId());
+    }
     getBaseMapper().insert(plan);
     if (!CollectionUtil.isEmpty(vo.getProcurementPlanLineList())) {
@@ -267,9 +272,22 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
         if (StringUtil.isBlank(lineVo.getItemId())) {
           lineVo.setItemId(oldLine.getItemId());
         }
-        ProcurementPlanLine updateLine = BeanUtil.copyProperties(lineVo, ProcurementPlanLine.class);
-        updateLine.setId(lineVo.getId());
-        procurementPlanLineService.updateById(updateLine);
+        LambdaUpdateWrapper<ProcurementPlanLine> updateWrapper = new LambdaUpdateWrapper<>(ProcurementPlanLine.class);
+        updateWrapper.eq(ProcurementPlanLine::getId, lineVo.getId())
+                .set(ProcurementPlanLine::getProcurementPlanId, lineVo.getProcurementPlanId())
+                .set(ProcurementPlanLine::getProductId, lineVo.getProductId())
+                .set(ProcurementPlanLine::getMaterialType, lineVo.getMaterialType())
+                .set(ProcurementPlanLine::getQuantity, lineVo.getQuantity())
+                .set(ProcurementPlanLine::getActualPurchasePrice, lineVo.getActualPurchasePrice())
+                .set(ProcurementPlanLine::getIncludingShippingPrice, lineVo.getIncludingShippingPrice())
+                .set(ProcurementPlanLine::getPriceListPrices, lineVo.getPriceListPrices())
+                .set(ProcurementPlanLine::getCoordinationRange, lineVo.getCoordinationRange())
+                .set(ProcurementPlanLine::getEstimatedLoss, lineVo.getEstimatedLoss())
+                .set(ProcurementPlanLine::getApplicationAttrition, lineVo.getApplicationAttrition())
+                .set(ProcurementPlanLine::getPaintDamageRatio, lineVo.getPaintDamageRatio())
+                .set(ProcurementPlanLine::getWorkshopId, lineVo.getWorkshopId())
+                .set(ProcurementPlanLine::getItemId, lineVo.getItemId());
+        procurementPlanLineService.update(updateWrapper);
       } else {
         ProcurementPlanLine createLine = BeanUtil.copyProperties(lineVo, ProcurementPlanLine.class);
         createLine.setId(IdUtil.getId());
@@ -424,7 +442,8 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
         subLineVoList.add(lineVo);
       }
       subVo.setProcurementPlanLineList(subLineVoList);
-
+      subVo.setCreateBy(mainPlan.getCreateBy());
+      subVo.setCreateById(mainPlan.getCreateById());
       // 子计划创建（不重新生成编号，因为使用父code+后缀）
       createSubPlan(subVo);
     }
@@ -674,7 +693,12 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
       }
     }
     plan.setTotalQuantity(totalQuantity);
-
+    if (StringUtils.isEmpty(plan.getCreateBy())) {
+      plan.setCreateBy(SecurityUtil.getCurrentUser().getName());
+    }
+    if (StringUtils.isEmpty(plan.getCreateById())) {
+      plan.setCreateBy(SecurityUtil.getCurrentUser().getId());
+    }
     getBaseMapper().insert(plan);
     if (!CollectionUtil.isEmpty(vo.getProcurementPlanLineList())) {
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/replenish/ProcurementPlanReplenishServiceImpl.java
View file @7514592
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/replenish/ProcurementPlanReplenishServiceImpl.java
View file @7514592
@@ -5,7 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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;
@@ -27,6 +31,8 @@ import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanReplenishBo;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanReplenishLineBo;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
+import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanChange;
+import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanChangeLine;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanLine;
 import com.lframework.xingyun.sc.procurement.entity.replenish.ProcurementPlanReplenish;
 import com.lframework.xingyun.sc.procurement.entity.replenish.ProcurementPlanReplenishLine;
@@ -49,6 +55,8 @@ 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;
@@ -79,6 +87,8 @@ public class ProcurementPlanReplenishServiceImpl
   private WorkshopService workshopService;
   @Resource
   private ProcurementBuyoutApplyService procurementBuyoutApplyService;
+  @Resource
+  private FlowTaskWrapperMapper flowTaskWrapperMapper;
   @Override
@@ -403,7 +413,7 @@ public class ProcurementPlanReplenishServiceImpl
       archivedMain.setCode(entity.getCode());
       archivedMain.setDeleted(Boolean.FALSE);
       archivedMain.setProcessNode(null);
-      archivedMain.setProcessStatus(null);
+      archivedMain.setProcessStatus("COMPLETED");
       archivedMain.setApprovalStatus(null);
       if (CollectionUtil.isNotEmpty(allWorkshopIds) && allWorkshopIds.size() > 1) {
         archivedMain.setFrozen(Boolean.TRUE);
@@ -422,12 +432,6 @@ public class ProcurementPlanReplenishServiceImpl
       archivedMain.setApprovalPassTime(LocalDateTime.now());
       procurementPlanService.save(archivedMain);
-      //生成买断操作申请单
-      if (CollectionUtil.isNotEmpty(allWorkshopIds) && allWorkshopIds.size() == 1) {
-        CreateProcurementBuyoutApplyVo vo = new CreateProcurementBuyoutApplyVo();
-        vo.setProcurementPlanId(archivedMain.getId());
-        procurementBuyoutApplyService.create(vo);
-      }
       // 主计划子表也复制一份
       List<ProcurementPlanLine> archivedMainLines = new ArrayList<>();
       if (CollectionUtil.isNotEmpty(mainLines)) {
@@ -439,6 +443,14 @@ public class ProcurementPlanReplenishServiceImpl
         }
         procurementPlanLineService.saveBatch(archivedMainLines);
       }
+
+      //生成买断操作申请单
+      if (CollectionUtil.isNotEmpty(allWorkshopIds) && allWorkshopIds.size() == 1) {
+        CreateProcurementBuyoutApplyVo vo = new CreateProcurementBuyoutApplyVo();
+        vo.setProcurementPlanId(archivedMain.getId());
+        procurementBuyoutApplyService.create(vo);
+      }
+
       //拆分了分厂
       if (CollectionUtil.isNotEmpty(allWorkshopIds) && allWorkshopIds.size() > 1) {
         Map<String, String> deptId2CodeMap = new HashMap<>();
@@ -482,7 +494,7 @@ public class ProcurementPlanReplenishServiceImpl
           CreateProcurementPlanVo subVo = BeanUtil.copyProperties(archivedMain, CreateProcurementPlanVo.class);
           subVo.setCode(subCode);
           subVo.setParentId(archivedMain.getId());
-          subVo.setProcessStatus(null);
+          subVo.setProcessStatus("COMPLETED");
           subVo.setProcessNode(null);
           subVo.setApprovalStatus(null);
           subVo.setFrozen(Boolean.FALSE);
@@ -503,6 +515,8 @@ public class ProcurementPlanReplenishServiceImpl
             subLineVoList.add(lineVo);
           }
           subVo.setProcurementPlanLineList(subLineVoList);
+          subVo.setCreateBy(entity.getCreateBy());
+          subVo.setCreateById(entity.getCreateById());
           // 子计划创建（不重新生成编号，因为使用父code+后缀）
           procurementPlanService.createSubPlan(subVo);
         }
@@ -555,20 +569,20 @@ public class ProcurementPlanReplenishServiceImpl
       Object bizIdObj = map.get("bizId");
       String bizId = bizIdObj == null ? null : String.valueOf(bizIdObj);
+      // 将 Map 转换为 Vo，尝试获取 ID
+      String json = JsonUtil.toJsonString(map);
+      UpdateProcurementPlanReplenishVo vo = JsonUtil.parseObject(json, UpdateProcurementPlanReplenishVo.class);
       if (StringUtil.isBlank(bizId)) {
-        // 将 Map 转换为 Vo，尝试获取 ID
-        String json = JsonUtil.toJsonString(map);
-        UpdateProcurementPlanReplenishVo vo = JsonUtil.parseObject(json, UpdateProcurementPlanReplenishVo.class);
-        bizId = vo == null ? null : vo.getId();
-        if (vo != null && StringUtil.isNotBlank(vo.getId())) {
-          // 更新主表字段
-          ProcurementPlanReplenish replenish = new ProcurementPlanReplenish();
-          BeanUtil.copyProperties(vo, replenish);
-          this.updateById(replenish);
-
-          // 保存或更新明细
-          saveOrUpdateLines(vo.getId(), vo.getProcurementPlanReplenishLineList());
-        }
+        bizId = vo.getId();
+      }
+      if (vo != null && StringUtil.isNotBlank(vo.getId())) {
+        // 更新主表字段
+        ProcurementPlanReplenish replenish = new ProcurementPlanReplenish();
+        BeanUtil.copyProperties(vo, replenish);
+        this.updateById(replenish);
+
+        // 保存或更新明细
+        saveOrUpdateLines(vo.getId(), vo.getProcurementPlanReplenishLineList());
       }
       if ("PASS".equals(examStatus)) {
@@ -617,7 +631,7 @@ public class ProcurementPlanReplenishServiceImpl
    * @param lineList 明细列表
    */
   private void saveOrUpdateLines(String replenishId,
-      List<? extends CreateProcurementPlanReplenishLineVo> lineList) {
+      List<? extends UpdateProcurementPlanReplenishLineVo> lineList) {
     // 查询旧明细
     List<ProcurementPlanReplenishLine> oldLineList =
         procurementPlanReplenishLineService.getByProcurementPlanReplenishId(replenishId);
@@ -628,24 +642,34 @@ public class ProcurementPlanReplenishServiceImpl
     List<String> existIdList = new ArrayList<>();
     if (!CollectionUtil.isEmpty(lineList)) {
-      for (CreateProcurementPlanReplenishLineVo lineVo : lineList) {
-        UpdateProcurementPlanReplenishLineVo updateLineVo = (UpdateProcurementPlanReplenishLineVo) lineVo;
-        if (StringUtil.isNotBlank(updateLineVo.getId())) {
+      for (UpdateProcurementPlanReplenishLineVo lineVo : lineList) {
+        if (StringUtil.isNotBlank(lineVo.getId())) {
           // 更新已有明细
-          ProcurementPlanReplenishLine oldLine = oldLineMap.get(updateLineVo.getId());
+          ProcurementPlanReplenishLine oldLine = oldLineMap.get(lineVo.getId());
           if (oldLine == null) {
             throw new DefaultClientException("采购计划补单明细不存在或不属于当前补单！");
           }
-          existIdList.add(updateLineVo.getId());
-          updateLineVo.setProcurementPlanReplenishId(replenishId);
-          if (StringUtil.isBlank(updateLineVo.getItemId())) {
-            updateLineVo.setItemId(oldLine.getItemId());
+          existIdList.add(lineVo.getId());
+          if (StringUtil.isBlank(lineVo.getItemId())) {
+            lineVo.setItemId(oldLine.getItemId());
           }
-          ProcurementPlanReplenishLine updateLine =
-              BeanUtil.copyProperties(updateLineVo, ProcurementPlanReplenishLine.class);
-          updateLine.setId(updateLineVo.getId());
-          procurementPlanReplenishLineService.updateById(updateLine);
+          LambdaUpdateWrapper<ProcurementPlanReplenishLine> updateWrapper = new LambdaUpdateWrapper<>(ProcurementPlanReplenishLine.class);
+          updateWrapper.eq(ProcurementPlanReplenishLine::getId, lineVo.getId())
+                  .set(ProcurementPlanReplenishLine::getProcurementPlanReplenishId, replenishId)
+                  .set(ProcurementPlanReplenishLine::getProductId, lineVo.getProductId())
+                  .set(ProcurementPlanReplenishLine::getMaterialType, lineVo.getMaterialType())
+                  .set(ProcurementPlanReplenishLine::getQuantity, lineVo.getQuantity())
+                  .set(ProcurementPlanReplenishLine::getActualPurchasePrice, lineVo.getActualPurchasePrice())
+                  .set(ProcurementPlanReplenishLine::getIncludingShippingPrice, lineVo.getIncludingShippingPrice())
+                  .set(ProcurementPlanReplenishLine::getPriceListPrices, lineVo.getPriceListPrices())
+                  .set(ProcurementPlanReplenishLine::getCoordinationRange, lineVo.getCoordinationRange())
+                  .set(ProcurementPlanReplenishLine::getEstimatedLoss, lineVo.getEstimatedLoss())
+                  .set(ProcurementPlanReplenishLine::getApplicationAttrition, lineVo.getApplicationAttrition())
+                  .set(ProcurementPlanReplenishLine::getPaintDamageRatio, lineVo.getPaintDamageRatio())
+                  .set(ProcurementPlanReplenishLine::getWorkshopId, lineVo.getWorkshopId())
+                  .set(ProcurementPlanReplenishLine::getItemId, lineVo.getItemId());
+          procurementPlanReplenishLineService.update(updateWrapper);
         } else {
           // 新增明细
           ProcurementPlanReplenishLine createLine =
@@ -687,31 +711,24 @@ public class ProcurementPlanReplenishServiceImpl
       return;
     }
-    List<String> businessIds = validDatas.stream()
-        .map(ProcurementPlanReplenish::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())
-        : new HashSet<>();
+    List<String> businessIds = validDatas.stream().map(ProcurementPlanReplenish::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 (ProcurementPlanReplenish replenish : validDatas) {
       boolean hasFlow = flowBusinessIdSet.contains(replenish.getId());
-      replenish.setShowExamineDetail(hasFlow && StringUtil.isNotBlank(replenish.getApprovalStatus()));
-      replenish.setShowExamine(hasFlow && CustomerDevelopStatus.AUDIT.name().equals(replenish.getApprovalStatus()));
+      boolean hasTodo = todoBusinessIdSet.contains(replenish.getId());
+      replenish.setShowExamineDetail(hasFlow && StringUtils.isNotBlank(replenish.getApprovalStatus()));
+      replenish.setShowExamine(hasTodo && CustomerDevelopStatus.AUDIT.name().equals(replenish.getApprovalStatus()));
     }
   }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/summary/DomesticPlanSummaryServiceImpl.java
View file @7514592
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/summary/DomesticPlanSummaryServiceImpl.java
View file @7514592
@@ -12,13 +12,12 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.xingyun.sc.bo.procurement.GetDomesticPlanSummaryBo;
 import com.lframework.xingyun.sc.bo.procurement.GetDomesticPlanSummaryDetailBo;
-import com.lframework.xingyun.sc.procurement.entity.ProcurementBuyoutApply;
-import com.lframework.xingyun.sc.procurement.entity.replenish.ProcurementPlanReplenish;
+import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
 import com.lframework.xingyun.sc.procurement.entity.summary.DomesticPlanSummary;
 import com.lframework.xingyun.sc.procurement.entity.summary.DomesticPlanSummaryDetail;
 import com.lframework.xingyun.sc.procurement.mappers.summary.DomesticPlanSummaryDetailMapper;
 import com.lframework.xingyun.sc.procurement.mappers.summary.DomesticPlanSummaryMapper;
-import com.lframework.xingyun.sc.procurement.service.buyout.ProcurementBuyoutApplyService;
+import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService;
 import com.lframework.xingyun.sc.procurement.service.replenish.ProcurementPlanReplenishService;
 import com.lframework.xingyun.sc.procurement.service.summary.DomesticPlanSummaryDetailService;
 import com.lframework.xingyun.sc.procurement.service.summary.DomesticPlanSummaryService;
@@ -34,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -51,9 +51,7 @@ public class DomesticPlanSummaryServiceImpl extends
   @Resource
   private DomesticPlanSummaryDetailService domesticPlanSummaryDetailService;
   @Resource
-  private ProcurementBuyoutApplyService procurementBuyoutApplyService;
-  @Resource
-  private ProcurementPlanReplenishService procurementPlanReplenishService;
+  private ProcurementPlanService procurementPlanService;
   @Override
   public PageResult<DomesticPlanSummary> query(Integer pageIndex, Integer pageSize,
@@ -138,27 +136,14 @@ public class DomesticPlanSummaryServiceImpl extends
         .filter(Objects::nonNull)
         .collect(Collectors.toSet());
-    Set<String> buyoutPlanIds = Collections.emptySet();
+    Map<String, ProcurementPlan> procurementPlanMap = Collections.emptyMap();
     if (CollectionUtil.isNotEmpty(planIds)) {
-      buyoutPlanIds = procurementBuyoutApplyService.list(
-              Wrappers.lambdaQuery(ProcurementBuyoutApply.class)
-                  .in(ProcurementBuyoutApply::getProcurementPlanId, planIds)
-                  .select(ProcurementBuyoutApply::getProcurementPlanId))
-          .stream()
-          .map(ProcurementBuyoutApply::getProcurementPlanId)
-          .collect(Collectors.toSet());
-    }
-
-    Set<String> replenishPlanIds = Collections.emptySet();
-    if (CollectionUtil.isNotEmpty(planIds)) {
-      replenishPlanIds = procurementPlanReplenishService.list(
-              Wrappers.lambdaQuery(ProcurementPlanReplenish.class)
-                  .in(ProcurementPlanReplenish::getProcurementPlanId, planIds)
-                  .eq(ProcurementPlanReplenish::getApprovalStatus, "PASS")
-                  .select(ProcurementPlanReplenish::getProcurementPlanId))
-          .stream()
-          .map(ProcurementPlanReplenish::getProcurementPlanId)
-          .collect(Collectors.toSet());
+      procurementPlanMap = procurementPlanService.list(
+              Wrappers.lambdaQuery(ProcurementPlan.class)
+                      .in(ProcurementPlan::getId, planIds))
+              .stream()
+              // 以 ID 为 Key，ProcurementPlan 对象为 Value 收集到 Map 中
+              .collect(Collectors.toMap(ProcurementPlan::getId, Function.identity()));
     }
     DomesticPlanSummary summary = new DomesticPlanSummary();
@@ -222,14 +207,18 @@ public class DomesticPlanSummaryServiceImpl extends
       d.setUpdateById("1");
       d.setUpdateBy("系统管理员");
-      boolean hasBuyout = buyoutPlanIds.contains(d.getPlanId());
-      boolean hasReplenish = replenishPlanIds.contains(d.getPlanId());
-      if (hasBuyout && hasReplenish) {
-        d.setRemarkFlag("买断 补单");
-      } else if (hasBuyout) {
-        d.setRemarkFlag("买断");
-      } else if (hasReplenish) {
-        d.setRemarkFlag("补单");
+      ProcurementPlan plan = procurementPlanMap.get(d.getPlanId());
+      if (plan != null) {
+        if ((plan.getCommodityBuyout() || plan.getQuantityBuyout() || plan.getQualityBuyout())
+                && plan.getPlanType() != null && plan.getPlanType().contains("补")) {
+          d.setRemarkFlag("买断 补单");
+        } else if (plan.getCommodityBuyout() || plan.getQuantityBuyout() || plan.getQualityBuyout()) {
+          d.setRemarkFlag("买断");
+        } else if (plan.getPlanType() != null && plan.getPlanType().contains("补")) {
+          d.setRemarkFlag("补单");
+        } else {
+          d.setRemarkFlag(null);
+        }
       } else {
         d.setRemarkFlag(null);
       }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/plan/CreateProcurementPlanVo.java
View file @7514592
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/plan/CreateProcurementPlanVo.java
View file @7514592
 package com.lframework.xingyun.sc.procurement.vo.plan;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.exceptions.impl.InputErrorException;
@@ -370,6 +372,12 @@ public class CreateProcurementPlanVo implements BaseVo, Serializable {
   @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
   private LocalDateTime approvalPassTime;
+  @ApiModelProperty("创建人ID")
+  private String createById;
+
+  @ApiModelProperty("创建人")
+  private String createBy;
+
   /**
    * 明细信息
    */
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/replenish/CreateProcurementPlanReplenishVo.java
View file @7514592
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/replenish/CreateProcurementPlanReplenishVo.java
View file @7514592
@@ -13,6 +13,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
+import org.apache.ibatis.annotations.Update;
 import org.hibernate.validator.constraints.Length;
 @Data
@@ -179,7 +180,7 @@ public class CreateProcurementPlanReplenishVo implements BaseVo, Serializable {
   @ApiModelProperty(value = "明细信息", required = true)
   @Valid
   @NotEmpty(message = "明细不能为空！")
-  private List<CreateProcurementPlanReplenishLineVo> procurementPlanReplenishLineList;
+  private List<UpdateProcurementPlanReplenishLineVo> procurementPlanReplenishLineList;
   public void validate() {
   }
--- a/xingyun-sc/src/main/resources/mappers/procurement/plan/ProcurementPlanMapper.xml
View file @7514592
+++ b/xingyun-sc/src/main/resources/mappers/procurement/plan/ProcurementPlanMapper.xml
View file @7514592
@@ -273,6 +273,7 @@
                     </when>
                     <when test="vo.queryType == 'REPLENISHMENT'">
                         AND pp.process_status IN ('COMPLETED', 'ABORTED')
+                        AND pp.plan_type NOT LIKE '%补%'
                         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')