采购计划：导出

@@ -226,6 +226,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   private String priceId;
 
   /**
+   * 价格表CODE
+   */
+  @ApiModelProperty("价格表CODE")
+  private String priceCode;
+
+  /**
    * 协调事由
    */
   @ApiModelProperty("协调事由")
@@ -352,6 +358,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   private String workshopId;
 
   /**
+   * 分厂
+   */
+  @ApiModelProperty("分厂")
+  private String workshopName;
+
+  /**
    * 关联业务员报价单ID
    */
   @ApiModelProperty("关联业务员报价单ID")
@@ -472,6 +484,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
     private String productId;
 
     /**
+     * 品种名称
+     */
+    @ApiModelProperty("品种名称")
+    private String productName;
+
+    /**
      * 料型
      */
     @ApiModelProperty("料型")
@@ -532,6 +550,12 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
     private String workshopId;
 
     /**
+     * 分厂
+     */
+    @ApiModelProperty("分厂")
+    private String workshopName;
+
+    /**
      * 是否展示审核按钮
      */
     @ApiModelProperty("是否展示审核按钮")

 package com.lframework.xingyun.sc.procurement.controller.plan;
 
+import cn.hutool.core.io.resource.ClassPathResource;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
@@ -8,7 +10,11 @@ import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.xingyun.sc.bo.procurement.GetProcurementBuyoutApplyBo;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanBo;
+import com.lframework.xingyun.sc.bo.procurement.ProcurementBuyoutApplyLineBo;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementBuyoutApply;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
 import com.lframework.xingyun.sc.procurement.service.buyout.ProcurementBuyoutApplyService;
@@ -16,16 +22,16 @@ import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService
 import com.lframework.xingyun.sc.procurement.vo.plan.CreateProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.QueryProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.UpdateProcurementPlanVo;
+import com.lframework.xingyun.sc.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -35,8 +41,22 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Api(tags = "采购计划管理")
+@Slf4j
 @Validated
 @RestController
 @RequestMapping("/procurement/plan")
