采购计划：选择分厂

@@ -94,8 +94,8 @@ public class ProcurementPlanController extends DefaultBaseController {
   /**
   /**
    * 修改
    * 修改
    */
    */
-  @ApiOperation("修改")
-  @HasPermission({"plan-manage:domestic-plan:supple"})
+  @ApiOperation("修改/选择分厂")
+  @HasPermission({"plan-manage:domestic-plan:supple","plan-manage:domestic-plan:split"})
   @PutMapping
   @PutMapping
   public InvokeResult<Void> update(@RequestBody @Valid UpdateProcurementPlanVo vo) {
   public InvokeResult<Void> update(@RequestBody @Valid UpdateProcurementPlanVo vo) {
 
 
@@ -120,6 +120,19 @@ public class ProcurementPlanController extends DefaultBaseController {
   }
   }
 
 
   /**
   /**
+   * 提交
+   */
+  @ApiOperation("提交")
+  @HasPermission({"plan-manage:domestic-plan:submit"})
+  @PostMapping("/submit")
+  public InvokeResult<Void> submit(@Valid String id) {
+
+    procurementPlanService.submit(id);
+
+    return InvokeResultBuilder.success();
+  }
+
+  /**
    * 删除
    * 删除
    */
    */
   @ApiOperation("删除")
   @ApiOperation("删除")

@@ -14,6 +14,8 @@ import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanBo;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanBo;
@@ -32,6 +34,9 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -46,6 +51,8 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
 
 
   @Autowired
   @Autowired
   private ProcurementPlanLineService procurementPlanLineService;
   private ProcurementPlanLineService procurementPlanLineService;
+  @Autowired
+  private SysDeptService sysDeptService;
 
 
   @Override
   @Override
   public PageResult<ProcurementPlan> query(Integer pageIndex, Integer pageSize,
   public PageResult<ProcurementPlan> query(Integer pageIndex, Integer pageSize,
@@ -218,6 +225,10 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
     if (StringUtil.isBlank(id)) {
     if (StringUtil.isBlank(id)) {
       throw new InputErrorException("ID不能为空！");
       throw new InputErrorException("ID不能为空！");
     }
     }
+    ProcurementPlan procurementPlan = getBaseMapper().selectById(id);
+    if (procurementPlan == null || procurementPlan.getCompanyShortId() == null) {
+      throw new InputErrorException("请先补充公司名称！");
+    }
     //todo 后面合同模块需要补充生成合同的逻辑
     //todo 后面合同模块需要补充生成合同的逻辑
     LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
     LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
             .set(ProcurementPlan::getProcessNode, "GYGLKZLGLG")
             .set(ProcurementPlan::getProcessNode, "GYGLKZLGLG")
@@ -227,6 +238,146 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
     getBaseMapper().update(updateWrapper);
     getBaseMapper().update(updateWrapper);
   }
   }
 
 
+  @Transactional(rollbackFor = Exception.class)
+  @Override
+  public void submit(String id) {
+    if (StringUtil.isBlank(id)) {
+      throw new InputErrorException("ID不能为空！");
+    }
+    ProcurementPlan mainPlan = getBaseMapper().findById(id);
+    if (mainPlan == null) {
+      throw new DefaultClientException("采购计划不存在！");
+    }
+    List<ProcurementPlanLine> allLines = procurementPlanLineService.getByProcurementPlanId(id);
+
+    if (CollectionUtil.isEmpty(allLines)) {
+      throw new DefaultClientException("采购计划明细不能为空，无法提交！");
+    }
+
+    // 1. 校验明细：只要有任意一条明细未配置分厂ID，就不允许拆分
+    boolean hasEmptyWorkshopId = allLines.stream()
+            .anyMatch(line -> line.getWorkshopId() == null); // 检查是否存在空的分厂ID
+
+    if (hasEmptyWorkshopId) {
+      throw new DefaultClientException("部分采购计划明细未选择分厂，请先选择分厂！");
+    }
+
+    // 2. 校验通过后，再提取所有的 workshopId（此时可保证全部非空）
+    List<String> workshopIds = allLines.stream()
+            .map(ProcurementPlanLine::getWorkshopId)
+            .distinct()
+            .collect(Collectors.toList());
+    Map<String, String> deptId2CodeMap = new HashMap<>();
+    List<SysDept> deptList = sysDeptService.listByIds(workshopIds);
+    if (CollectionUtil.isNotEmpty(deptList)) {
+      deptId2CodeMap = deptList.stream()
+          .filter(d -> StringUtil.isNotBlank(d.getCode()))
+          .collect(Collectors.toMap(SysDept::getId, SysDept::getCode, (v1, v2) -> v1));
+    }
+
+    // 分厂顺序：yfc(01) / efc(02) / sfc(03) / ztfc(04)
+    Map<String, Integer> workOrderMap = new LinkedHashMap<>();
+    workOrderMap.put("yfc", 1);
+    workOrderMap.put("efc", 2);
+    workOrderMap.put("sfc", 3);
+    workOrderMap.put("ztfc", 4);
+
+    // 按分厂code分组明细（非法/缺失code的明细都提示）
+    Map<String, List<ProcurementPlanLine>> code2LinesMap = new LinkedHashMap<>();
+    for (ProcurementPlanLine line : allLines) {
+      String code = deptId2CodeMap.get(line.getWorkshopId());
+      code2LinesMap.computeIfAbsent(code, k -> new ArrayList<>()).add(line);
+    }
+
+    long distinctFactoryCount = code2LinesMap.keySet().stream().distinct().count();
+    if (distinctFactoryCount <= 1) {
+      // 所有明细都同一分厂，不需要拆分，直接把主计划推到下一节点
+      LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
+              .set(ProcurementPlan::getProcessNode, "GYGLKZG")
+              .set(ProcurementPlan::getProcessStatus, "TO_SUBMIT_REVIEW")
+              .eq(ProcurementPlan::getId, id);
+      getBaseMapper().update(updateWrapper);
+      //todo 生成买断操作申请单
+      return;
+    }
+
+    // 2. 多分厂：按 yfc/efc/sfc/ztfc 的顺序生成子计划
+    List<Map.Entry<String, List<ProcurementPlanLine>>> sortedEntries = code2LinesMap.entrySet().stream()
+        .sorted(Comparator.comparingInt(e -> workOrderMap.getOrDefault(e.getKey(), Integer.MAX_VALUE)))
+        .collect(Collectors.toList());
+
+    int subSeq = 0;
+    for (Map.Entry<String, List<ProcurementPlanLine>> entry : sortedEntries) {
+      List<ProcurementPlanLine> factoryLines = entry.getValue();
+      if (CollectionUtil.isEmpty(factoryLines)) {
+        continue;
+      }
+      subSeq++;
+      String suffix = String.format("%02d", subSeq);
+      String subCode = mainPlan.getCode() + "_" + suffix;
+
+      // 3. 子计划主表：除明细/编号/parentId/流程状态节点外，其余同主计划
+      CreateProcurementPlanVo subVo = BeanUtil.copyProperties(mainPlan, CreateProcurementPlanVo.class);
+      subVo.setCode(subCode);
+      subVo.setParentId(mainPlan.getId());
+      subVo.setProcessStatus("TO_SUBMIT_REVIEW");
+      subVo.setProcessNode("GYGLKZG");
+
+      // 子明细：只保留当前分厂，workshopId 保持原明细的，其它字段按原明细 copy
+      List<ProcurementPlanLineVo> subLineVoList = new ArrayList<>();
+      for (ProcurementPlanLine line : factoryLines) {
+        ProcurementPlanLineVo lineVo = BeanUtil.copyProperties(line, ProcurementPlanLineVo.class);
+        lineVo.setWorkshopId(line.getWorkshopId());
+        subLineVoList.add(lineVo);
+      }
+      subVo.setProcurementPlanLineList(subLineVoList);
+
+      // 子计划创建（不重新生成编号，因为使用父code+后缀）
+      createSubPlan(subVo);
+      //todo 生成买断操作申请单
+    }
+
+    // 4. 冻结主计划（不再变更主计划）
+    LambdaUpdateWrapper<ProcurementPlan> mainUpdateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
+            .set(ProcurementPlan::getFrozen, Boolean.TRUE)
+            .set(ProcurementPlan::getProcessNode, null)
+            .set(ProcurementPlan::getProcessStatus, null)
+            .eq(ProcurementPlan::getId, id);
+    getBaseMapper().update(mainUpdateWrapper);
+  }
+
+  /**
+   * 子计划创建：与 create() 逻辑一致，但不重新 buildPlanCode（因为子计划编号已按父code+后缀生成）
+   */
+  @Transactional(rollbackFor = Exception.class)
+  public void createSubPlan(CreateProcurementPlanVo vo) {
+    vo.validate();
+
+    ProcurementPlan plan = BeanUtil.copyProperties(vo, ProcurementPlan.class);
+    plan.setId(IdUtil.getId());
+
+    BigDecimal totalQuantity = BigDecimal.ZERO;
+    if (!CollectionUtil.isEmpty(vo.getProcurementPlanLineList())) {
+      for (ProcurementPlanLineVo lineVo : vo.getProcurementPlanLineList()) {
+        if (lineVo.getQuantity() != null) {
+          totalQuantity = NumberUtil.add(totalQuantity, lineVo.getQuantity());
+        }
+      }
+    }
+    plan.setTotalQuantity(totalQuantity);
+
+    getBaseMapper().insert(plan);
+
+    if (!CollectionUtil.isEmpty(vo.getProcurementPlanLineList())) {
+      for (ProcurementPlanLineVo lineVo : vo.getProcurementPlanLineList()) {
+        ProcurementPlanLine line = BeanUtil.copyProperties(lineVo, ProcurementPlanLine.class);
+        line.setId(IdUtil.getId());
+        line.setProcurementPlanId(plan.getId());
+        procurementPlanLineService.save(line);
+      }
+    }
+  }
+
   /**
   /**
    * 生成采购计划编号（业务要求按日期时间生成，保证唯一）
    * 生成采购计划编号（业务要求按日期时间生成，保证唯一）
    *
    *

@@ -781,6 +781,8 @@ public class SalesmanQuotationServiceImpl
             lineVo.setQuantity(line.getQuantity());
             lineVo.setQuantity(line.getQuantity());
             // 实际采购价 = 报价明细采购价
             // 实际采购价 = 报价明细采购价
             lineVo.setActualPurchasePrice(line.getPurchasePrice());
             lineVo.setActualPurchasePrice(line.getPurchasePrice());
+            //含运到厂价(实际采购价+另附运费)
+            lineVo.setIncludingShippingPrice(line.getPurchasePrice());
             // 价格表价格
             // 价格表价格
             if (latest != null && CollectionUtil.isNotEmpty(latest.getPriceSubTableList())) {
             if (latest != null && CollectionUtil.isNotEmpty(latest.getPriceSubTableList())) {
                 List<PriceSubTable> priceSubTableList = latest.getPriceSubTableList();
                 List<PriceSubTable> priceSubTableList = latest.getPriceSubTableList();
@@ -791,7 +793,20 @@ public class SalesmanQuotationServiceImpl
                         .orElse(null); // 如果没有匹配到，返回 null
                         .orElse(null); // 如果没有匹配到，返回 null
                 lineVo.setPriceListPrices(targetPrice);
                 lineVo.setPriceListPrices(targetPrice);
             }
             }
+            //买断预计损耗
             lineVo.setEstimatedLoss(line.getEstimatedLoss());
             lineVo.setEstimatedLoss(line.getEstimatedLoss());
+            //协调幅度=含运到厂价+买断料预计损耗-价格表价格
+            BigDecimal estimatedLoss = line.getEstimatedLoss();
+            BigDecimal priceListPrices = lineVo.getPriceListPrices();
+            BigDecimal coordinationRange = lineVo.getIncludingShippingPrice(); // 初始值为含运到厂价
+
+            if (estimatedLoss != null) {
+                coordinationRange = coordinationRange.add(estimatedLoss);
+            }
+            if (priceListPrices != null) {
+                coordinationRange = coordinationRange.subtract(priceListPrices);
+            }
+            lineVo.setCoordinationRange(coordinationRange);
             lineVo.setApplicationAttrition(line.getApplicationAttrition());
             lineVo.setApplicationAttrition(line.getApplicationAttrition());
             lineVo.setItemId(line.getItemId());
             lineVo.setItemId(line.getItemId());
             lineVoList.add(lineVo);
             lineVoList.add(lineVo);

@@ -65,4 +65,11 @@ public interface ProcurementPlanService extends BaseMpService<ProcurementPlan> {
    * @param id
    * @param id
    */
    */
   void generateContract(String id);
   void generateContract(String id);
+
+  /**
+   * 提交
+   *
+   * @param id
+   */
+  void submit(String id);
 }
 }