@@ -46,6 +66,9 @@ public class ProcurementPlanController extends DefaultBaseController {
   private ProcurementPlanService procurementPlanService;
   @Autowired
   private ProcurementBuyoutApplyService procurementBuyoutApplyService;
+  @Autowired
+  private SysDataDicItemService sysDataDicItemService;
+
 
   /**
    * 查询列表
@@ -240,4 +263,289 @@ public class ProcurementPlanController extends DefaultBaseController {
       bo.setShowAbolishBuyoutApply(buyoutFlag && count > 0L);
     }
   }
+
+  /**
+   * 导出采购计划
+   */
+  @ApiOperation("导出采购计划")
+  @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
+  @HasPermission({"plan-manage:domestic-plan:print"})
+  @GetMapping("/export")
+  public void export(@NotBlank(message = "ID不能为空！") String id,
+                     HttpServletResponse response) throws IOException {
+
+    GetProcurementPlanBo plan = procurementPlanService.getDetail(id);
+    if (plan == null) {
+      throw new DefaultClientException("采购计划不存在！");
+    }
+    setupResponse(response, (plan.getCode() == null ? "" : plan.getCode()) + "-采购计划.xlsx");
+
+    GetProcurementBuyoutApplyBo buyoutApply = procurementBuyoutApplyService.findByPlanId(id);
+    ClassPathResource templateResource = new ClassPathResource("templates/planTemplate.xlsx");
+    if (buyoutApply != null) {
+      templateResource = new ClassPathResource("templates/planAndBuyoutTemplate.xlsx");
+    }
+    try {
+      try (InputStream inputStream = templateResource.getStream();
+           Workbook workbook = new XSSFWorkbook(inputStream)) {
+        try {
+          DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+          // === Sheet1：采购计划主表 + 子表 ===
+          Sheet sheet1 = workbook.getSheet("计划单");
+
+          List<GetProcurementPlanBo.ProcurementPlanLineBo> planLineList = plan.getProcurementPlanLineList();
+          int planStartRow = 4; // 采购计划子表开始行，可根据模板调整
+          if (CollectionUtils.isNotEmpty(planLineList)) {
+            for (int i = 0; i < planLineList.size(); i++) {
+              GetProcurementPlanBo.ProcurementPlanLineBo line = planLineList.get(i);
+              ExcelUtil.setCellValue(sheet1, planStartRow, 0, line.getProductName());
+              ExcelUtil.setCellValue(sheet1, planStartRow, 1, line.getMaterialType());
+              ExcelUtil.setCellValue(sheet1, planStartRow, 2, line.getQuantity());
+              ExcelUtil.setCellValue(sheet1, planStartRow, 3, line.getActualPurchasePrice());
+              ExcelUtil.setCellValue(sheet1, planStartRow, 4, line.getIncludingShippingPrice());
+              ExcelUtil.setCellValue(sheet1, planStartRow, 5, line.getPriceListPrices());
+              ExcelUtil.setCellValue(sheet1, planStartRow, 6, line.getCoordinationRange());
+              ExcelUtil.setCellValue(sheet1, planStartRow, 7, line.getEstimatedLoss());
+              ExcelUtil.setCellValue(sheet1, planStartRow, 8, line.getWorkshopName());
+              planStartRow++;
+            }
+          }
+
+          Map<String, Object> planDataMap = new HashMap<>();
+          planDataMap.put("code", nvl(plan.getCode()) + nvl(plan.getPlanType()));
+          planDataMap.put("companyShortName", nvl(plan.getCompanyShortName()));
+          planDataMap.put("workshopName", nvl(plan.getWorkshopName()));
+          planDataMap.put("purchaseDepartmentName", nvl(plan.getPurchaseDepartmentName()));
+          planDataMap.put("regionName", nvl(plan.getRegionName()));
+          planDataMap.put("date", plan.getDate() == null ? "" : plan.getDate().format(dateFormatter));
+          planDataMap.put("supplierName", nvl(plan.getSupplierName()));
+          planDataMap.put("commodityBuyout", plan.getCommodityBuyout() == null ? "□" : (plan.getCommodityBuyout() ? "■" : "□"));
+          planDataMap.put("qualityBuyout", plan.getQualityBuyout() == null ? "□" : (plan.getQualityBuyout() ? "■" : "□"));
+          planDataMap.put("quantityBuyout", plan.getQuantityBuyout() == null ? "□" : (plan.getQuantityBuyout() ? "■" : "□"));
+          planDataMap.put("doorDelivery", plan.getDoorDelivery() == null ? "□" : (plan.getDoorDelivery() ? "■" : "□"));
+          planDataMap.put("longTermOperation", plan.getLongTermOperation() == null ? "□" : (plan.getLongTermOperation() ? "■" : "□"));
+          planDataMap.put("terminalCustomer", plan.getTerminalCustomer() == null ? "□" : (plan.getTerminalCustomer() ? "■" : "□"));
+          planDataMap.put("shippingCostB", plan.getShippingCost() == null ? "□" : "■");
+          planDataMap.put("shippingCost", formatDecimal(plan.getShippingCost()));
+          planDataMap.put("loadingFeeB", plan.getLoadingFee() == null ? "□" : "■");
+          planDataMap.put("loadingFee", formatDecimal(plan.getLoadingFee()));
+          planDataMap.put("otherExpenseSettlement", plan.getOtherExpenseSettlement() == null ? "□" : (plan.getOtherExpenseSettlement() ? "■" : "□"));
+          planDataMap.put("remark", nvl(plan.getRemark()));
+          planDataMap.put("totalQuantity", formatDecimal(plan.getTotalQuantity()));
+          planDataMap.put("coordinationReason", nvl(plan.getCoordinationReason()));
+          planDataMap.put("invoiceTypeStatus", nvl(plan.getInvoiceTypeStatus()));
+          planDataMap.put("invoiceProductName", nvl(plan.getInvoiceProductName()));
+          //交货日期
+          if (plan.getDeliveryDate() != null) {
+            // M 表示不补零的月份，d 表示不补零的日期
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d'提'");
+            String formattedDate = plan.getDeliveryDate().format(formatter);
+            planDataMap.put("deliveryDate", formattedDate);
+          } else {
+            planDataMap.put("deliveryDate", ""); // 或者你需要的默认值
+          }
+          List<SysDataDicItem> deliveryModeList = sysDataDicItemService.findByDicCode("DELIVERY_METHOD");
+          Map<String, String> deliveryModeMap = deliveryModeList.stream()
+                  .collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName, (v1, v2) -> v1));
+          planDataMap.put("deliveryMode", deliveryModeMap.get(nvl(plan.getDeliveryMode())));
+          planDataMap.put("settlementRatio", formatDecimal(plan.getSettlementRatio()));
+          planDataMap.put("priceCode", nvl(plan.getPriceCode()));
+          //启用料质状况
+          if (Boolean.TRUE.equals(plan.getMaterialConditionEnabled())) {
+            planDataMap.put("copperRiceCondition",
+                    buildMaterialConditionStr("COPPER_RICE", plan.getMaterialConditionCopperRice(), -1));
+            // 光亮铜：前4后换行（多股光亮丝/表面光亮的板材/表面光亮的棒材/内外表面光亮的管材；第2行光亮丝/光亮丝铜米）
+            planDataMap.put("brightCopperCondition",
+                    buildMaterialConditionStr("BRIGHT_COPPER", plan.getMaterialConditionBrightCopper(), 4));
+            // 一特：前5后换行（火烧丝/火烧扁线/表面氧化的板材/表面氧化的棒材/表面氧化的管材；第2行镀白丝…）
+            planDataMap.put("firstClassCondition",
+                    buildMaterialConditionStr("FIRST_CLASS", plan.getMaterialConditionFirstClass(), 5) + "  注：镀白板不扣杂");
+            planDataMap.put("secondClassCondition",
+                    buildMaterialConditionStr("SECOND_CLASS", plan.getMaterialConditionSecondClass(), -1));
+            planDataMap.put("tinCoatedCondition",
+                    buildMaterialConditionStr("TIN_COATED", plan.getMaterialConditionTinCoated(), -1));
+            // 角料：前7后换行（条形料/冲片料/字牌/天线管及管料/黄铜网/铜米/油铜米；第2行火烧拉链米/纽扣/锁球）
+            planDataMap.put("scrapCondition",
+                    buildMaterialConditionStr("SCRAP", plan.getMaterialConditionScrap(), 7));
+            planDataMap.put("whiteYellowCondition",
+                    buildMaterialConditionStr("WHITE_YELLOW", plan.getMaterialConditionWhiteYellow(), -1));
+            planDataMap.put("phosphorCopperCondition",
+                    buildMaterialConditionStr("PHOSPHOR_COPPER", plan.getMaterialConditionPhosphorCopper(), -1));
+          } else {
+            planDataMap.put("copperRiceCondition", "□清一色通讯电话线加工的米粒状，表面光亮");
+            planDataMap.put("brightCopperCondition", "□多股光亮丝   □表面光亮的板材  □表面光亮的棒材  □内外表面光亮的管材\n" +
+                    "□光亮丝       □光亮丝铜米");
+            planDataMap.put("firstClassCondition", "□火烧丝  □火烧扁线  □表面氧化的板材  □表面氧化的棒材  □表面氧化的管材\n" +
+                    "□镀白丝、各种镀白型材、镀白冲料  注：镀白板不扣杂");
+            planDataMap.put("secondClassCondition", "□火烧丝  □火烧扁线  □镀白丝、各种镀白型材、镀白冲料");
+            planDataMap.put("tinCoatedCondition", "□镀锡丝  □镀锡针 □镀锡冲料 □镀锡条形料 □火烧镀锡针 □镀锡板 □镀锡棒");
+            planDataMap.put("scrapCondition", "□条形料  □冲片料  □字牌   □天线管及管料  □黄铜网    □铜米    □油铜米\n" +
+                    "□火烧拉链米 □纽扣 □锁球");
+            planDataMap.put("whiteYellowCondition", "□条形料 □冲片料 □天线管及管料 □纽扣 □锁球");
+            planDataMap.put("phosphorCopperCondition", "□条形料 □冲片料 □磷铜型材  □磷铜网");
+          }
+          //制单人
+          planDataMap.put("createBy", nvl(plan.getCreateBy()));
+
+          processTemplateSheet(sheet1, planDataMap);
+
+          // === Sheet2：买断操作申请单（仅当存在时填充）===
+          if (buyoutApply != null && workbook.getNumberOfSheets() > 1) {
+            Sheet sheet2 = workbook.getSheet("买断申请单");
+
+            List<ProcurementBuyoutApplyLineBo> buyoutLineList = buyoutApply.getLineList();
+            int buyoutStartRow = 3; // 买断单子表开始行，可根据模板调整
+            if (CollectionUtils.isNotEmpty(buyoutLineList)) {
+              for (int i = 0; i < buyoutLineList.size(); i++) {
+                ProcurementBuyoutApplyLineBo line = buyoutLineList.get(i);
+                ExcelUtil.setCellValue(sheet2, buyoutStartRow, 2, line.getProductName());
+                ExcelUtil.setCellValue(sheet2, buyoutStartRow, 4, line.getQuantity());
+                ExcelUtil.setCellValue(sheet2, buyoutStartRow, 6, line.getBuyoutPrice());
+                buyoutStartRow++;
+              }
+            }
+
+            int buyoutStartRow1 = 15; // 买断单子表开始行，可根据模板调整
+            if (CollectionUtils.isNotEmpty(buyoutLineList)) {
+              for (int i = 0; i < buyoutLineList.size(); i++) {
+                ProcurementBuyoutApplyLineBo line = buyoutLineList.get(i);
+                ExcelUtil.setCellValue(sheet2, buyoutStartRow1, 2, line.getEstimatedLoss());
+                ExcelUtil.setCellValue(sheet2, buyoutStartRow1, 5, line.getPureCopperPrice());
+                buyoutStartRow1++;
+              }
+            }
+
+            Map<String, Object> buyoutDataMap = new HashMap<>();
+            buyoutDataMap.put("code", nvl(buyoutApply.getCode()));
+            buyoutDataMap.put("purchaseDepartmentName", nvl(buyoutApply.getPurchaseDepartmentName()));
+            buyoutDataMap.put("regionName", nvl(buyoutApply.getRegionName()));
+            buyoutDataMap.put("date", buyoutApply.getDate() == null ? "" : buyoutApply.getDate().format(dateFormatter));
+            buyoutDataMap.put("supplierName", nvl(buyoutApply.getSupplierName()));
+            buyoutDataMap.put("paintLoss", formatDecimal(buyoutApply.getPaintLoss()));
+            buyoutDataMap.put("createBy", nvl(buyoutApply.getCreateBy()));
+
+            processTemplateSheet(sheet2, buyoutDataMap);
+          }
+
+          workbook.write(response.getOutputStream());
+          response.getOutputStream().flush();
+        } finally {
+          IOUtils.closeQuietly(workbook);
+        }
+
+      } catch (FileNotFoundException e) {
+        throw new RuntimeException("模板文件不存在: templates/planAndBuyoutTemplate.xlsx", e);
+      } catch (IOException e) {
+        throw new RuntimeException("无法读取模板文件: templates/planAndBuyoutTemplate.xlsx", e);
+      }
+    } catch (Exception e) {
+      log.error("导出采购计划失败, id={}, {}", id, e.getMessage(), e);
+      throw e;
+    }
+  }
+
+  /**
+   * 设置HTTP响应头
+   */
+  private void setupResponse(HttpServletResponse response, String fileName) throws IOException {
+    String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+
+    response.setContentType("application/vnd.ms-excel");
+    response.setCharacterEncoding("UTF-8");
+    response.setHeader("Content-Disposition", "attachment;filename=" + encodedFileName);
+    response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+  }
+
+  /**
+   * 按单 Sheet 替换模板占位符（${...} / #{...}）
+   */
+  private void processTemplateSheet(Sheet sheet, Map<String, Object> dataMap) {
+    for (Row row : sheet) {
+      for (Cell cell : row) {
+        if (cell.getCellTypeEnum() == CellType.STRING) {
+          String cellValue = cell.getStringCellValue();
+          String newValue = replacePlaceholders(cellValue, dataMap);
+          if (!cellValue.equals(newValue)) {
+            cell.setCellValue(newValue);
+          }
+        }
+      }
+    }
+  }
+
+  private String replacePlaceholders(String text, Map<String, Object> dataMap) {
+    if (text == null || text.isEmpty()) {
+      return text;
+    }
+
+    String result = text;
+    for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
+      String placeholder = "${" + entry.getKey() + "}";
+      String value = entry.getValue() != null ? entry.getValue().toString() : "";
+      value = value.replace("\\n", "\n");
+      result = result.replace(placeholder, value);
+    }
+
+    for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
+      String placeholder = "#{" + entry.getKey() + "}";
+      String value = entry.getValue() != null ? entry.getValue().toString() : "";
+      value = value.replace("\\n", "\n");
+      result = result.replace(placeholder, value);
+    }
+
+    return result;
+  }
+
+  private String nvl(Object o) {
+    return o == null ? "" : o.toString();
+  }
+
+  private String formatDecimal(BigDecimal bd) {
+    if (bd == null) {
+      return "";
+    }
+    return bd.stripTrailingZeros().toPlainString();
+  }
+
+  /**
+   * 料质状况复选框拼接
+   *
+   * @param dicCode         字典编码
+   * @param selectedCodeStr 已选中的字典项code，逗号分隔
+   * @param itemsPerLine    每行多少项后换行；&lt;=0 表示不换行
+   * @return 形如 ☑选项1   □选项2\n☑选项3
+   */
+  private String buildMaterialConditionStr(String dicCode, String selectedCodeStr, int itemsPerLine) {
+    List<SysDataDicItem> dicItemList = sysDataDicItemService.findByDicCode(dicCode);
+    if (CollectionUtils.isEmpty(dicItemList)) {
+      return "";
+    }
+
+    Set<String> selectedCodes = new HashSet<>();
+    if (StringUtils.isNotBlank(selectedCodeStr)) {
+      selectedCodes = Arrays.stream(selectedCodeStr.split(","))
+              .map(String::trim)
+              .filter(StringUtils::isNotBlank)
+              .collect(Collectors.toSet());
+    }
+
+    Set<String> finalSelectedCodes = selectedCodes;
+    List<String> lines = new ArrayList<>();
+    List<String> currentLine = new ArrayList<>();
+    int idx = 0;
+    for (SysDataDicItem item : dicItemList) {
+      String prefix = finalSelectedCodes.contains(item.getCode()) ? "☑" : "□";
+      currentLine.add(prefix + item.getName());
+      idx++;
+      if (itemsPerLine > 0 && idx % itemsPerLine == 0) {
+        lines.add(String.join("   ", currentLine));
+        currentLine.clear();
+      }
+    }
+    if (!currentLine.isEmpty()) {
+      lines.add(String.join("   ", currentLine));
+    }
+    return String.join("\n", lines);
+  }
 }

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -193,6 +194,12 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private String priceId;
 
   /**
+   * 价格表Code
+   */
+  @TableField(exist = false)
+  private String priceCode;
+
+  /**
    * 协调事由
    */
   private String coordinationReason;
@@ -298,6 +305,12 @@ public class ProcurementPlan extends BaseEntity implements BaseDto {
   private String workshopId;
 
   /**
+   * 分厂
+   */
+  @TableField(exist = false)
+  private String workshopName;
+
+  /**
    * 关联业务员报价单ID
    */
   private String salesmanQuotationId;

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -32,6 +33,12 @@ public class ProcurementPlanLine extends BaseEntity implements BaseDto {
   private String productId;
 
   /**
+   * 品种名称
+   */
+  @TableField(exist = false)
+  private String productName;
+
+  /**
    * 料型
    */
   private String materialType;
@@ -82,6 +89,12 @@ public class ProcurementPlanLine extends BaseEntity implements BaseDto {
   private String workshopId;
 
   /**
+   * 分厂
+   */
+  @TableField(exist = false)
+  private String workshopName;
+
+  /**
    * 前端行标识
    */
   private String itemId;

@@ -230,12 +230,12 @@ public class ProcurementBuyoutApplyServiceImpl extends
     Wrapper<ProcurementBuyoutApply> queryWrapper = Wrappers.lambdaQuery(ProcurementBuyoutApply.class)
             .eq(ProcurementBuyoutApply::getProcurementPlanId, planId);
     ProcurementBuyoutApply apply = this.getOne(queryWrapper);
-    if (apply == null) {
-      throw new DefaultClientException("买断操作申请单不存在！");
-    }
+    if (apply != null) {
+      List<ProcurementBuyoutApplyLine> lineList = buyoutApplyLineService.getByApplyId(apply.getId());
 
-    List<ProcurementBuyoutApplyLine> lineList = buyoutApplyLineService.getByApplyId(apply.getId());
-
-    return new GetProcurementBuyoutApplyBo(apply, lineList);
+      return new GetProcurementBuyoutApplyBo(apply, lineList);
+    } else {
+      return null;
+    }
   }
 }

@@ -59,10 +59,6 @@ public class ProcurementPlanChangeServiceImpl extends
       "COMPLETED", "ABORTED"
   );
 
-  private static final List<String> CHANGE_DUPLICATE_EXCLUDES = Arrays.asList(
-      "已作废", "已驳回", "草稿"
-  );
-
   @Override
   @Transactional(rollbackFor = Exception.class)
   @OpLog(type = OtherOpLogType.class, name = "创建采购计划变更单，原计划ID：{}，变更单ID：{}", params = {"#vo.procurementPlanId", "#result"})
@@ -83,8 +79,8 @@ public class ProcurementPlanChangeServiceImpl extends
       throw new DefaultClientException("只能选择主计划进行变更！");
     }
 
-    if (StringUtil.isBlank(plan.getApprovalStatus())
-            || !PROCESS_STATUSES.contains(plan.getApprovalStatus())) {
+    if (StringUtil.isBlank(plan.getProcessStatus())
+            || !PROCESS_STATUSES.contains(plan.getProcessStatus())) {
       throw new DefaultClientException("原采购计划状态不允许变更，请确认计划已中止/完成");
     }
     String currentUserId = SecurityUtil.getCurrentUser().getId();

@@ -36,7 +36,7 @@ public class CreateProcurementPlanChangeVo implements BaseVo, Serializable {
    * 变更单编号
    */
   @ApiModelProperty("变更单编号")
-  private String changeCode;
+  private String code;
 
   /**
    * 公司简称ID

@@ -42,7 +42,7 @@ public class UpdateProcurementPlanChangeVo implements Serializable {
    * 变更单编号
    */
   @ApiModelProperty("变更单编号")
-  private String changeCode;
+  private String code;
 
   /**
    * 公司简称ID

@@ -6,6 +6,7 @@
         <id column="id" property="id"/>
         <result column="procurement_plan_id" property="procurementPlanId"/>
         <result column="product_id" property="productId"/>
+        <result column="product_name" property="productName"/>
         <result column="material_type" property="materialType"/>
         <result column="quantity" property="quantity"/>
         <result column="actual_purchase_price" property="actualPurchasePrice"/>
@@ -16,6 +17,7 @@
         <result column="application_attrition" property="applicationAttrition"/>
         <result column="paint_damage_ratio" property="paintDamageRatio"/>
         <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
         <result column="item_id" property="itemId"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
@@ -30,6 +32,7 @@
             ppl.id,
             ppl.procurement_plan_id,
             ppl.product_id,
+            br.product_name,
             ppl.material_type,
             ppl.quantity,
             ppl.actual_purchase_price,
@@ -40,6 +43,7 @@
             ppl.application_attrition,
             ppl.paint_damage_ratio,
             ppl.workshop_id,
+            ws.name AS workshop_name,
             ppl.item_id,
             ppl.create_by_id,
             ppl.create_by,
@@ -48,6 +52,8 @@
             ppl.create_time,
             ppl.update_time
         FROM procurement_plan_line AS ppl
+        LEFT JOIN base_data_breed_relationship br ON br.id = ppl.product_id
+        LEFT JOIN base_data_workshop as ws on ws.id = ppl.workshop_id
     </sql>
 
     <select id="getByProcurementPlanId" resultMap="ProcurementPlanLine">

@@ -37,6 +37,7 @@
         <result column="settlement_method" property="settlementMethod"/>
         <result column="settlement_ratio" property="settlementRatio"/>
         <result column="price_id" property="priceId"/>
+        <result column="price_code" property="priceCode"/>
         <result column="coordination_reason" property="coordinationReason"/>
         <result column="invoice_type_status" property="invoiceTypeStatus"/>
         <result column="total_quantity" property="totalQuantity"/>
@@ -58,6 +59,7 @@
         <result column="change_status" property="changeStatus"/>
         <result column="replenishment_status" property="replenishmentStatus"/>
         <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
         <result column="salesman_quotation_id" property="salesmanQuotationId"/>
         <result column="attachment_file_ids" property="attachmentFileIds"/>
         <result column="attachment_file_names" property="attachmentFileNames"/>
@@ -105,6 +107,7 @@
             pp.settlement_method,
             pp.settlement_ratio,
             pp.price_id,
+            dp.code AS price_code,
             pp.coordination_reason,
             pp.invoice_type_status,
             pp.total_quantity,
@@ -126,6 +129,7 @@
             pp.change_status,
             pp.replenishment_status,
             pp.workshop_id,
+            ws.name AS workshop_name,
             pp.salesman_quotation_id,
             pp.attachment_file_ids,
             pp.attachment_file_names,
@@ -140,6 +144,8 @@
         LEFT JOIN procurement_domestic_customer_credit pdc ON pdc.id = pp.supplier_id
         LEFT JOIN sys_dept sd ON sd.id = pp.purchase_department
         LEFT JOIN sys_dept sd1 ON sd1.id = pp.region
+        LEFT JOIN base_data_workshop as ws on ws.id = pp.workshop_id
+        LEFT JOIN base_data_price as dp on dp.id = pp.price_id
     </sql>
 
     <select id="query" resultMap="ProcurementPlan">