采购合同：合同模块开发

@@ -2342,3 +2342,66 @@ CREATE TABLE `coordination_summary_approval_line`
     KEY                     `idx_csal_approval_id` (`approval_id`),
     KEY                     `idx_csal_plan_id` (`plan_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='采购吨超协汇总审批表明细';
+
+CREATE TABLE `procurement_contract`
+(
+    `id`                              VARCHAR(32)     NOT NULL COMMENT '主键ID',
+    `procurement_plan_id`             VARCHAR(32)     NOT NULL COMMENT '关联采购计划ID',
+    `procurement_plan_code`           VARCHAR(32)     NOT NULL COMMENT '投诉编码',
+    `supplier_id`                     VARCHAR(32)     NOT NULL COMMENT '供方ID',
+    `company_short_id`                VARCHAR(32)     NOT NULL COMMENT '需方ID',
+    `sign_place`                      VARCHAR(64)     NOT NULL DEFAULT '芜湖市' COMMENT '签订地点（固定 芜湖市）',
+    `sign_time`                       DATE            NOT NULL COMMENT '签订时间',
+    `delivery_time`                   DATE            NOT NULL COMMENT '交货时间',
+    `settlement_ratio`                DECIMAL(10, 5)  NOT NULL COMMENT '结算比例%',
+    `total_quantity`                  DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '合计数量',
+    `total_excluding_tax_amount`      DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '合计不含税金额',
+    `total_tax_amount`                DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '合计税额',
+    `total_amount`                    DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '合计金额',
+    `special_agreement`               TEXT            DEFAULT NULL COMMENT '特殊约定（大文本）',
+    `attachment_file_ids`             TEXT            DEFAULT NULL COMMENT '附件文件ID集合（多文件，逗号分隔）',
+    `attachment_file_names`           TEXT            DEFAULT NULL COMMENT '附件文件名称集合（多文件，逗号分隔）',
+    `approval_status`                 VARCHAR(32)     DEFAULT NULL COMMENT '审核状态',
+    `originator_id`                   VARCHAR(32)     DEFAULT NULL COMMENT '发起人ID（计划的创建人）',
+    `originator_name`                 VARCHAR(64)     DEFAULT NULL COMMENT '发起人（显示）',
+    `deleted`                         TINYINT(1)      NOT NULL DEFAULT 0 COMMENT '是否删除 0否 1是',
+    `create_by_id`                    VARCHAR(32)     DEFAULT NULL COMMENT '创建人ID',
+    `create_by`                       VARCHAR(64)     DEFAULT NULL COMMENT '创建人',
+    `create_time`                     DATETIME        DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by_id`                    VARCHAR(32)     DEFAULT NULL COMMENT '更新人ID',
+    `update_by`                       VARCHAR(64)     DEFAULT NULL COMMENT '更新人',
+    `update_time`                     DATETIME        DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    KEY                             `idx_pc_plan_id` (`procurement_plan_id`),
+    KEY                             `idx_pc_supplier_id` (`supplier_id`),
+    KEY                             `idx_pc_company_id` (`company_short_id`),
+    KEY                             `idx_pc_sign_time` (`sign_time`),
+    KEY                             `idx_pc_create_time` (`create_time`),
+    KEY                             `idx_pc_approval_status` (`approval_status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='采购合同主表';
+
+
+CREATE TABLE `procurement_contract_line`
+(
+    `id`                    VARCHAR(32)     NOT NULL COMMENT '主键ID',
+    `contract_id`           VARCHAR(32)     NOT NULL COMMENT '采购合同主表ID',
+    `plan_line_id`          VARCHAR(32)     DEFAULT NULL COMMENT '原采购计划明细行ID',
+    `invoice_product_name`  VARCHAR(200)    NOT NULL COMMENT '名称',
+    `product_id`            VARCHAR(32)     NOT NULL COMMENT '规格型号ID',
+    `quantity`              DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '数量',
+    `unit_price`            DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '单价',
+    `excluding_tax_amount`  DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '不含税金额 = 合计金额 / 1.13',
+    `tax_amount`            DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '税额 = 合计金额 - 不含税金额',
+    `total_amount`          DECIMAL(18, 4)  NOT NULL DEFAULT 0 COMMENT '合计金额 = 数量 * 单价',
+    `delivery_time`         DATE            NOT NULL COMMENT '交货时间',
+    `item_id`               VARCHAR(32)     DEFAULT NULL COMMENT '前端行标识',
+    `create_by_id`          VARCHAR(32)     DEFAULT NULL COMMENT '创建人ID',
+    `create_by`             VARCHAR(64)     DEFAULT NULL COMMENT '创建人',
+    `create_time`           DATETIME        DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by_id`          VARCHAR(32)     DEFAULT NULL COMMENT '更新人ID',
+    `update_by`             VARCHAR(64)     DEFAULT NULL COMMENT '更新人',
+    `update_time`           DATETIME        DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    KEY                     `idx_pcl_contract_id` (`contract_id`),
+    KEY                     `idx_pcl_product_id` (`product_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='采购合同明细表';

+package com.lframework.xingyun.sc.bo.procurement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContract;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class GetProcurementContractBo extends BaseBo<ProcurementContract> {
+
+  @ApiModelProperty("ID")
+  private String id;
+
+  @ApiModelProperty("关联采购计划ID")
+  private String procurementPlanId;
+
+  @ApiModelProperty("投诉编码（计划单编号）")
+  private String procurementPlanCode;
+
+  @ApiModelProperty("供方ID（供应商ID）")
+  private String supplierId;
+
+  @ApiModelProperty("供方名称")
+  private String supplierName;
+
+  @ApiModelProperty("需方ID（公司简称ID）")
+  private String companyShortId;
+
+  @ApiModelProperty("需方（公司全称）")
+  private String companyFullName;
+
+  @ApiModelProperty("签订地点")
+  private String signPlace;
+
+  @ApiModelProperty("签订时间")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate signTime;
+
+  @ApiModelProperty("交货时间")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate deliveryTime;
+
+  @ApiModelProperty("结算比例%")
+  private BigDecimal settlementRatio;
+
+  @ApiModelProperty("合计数量")
+  private BigDecimal totalQuantity;
+
+  @ApiModelProperty("合计不含税金额")
+  private BigDecimal totalExcludingTaxAmount;
+
+  @ApiModelProperty("合计税额")
+  private BigDecimal totalTaxAmount;
+
+  @ApiModelProperty("合计金额")
+  private BigDecimal totalAmount;
+
+  @ApiModelProperty("特殊约定")
+  private String specialAgreement;
+
+  @ApiModelProperty("附件文件ID集合")
+  private String attachmentFileIds;
+
+  @ApiModelProperty("附件文件名称集合")
+  private String attachmentFileNames;
+
+  @ApiModelProperty("审核状态 AUDIT/PASS/REFUSE/CANCEL")
+  private String approvalStatus;
+
+  @ApiModelProperty("是否展示审核按钮 前端用")
+  private Boolean showExamine;
+
+  @ApiModelProperty("是否展示审核详情按钮")
+  private Boolean showExamineDetail;
+
+  @ApiModelProperty("发起人ID")
+  private String originatorId;
+
+  @ApiModelProperty("发起人")
+  private String originatorName;
+
+  @ApiModelProperty("创建人")
+  private String createBy;
+
+  @ApiModelProperty("创建时间")
+  @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+  private LocalDateTime createTime;
+
+  @ApiModelProperty("明细列表")
+  private List<GetProcurementContractLineBo> procurementContractLineList;
+
+  public GetProcurementContractBo() {
+    super();
+  }
+
+  public GetProcurementContractBo(ProcurementContract dto) {
+    super(dto);
+  }
+}

+package com.lframework.xingyun.sc.bo.procurement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContractLine;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import lombok.Data;
+
+@Data
+public class GetProcurementContractLineBo extends BaseBo<ProcurementContractLine> {
+
+  @ApiModelProperty("主键ID")
+  private String id;
+
+  @ApiModelProperty("采购合同主表ID")
+  private String contractId;
+
+  @ApiModelProperty("序号(从1开始 手动赋值) 非持久化")
+  private Integer seq;
+
+  @ApiModelProperty("原采购计划明细行ID（追溯用）")
+  private String planLineId;
+
+  @ApiModelProperty("名称（开票品名）")
+  private String invoiceProductName;
+
+  @ApiModelProperty("规格型号ID（品种ID）")
+  private String productId;
+
+  @ApiModelProperty("规格型号（品种名称）")
+  private String productName;
+
+  @ApiModelProperty("数量")
+  private BigDecimal quantity;
+
+  @ApiModelProperty("单价（实际采购价）")
+  private BigDecimal unitPrice;
+
+  @ApiModelProperty("不含税金额 = 合计金额 / 1.13")
+  private BigDecimal excludingTaxAmount;
+
+  @ApiModelProperty("税额 = 合计金额 - 不含税金额")
+  private BigDecimal taxAmount;
+
+  @ApiModelProperty("合计金额 = 数量 * 单价")
+  private BigDecimal totalAmount;
+
+  @ApiModelProperty("交货时间")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate deliveryTime;
+
+  @ApiModelProperty("前端行标识")
+  private String itemId;
+
+  public GetProcurementContractLineBo() {
+    super();
+  }
+
+  public GetProcurementContractLineBo(ProcurementContractLine dto) {
+    super(dto);
+  }
+}

+package com.lframework.xingyun.sc.bo.procurement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContract;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@Data
+public class QueryProcurementContractBo extends BaseBo<ProcurementContract> {
+
+  @ApiModelProperty("ID")
+  private String id;
+
+  @ApiModelProperty("关联采购计划ID")
+  private String procurementPlanId;
+
+  @ApiModelProperty("投诉编码（计划单编号）")
+  private String procurementPlanCode;
+
+  @ApiModelProperty("供方ID（供应商ID）")
+  private String supplierId;
+
+  @ApiModelProperty("供方名称")
+  private String supplierName;
+
+  @ApiModelProperty("需方ID（公司简称ID）")
+  private String companyShortId;
+
+  @ApiModelProperty("需方（公司全称）")
+  private String companyFullName;
+
+  @ApiModelProperty("签订地点")
+  private String signPlace;
+
+  @ApiModelProperty("签订时间")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate signTime;
+
+  @ApiModelProperty("交货时间")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate deliveryTime;
+
+  @ApiModelProperty("结算比例%")
+  private BigDecimal settlementRatio;
+
+  @ApiModelProperty("合计数量")
+  private BigDecimal totalQuantity;
+
+  @ApiModelProperty("合计不含税金额")
+  private BigDecimal totalExcludingTaxAmount;
+
+  @ApiModelProperty("合计税额")
+  private BigDecimal totalTaxAmount;
+
+  @ApiModelProperty("合计金额")
+  private BigDecimal totalAmount;
+
+  @ApiModelProperty("审核状态 AUDIT/PASS/REFUSE/CANCEL")
+  private String approvalStatus;
+
+  @ApiModelProperty("是否展示审核按钮 前端用")
+  private Boolean showExamine;
+
+  @ApiModelProperty("是否展示审核详情按钮")
+  private Boolean showExamineDetail;
+
+  @ApiModelProperty("发起人ID")
+  private String originatorId;
+
+  @ApiModelProperty("发起人")
+  private String originatorName;
+
+  @ApiModelProperty("创建人")
+  private String createBy;
+
+  @ApiModelProperty("创建时间")
+  @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+  private LocalDateTime createTime;
+
+  public QueryProcurementContractBo() {
+    super();
+  }
+
+  public QueryProcurementContractBo(ProcurementContract dto) {
+    super(dto);
+  }
+}

@@ -22,6 +22,7 @@ import com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerC
 import com.lframework.xingyun.sc.procurement.entity.ProcurementForeignTradeCredit;
 import com.lframework.xingyun.sc.procurement.service.change.ProcurementPlanChangeService;
 import com.lframework.xingyun.sc.procurement.service.coordination.CoordinationSummaryApprovalService;
+import com.lframework.xingyun.sc.procurement.service.contract.ProcurementContractService;
 import com.lframework.xingyun.sc.procurement.service.credit.ProcurementDomesticCustomerCreditService;
 import com.lframework.xingyun.sc.procurement.service.credit.ProcurementForeignTradeCreditService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService;
@@ -168,6 +169,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private ProcurementPlanReplenishService procurementPlanReplenishService;
     @Resource
     private CoordinationSummaryApprovalService coordinationSummaryApprovalService;
+    @Resource
+    private ProcurementContractService procurementContractService;
 
 
 
@@ -270,6 +273,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "XT_APPROVAL":
                 handleCoordinationSummaryApprovalData(flowStatus, businessId);
                 break;
+            case "PROCUREMENT_CONTRACT":
+                handleProcurementContractData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -1208,4 +1214,15 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             coordinationSummaryApprovalService.updateApprovalStatus(businessId, "REFUSE");
         }
     }
+
+    private void handleProcurementContractData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            procurementContractService.updateApprovalStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            procurementContractService.updateApprovalStatus(businessId, "REFUSE");
+        }
+    }
 }

+package com.lframework.xingyun.sc.procurement.controller.contract;
+
+import cn.hutool.core.io.resource.ClassPathResource;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.bo.procurement.*;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContract;
+import com.lframework.xingyun.sc.procurement.service.contract.ProcurementContractService;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.QueryProcurementContractVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.UpdateProcurementContractVo;
+import com.lframework.xingyun.sc.utils.ExcelUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "采购合同管理")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/procurement/contract")
+public class ProcurementContractController extends DefaultBaseController {
+
+  @Resource
+  private ProcurementContractService procurementContractService;
+
+  @ApiOperation("分页查询采购合同")
+  @HasPermission({"agreement-manage:domestic-agreement:query"})
+  @GetMapping("/query")
+  public InvokeResult<PageResult<ProcurementContract>> query(
+          @Valid QueryProcurementContractVo vo) {
+    return InvokeResultBuilder.success(procurementContractService.query(getPageIndex(vo), getPageSize(vo), vo));
+  }
+
+  @ApiOperation("查询采购合同详情")
+  @ApiImplicitParam(value = "ID", name = "id", paramType = "path", required = true)
+  @HasPermission({"agreement-manage:domestic-agreement:query","agreement-manage:domestic-agreement:review"})
+  @GetMapping("")
+  public InvokeResult<GetProcurementContractBo> findById(@NotBlank(message = "ID不能为空！") String id) {
+    return InvokeResultBuilder.success(procurementContractService.findDetail(id));
+  }
+
+  @ApiOperation("新增采购合同（草稿）")
+  @HasPermission({"agreement-manage:domestic-agreement:add"})
+  @PostMapping("/create")
+  public InvokeResult<String> create(@RequestBody @Valid CreateProcurementContractVo vo) {
+    return InvokeResultBuilder.success(procurementContractService.create(vo));
+  }
+
+  @ApiOperation("修改采购合同")
+  @HasPermission({"agreement-manage:domestic-agreement:modify","agreement-manage:domestic-agreement:approve"})
+  @PutMapping("/update")
+  public InvokeResult<Void> update(@RequestBody @Valid UpdateProcurementContractVo vo) {
+    procurementContractService.update(vo);
+    return InvokeResultBuilder.success();
+  }
+
+  @ApiOperation("取消采购合同")
+  @ApiImplicitParam(value = "ID", name = "id", paramType = "path", required = true)
+  @HasPermission({"agreement-manage:domestic-agreement:cancel"})
+  @PutMapping("/cancel")
+  public InvokeResult<Void> cancel(@NotBlank(message = "ID不能为空！") String id) {
+    procurementContractService.cancel(id);
+    return InvokeResultBuilder.success();
+  }
+
+  @ApiOperation("提交审核采购合同")
+  @ApiImplicitParam(value = "ID", name = "id", paramType = "path", required = true)
+  @HasPermission({"agreement-manage:domestic-agreement:submit"})
+  @PutMapping("/submit")
+  public InvokeResult<Void> submit(@NotBlank(message = "ID不能为空！") String id) {
+    procurementContractService.submit(id);
+    return InvokeResultBuilder.success();
+  }
+
+  @ApiOperation("根据计划ID废弃采购合同（逻辑删除 deleted=1）")
+  @ApiImplicitParam(value = "ID", name = "id", paramType = "path", required = true)
+  @HasPermission({"agreement-manage:domestic-agreement:delete"})
+  @DeleteMapping("/delete")
+  public InvokeResult<Void> delete(@NotBlank(message = "ID不能为空！") String id) {
+    procurementContractService.deleteById(id);
+    return InvokeResultBuilder.success();
+  }
+
+  @ApiOperation("打印合同")
+  @GetMapping("/export")
+  public void export(@NotBlank(message = "ID不能为空！") String id,
+                     HttpServletResponse response) throws IOException {
+
+//    GetProcurementContractBo detail = procurementContractService.findDetail(id);
+//    if (detail == null) {
+//      throw new DefaultClientException("采购合同不存在！");
+//    }
+//    ExcelUtil.setupResponse(response, detail.getProcurementPlanCode() + "_" + detail.getCompanyFullName() + "-采购合同.xlsx");
+//
+//    ClassPathResource templateResource = new ClassPathResource("templates/planTemplate.xlsx");
+//    try {
+//      try (InputStream inputStream = templateResource.getStream();
+//           Workbook workbook = new XSSFWorkbook(inputStream)) {
+//        try {
+//          DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//          Sheet sheet = workbook.getSheetAt(0);
+//
+//          List<GetProcurementContractLineBo> procurementContractLineList = detail.getProcurementContractLineList();
+//          int planStartRow = 4; // 合同计划子表开始行，可根据模板调整
+//          if (CollectionUtils.isNotEmpty(procurementContractLineList)) {
+//            for (int i = 0; i < procurementContractLineList.size(); i++) {
+//              GetProcurementContractLineBo line = procurementContractLineList.get(i);
+//              ExcelUtil.setCellValue(sheet, planStartRow, 0, line.getProductName());
+//              ExcelUtil.setCellValue(sheet, planStartRow, 1, line.getMaterialType());
+//              ExcelUtil.setCellValue(sheet, planStartRow, 2, line.getQuantity());
+//              ExcelUtil.setCellValue(sheet, planStartRow, 3, line.getActualPurchasePrice());
+//              ExcelUtil.setCellValue(sheet, planStartRow, 4, line.getIncludingShippingPrice());
+//              ExcelUtil.setCellValue(sheet, planStartRow, 5, line.getPriceListPrices());
+//              ExcelUtil.setCellValue(sheet, planStartRow, 6, line.getCoordinationRange());
+//              ExcelUtil.setCellValue(sheet, planStartRow, 7, line.getEstimatedLoss());
+//              ExcelUtil.setCellValue(sheet, 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()));
+//          //制单人
+//          planDataMap.put("createBy", nvl(plan.getCreateBy()));
+//          //采购处主管
+//          planDataMap.put("purchaseDeptName", nvl(plan.getPurchaseDeptName()));
+//          //供应管理科主管
+//          planDataMap.put("managementDeptName", nvl(plan.getManagementDeptName()));
+//          //供应部主管
+//          planDataMap.put("supplyManagerName", nvl(plan.getSupplyManagerName()));
+//          //营销分管
+//          planDataMap.put("marketingManagerName", nvl(plan.getMarketingManagerName()));
+//          //总经理
+//          planDataMap.put("generalManagerName", nvl(plan.getGeneralManagerName()));
+//          ExcelUtil.processTemplateSheet(sheet, planDataMap);
+//
+//          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;
+//    }
+  }
+}

+package com.lframework.xingyun.sc.procurement.entity.contract;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+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 lombok.Data;
+import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("procurement_contract")
+@NoArgsConstructor
+public class ProcurementContract extends BaseEntity implements BaseDto {
+
+  private static final long serialVersionUID = 1L;
+
+  private String id;
+
+  private String procurementPlanId;
+
+  private String procurementPlanCode;
+
+  private String supplierId;
+
+  @TableField(exist = false)
+  private String supplierName;
+
+  private String companyShortId;
+
+  @TableField(exist = false)
+  private String companyFullName;
+
+  private String signPlace;
+
+  private LocalDate signTime;
+
+  private LocalDate deliveryTime;
+
+  private BigDecimal settlementRatio;
+
+  private BigDecimal totalQuantity;
+
+  private BigDecimal totalExcludingTaxAmount;
+
+  private BigDecimal totalTaxAmount;
+
+  private BigDecimal totalAmount;
+
+  private String specialAgreement;
+
+  private String attachmentFileIds;
+
+  private String attachmentFileNames;
+
+  private String approvalStatus;
+
+  @TableField(exist = false)
+  private Boolean showExamine;
+
+  @TableField(exist = false)
+  private Boolean showExamineDetail;
+
+  private String originatorId;
+
+  private String originatorName;
+
+  private Integer deleted;
+
+  @TableField(fill = FieldFill.INSERT)
+  private String createById;
+
+  @TableField(fill = FieldFill.INSERT)
+  private String createBy;
+
+  @TableField(fill = FieldFill.INSERT_UPDATE)
+  private String updateById;
+
+  @TableField(fill = FieldFill.INSERT_UPDATE)
+  private String updateBy;
+
+  @TableField(fill = FieldFill.INSERT)
+  private LocalDateTime createTime;
+
+  @TableField(fill = FieldFill.INSERT_UPDATE)
+  private LocalDateTime updateTime;
+}

+package com.lframework.xingyun.sc.procurement.entity.contract;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+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 lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("procurement_contract_line")
+public class ProcurementContractLine extends BaseEntity implements BaseDto {
+
+  private static final long serialVersionUID = 1L;
+
+  private String id;
+
+  private String contractId;
+
+  private String planLineId;
+
+  private String invoiceProductName;
+
+  private String productId;
+
+  @TableField(exist = false)
+  private String productName;
+
+  private BigDecimal quantity;
+
+  private BigDecimal unitPrice;
+
+  private BigDecimal excludingTaxAmount;
+
+  private BigDecimal taxAmount;
+
+  private BigDecimal totalAmount;
+
+  private LocalDate deliveryTime;
+
+  private String itemId;
+
+  @TableField(fill = FieldFill.INSERT)
+  private String createById;
+
+  @TableField(fill = FieldFill.INSERT)
+  private String createBy;
+
+  @TableField(fill = FieldFill.INSERT_UPDATE)
+  private String updateById;
+
+  @TableField(fill = FieldFill.INSERT_UPDATE)
+  private String updateBy;
+
+  @TableField(fill = FieldFill.INSERT)
+  private LocalDateTime createTime;
+
+  @TableField(fill = FieldFill.INSERT_UPDATE)
+  private LocalDateTime updateTime;
+}

@@ -39,6 +39,7 @@ import com.lframework.xingyun.sc.procurement.mappers.change.ProcurementPlanChang
 import com.lframework.xingyun.sc.procurement.service.buyout.ProcurementBuyoutApplyService;
 import com.lframework.xingyun.sc.procurement.service.change.ProcurementPlanChangeLineService;
 import com.lframework.xingyun.sc.procurement.service.change.ProcurementPlanChangeService;
+import com.lframework.xingyun.sc.procurement.service.contract.ProcurementContractService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanLineService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService;
 import com.lframework.xingyun.sc.procurement.vo.buyout.CreateProcurementBuyoutApplyVo;
@@ -47,6 +48,8 @@ import com.lframework.xingyun.sc.procurement.vo.change.CreateProcurementPlanChan
 import com.lframework.xingyun.sc.procurement.vo.change.QueryProcurementPlanChangeVo;
 import com.lframework.xingyun.sc.procurement.vo.change.UpdateProcurementPlanChangeLineVo;
 import com.lframework.xingyun.sc.procurement.vo.change.UpdateProcurementPlanChangeVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractLineVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.CreateProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.ProcurementPlanLineVo;
 import java.math.BigDecimal;
@@ -83,6 +86,8 @@ public class ProcurementPlanChangeServiceImpl extends
   private WorkshopService workshopService;
   @Resource
   private FlowTaskWrapperMapper flowTaskWrapperMapper;
+  @Resource
+  private ProcurementContractService procurementContractService;
 
 
   private static final List<String> PROCESS_STATUSES = Arrays.asList(
@@ -200,7 +205,6 @@ public class ProcurementPlanChangeServiceImpl extends
             vo1.setProcurementPlanId(procurementPlan.getId());
             procurementBuyoutApplyService.create(vo1);
           }
-          //todo 作废合同，生成新合同
         } else {
           //没有子计划
           //修改 开票品名 公司名称 另付运费
@@ -220,6 +224,39 @@ public class ProcurementPlanChangeServiceImpl extends
           vo1.setProcurementPlanId(vo.getProcurementPlanId());
           procurementBuyoutApplyService.create(vo1);
         }
+        //作废合同
+        procurementContractService.deleteById(plan.getId());
+        //生成新合同
+        ProcurementPlan procurementPlan = procurementPlanService.getById(plan.getId());
+        CreateProcurementContractVo contractVo = new CreateProcurementContractVo();
+        contractVo.setProcurementPlanId(procurementPlan.getId());
+        contractVo.setProcurementPlanCode(procurementPlan.getCode());
+        contractVo.setSupplierId(procurementPlan.getSupplierId());
+        contractVo.setCompanyShortId(procurementPlan.getCompanyShortId());
+        contractVo.setSignTime(procurementPlan.getDate());
+        contractVo.setDeliveryTime(procurementPlan.getDeliveryDate());
+        contractVo.setSettlementRatio(procurementPlan.getSettlementRatio());
+        contractVo.setOriginatorId(procurementPlan.getCreateById());
+        contractVo.setOriginatorName(procurementPlan.getCreateBy());
+        List<CreateProcurementContractLineVo> contractLineVoList = new ArrayList<>();
+        List<ProcurementPlanLine> lineList = procurementPlanLineService.getByProcurementPlanId(plan.getId());
+        if (CollectionUtil.isEmpty(lineList)) {
+          throw new InputErrorException("采购计划明细没有数据！");
+        }
+        for (ProcurementPlanLine line : lineList) {
+          CreateProcurementContractLineVo lineVo = new CreateProcurementContractLineVo();
+          lineVo.setPlanLineId(line.getId());
+          lineVo.setItemId(IdUtil.getId());
+          //todo 开票品名逻辑需要修改
+          lineVo.setInvoiceProductName(procurementPlan.getInvoiceProductName());
+          lineVo.setProductId(line.getProductId());
+          lineVo.setQuantity(line.getQuantity());
+          lineVo.setUnitPrice(line.getActualPurchasePrice());
+          lineVo.setDeliveryTime(procurementPlan.getDeliveryDate());
+          contractLineVoList.add(lineVo);
+        }
+        contractVo.setProcurementContractLineList(contractLineVoList);
+        procurementContractService.create(contractVo);
       }
       return planChange.getId();
     } else {
@@ -628,7 +665,39 @@ public class ProcurementPlanChangeServiceImpl extends
               .set(ProcurementPlan::getApprovalPassTime, LocalDateTime.now())
               .eq(ProcurementPlan::getId, planId));
 
-      //todo 废弃原合同；生成新合同
+      //作废合同
+      procurementContractService.deleteById(planId);
+      //生成新合同
+      ProcurementPlan procurementPlan = procurementPlanService.getById(planId);
+      CreateProcurementContractVo contractVo = new CreateProcurementContractVo();
+      contractVo.setProcurementPlanId(procurementPlan.getId());
+      contractVo.setProcurementPlanCode(procurementPlan.getCode());
+      contractVo.setSupplierId(procurementPlan.getSupplierId());
+      contractVo.setCompanyShortId(procurementPlan.getCompanyShortId());
+      contractVo.setSignTime(procurementPlan.getDate());
+      contractVo.setDeliveryTime(procurementPlan.getDeliveryDate());
+      contractVo.setSettlementRatio(procurementPlan.getSettlementRatio());
+      contractVo.setOriginatorId(procurementPlan.getCreateById());
+      contractVo.setOriginatorName(procurementPlan.getCreateBy());
+      List<CreateProcurementContractLineVo> contractLineVoList = new ArrayList<>();
+      List<ProcurementPlanLine> lineList = procurementPlanLineService.getByProcurementPlanId(planId);
+      if (CollectionUtil.isEmpty(lineList)) {
+        throw new InputErrorException("采购计划明细没有数据！");
+      }
+      for (ProcurementPlanLine line : lineList) {
+        CreateProcurementContractLineVo lineVo = new CreateProcurementContractLineVo();
+        lineVo.setPlanLineId(line.getId());
+        lineVo.setItemId(IdUtil.getId());
+        //todo 开票品名逻辑需要修改
+        lineVo.setInvoiceProductName(procurementPlan.getInvoiceProductName());
+        lineVo.setProductId(line.getProductId());
+        lineVo.setQuantity(line.getQuantity());
+        lineVo.setUnitPrice(line.getActualPurchasePrice());
+        lineVo.setDeliveryTime(procurementPlan.getDeliveryDate());
+        contractLineVoList.add(lineVo);
+      }
+      contractVo.setProcurementContractLineList(contractLineVoList);
+      procurementContractService.create(contractVo);
     } else if ("REFUSE".equals(approvalStatus)) {
       List<SysRole> roles = sysRoleService.getByUserId(entity.getCreateById());
       List<String> roleCodes = CollectionUtil.isEmpty(roles) ? new java.util.ArrayList<>()

+package com.lframework.xingyun.sc.procurement.impl.contract;
+
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContractLine;
+import com.lframework.xingyun.sc.procurement.mappers.contract.ProcurementContractLineMapper;
+import com.lframework.xingyun.sc.procurement.service.contract.ProcurementContractLineService;
+import java.util.List;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ProcurementContractLineServiceImpl
+    extends BaseMpServiceImpl<ProcurementContractLineMapper, ProcurementContractLine>
+    implements ProcurementContractLineService {
+
+  @Override
+  public List<ProcurementContractLine> getByContractId(String contractId) {
+    return getBaseMapper().getByContractId(contractId);
+  }
+
+  @Override
+  public void deleteByContractId(String contractId) {
+    getBaseMapper().deleteByContractId(contractId);
+  }
+}

+package com.lframework.xingyun.sc.procurement.impl.contract;
+
+import cn.hutool.core.bean.BeanUtil;
+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.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;
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.*;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.bo.procurement.GetProcurementContractBo;
+import com.lframework.xingyun.sc.bo.procurement.GetProcurementContractLineBo;
+import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContract;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContractLine;
+import com.lframework.xingyun.sc.procurement.mappers.contract.ProcurementContractMapper;
+import com.lframework.xingyun.sc.procurement.service.contract.ProcurementContractLineService;
+import com.lframework.xingyun.sc.procurement.service.contract.ProcurementContractService;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractLineVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.QueryProcurementContractVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.UpdateProcurementContractLineVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.UpdateProcurementContractVo;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+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;
+
+@Service
+public class ProcurementContractServiceImpl
+    extends BaseMpServiceImpl<ProcurementContractMapper, ProcurementContract>
+    implements ProcurementContractService {
+
+  private static final String BPM_FLAG = "PROCUREMENT_CONTRACT";
+  private static final BigDecimal TAX_RATE_DIVISOR = new BigDecimal("1.13");
+
+  @Resource
+  private ProcurementContractLineService lineService;
+  @Resource
+  private ProcurementContractMapper contractMapper;
+  @Resource
+  private FlowInstanceWrapperService flowInstanceWrapperService;
+  @Resource
+  private com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper flowTaskWrapperMapper;
+
+  @Override
+  public PageResult<ProcurementContract> query(Integer pageIndex, Integer pageSize,
+                                                QueryProcurementContractVo vo) {
+    Assert.greaterThanZero(pageIndex);
+    Assert.greaterThanZero(pageSize);
+
+    PageHelperUtil.startPage(pageIndex, pageSize);
+    List<ProcurementContract> datas = this.query(vo);
+    if (CollectionUtil.isNotEmpty(datas)) {
+      fillShowExamineInfo(datas);
+    }
+    return PageResultUtil.convert(new PageInfo<>(datas));
+  }
+
+  @Override
+  public List<ProcurementContract> query(QueryProcurementContractVo vo) {
+    return contractMapper.query(vo);
+  }
+
+  @Override
+  public GetProcurementContractBo findDetail(String id) {
+    if (StringUtil.isBlank(id)) {
+      throw new InputErrorException("ID不能为空！");
+    }
+
+    ProcurementContract entity = contractMapper.findById(id);
+    if (entity == null) {
+      throw new DefaultClientException("采购合同不存在！");
+    }
+    fillShowExamineInfo(Collections.singletonList(entity));
+
+    GetProcurementContractBo bo = new GetProcurementContractBo(entity);
+    bo.convert(entity);
+
+    List<ProcurementContractLine> lines = lineService.getByContractId(id);
+    List<GetProcurementContractLineBo> detailBoList = new ArrayList<>();
+    if (!CollectionUtil.isEmpty(lines)) {
+      for (int i = 0; i < lines.size(); i++) {
+        ProcurementContractLine line = lines.get(i);
+        GetProcurementContractLineBo lineBo = new GetProcurementContractLineBo(line);
+        lineBo.setSeq(i + 1);
+        detailBoList.add(lineBo);
+      }
+    }
+    bo.setProcurementContractLineList(detailBoList);
+
+    return bo;
+  }
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  @OpLog(type = OtherOpLogType.class, name = "创建采购合同，ID：{}", params = {"#result"})
+  public String create(CreateProcurementContractVo vo) {
+    Assert.notNull(vo.getSignTime(), "签订时间不能为空！");
+    Assert.notNull(vo.getSettlementRatio(), "结算比例不能为空！");
+    if (CollectionUtil.isEmpty(vo.getProcurementContractLineList())) {
+      throw new DefaultClientException("明细不能为空！");
+    }
+
+    ProcurementContract main = new ProcurementContract();
+    BeanUtil.copyProperties(vo, main);
+    main.setId(IdUtil.getId());
+    main.setApprovalStatus(null);
+    if (StringUtil.isBlank(main.getSignPlace())) {
+      main.setSignPlace("芜湖市");
+    }
+    main.setDeleted(0);
+
+    recalcMainAndLines(main, vo.getProcurementContractLineList());
+
+    List<ProcurementContractLine> saveLines = buildSaveLines(main.getId(), vo.getProcurementContractLineList(), null);
+
+    this.save(main);
+    if (!saveLines.isEmpty()) {
+      lineService.saveBatch(saveLines);
+    }
+
+    OpLogUtil.setVariable("id", main.getId());
+    OpLogUtil.setExtra(main);
+
+    return main.getId();
+  }
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  @OpLog(type = OtherOpLogType.class, name = "修改采购合同，ID：{}", params = {"#vo.id"})
+  public void update(UpdateProcurementContractVo vo) {
+    Assert.notBlank(vo.getId(), "ID不能为空！");
+    ProcurementContract oldEntity = this.getById(vo.getId());
+    if (oldEntity == null || (oldEntity.getDeleted() != null && oldEntity.getDeleted() == 1)) {
+      throw new DefaultClientException("采购合同不存在或已废弃！");
+    }
+
+    ProcurementContract update = new ProcurementContract();
+    BeanUtil.copyProperties(vo, update);
+    update.setId(vo.getId());
+    if (StringUtil.isBlank(update.getSignPlace())) {
+      update.setSignPlace("芜湖市");
+    }
+
+    recalcMainAndLines(update, vo.getProcurementContractLineList());
+
+    this.updateById(update);
+
+    saveOrUpdateLines(vo.getId(), vo.getProcurementContractLineList());
+
+    OpLogUtil.setVariable("id", vo.getId());
+    OpLogUtil.setExtra(oldEntity);
+  }
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  @OpLog(type = OtherOpLogType.class, name = "取消采购合同，ID：{}", params = {"#id"})
+  public void cancel(String id) {
+    Assert.notBlank(id);
+    ProcurementContract entity = this.getById(id);
+    if (entity == null || (entity.getDeleted() != null && entity.getDeleted() == 1)) {
+      throw new DefaultClientException("采购合同不存在或已废弃！");
+    }
+
+    this.update(Wrappers.lambdaUpdate(ProcurementContract.class)
+        .set(ProcurementContract::getApprovalStatus, "CANCEL")
+        .eq(ProcurementContract::getId, id));
+
+    OpLogUtil.setVariable("id", id);
+    OpLogUtil.setExtra(entity);
+  }
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  @OpLog(type = OtherOpLogType.class, name = "提交采购合同审核，ID：{}", params = {"#id"})
+  public void submit(String id) {
+    ProcurementContract entity = contractMapper.findById(id);
+    if (entity == null || (entity.getDeleted() != null && entity.getDeleted() == 1)) {
+      throw new DefaultClientException("采购合同不存在或已废弃！");
+    }
+
+    flowInstanceWrapperService.startInstance(BPM_FLAG, id, BPM_FLAG, entity);
+
+    OpLogUtil.setVariable("id", id);
+    OpLogUtil.setExtra(entity);
+  }
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  @OpLog(type = OtherOpLogType.class, name = "根据计划ID废弃采购合同，ID：{}", params = {"#id"})
+  public void deleteById(String id) {
+    Assert.notBlank(id);
+    ProcurementContract entity = this.getById(id);
+    if (entity == null) {
+      return;
+    }
+
+    this.update(Wrappers.lambdaUpdate(ProcurementContract.class)
+        .set(ProcurementContract::getDeleted, 1)
+        .eq(ProcurementContract::getProcurementPlanId, id));
+
+    OpLogUtil.setVariable("id", id);
+    OpLogUtil.setExtra(entity);
+  }
+
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  @OpLog(type = OtherOpLogType.class, name = "更新采购合同审核状态，ID：{}", params = {"#id"})
+  public void updateApprovalStatus(String id, String approvalStatus) {
+    if (StringUtil.isBlank(id) || StringUtil.isBlank(approvalStatus)) {
+      throw new InputErrorException("ID、审核状态不能为空！");
+    }
+
+    ProcurementContract entity = this.getById(id);
+    if (entity == null) {
+      throw new DefaultClientException("采购合同不存在！");
+    }
+
+    if ("PASS".equals(approvalStatus)) {
+      LambdaUpdateWrapper<ProcurementContract> updateWrapper =
+          Wrappers.lambdaUpdate(ProcurementContract.class)
+              .set(ProcurementContract::getApprovalStatus, "PASS")
+              .eq(ProcurementContract::getId, id);
+      this.update(updateWrapper);
+    } else if ("REFUSE".equals(approvalStatus)) {
+      LambdaUpdateWrapper<ProcurementContract> updateWrapper =
+          Wrappers.lambdaUpdate(ProcurementContract.class)
+              .set(ProcurementContract::getApprovalStatus, "REFUSE")
+              .eq(ProcurementContract::getId, id);
+      this.update(updateWrapper);
+    }
+
+    OpLogUtil.setVariable("id", id);
+    OpLogUtil.setExtra(entity);
+  }
+
+  private void recalcMainAndLines(ProcurementContract main,
+                                   List<? extends CreateProcurementContractLineVo> lineList) {
+    BigDecimal totalQty = BigDecimal.ZERO;
+    BigDecimal totalExcludingTax = BigDecimal.ZERO;
+    BigDecimal totalTax = BigDecimal.ZERO;
+    BigDecimal totalAmt = BigDecimal.ZERO;
+
+    if (!CollectionUtil.isEmpty(lineList)) {
+      for (CreateProcurementContractLineVo lineVo : lineList) {
+        BigDecimal qty = lineVo.getQuantity() == null ? BigDecimal.ZERO : lineVo.getQuantity();
+        BigDecimal price = lineVo.getUnitPrice() == null ? BigDecimal.ZERO : lineVo.getUnitPrice();
+
+        BigDecimal lineTotal = qty.multiply(price).setScale(4, RoundingMode.HALF_UP);
+        BigDecimal excludingTax = lineTotal.divide(TAX_RATE_DIVISOR, 4, RoundingMode.HALF_UP);
+        BigDecimal tax = lineTotal.subtract(excludingTax).setScale(4, RoundingMode.HALF_UP);
+
+        lineVo.setTotalAmount(lineTotal);
+        lineVo.setExcludingTaxAmount(excludingTax);
+        lineVo.setTaxAmount(tax);
+
+        totalQty = totalQty.add(qty);
+        totalExcludingTax = totalExcludingTax.add(excludingTax);
+        totalTax = totalTax.add(tax);
+        totalAmt = totalAmt.add(lineTotal);
+      }
+    }
+
+    main.setTotalQuantity(totalQty);
+    main.setTotalExcludingTaxAmount(totalExcludingTax);
+    main.setTotalTaxAmount(totalTax);
+    main.setTotalAmount(totalAmt);
+  }
+
+  private List<ProcurementContractLine> buildSaveLines(String contractId,
+                                                       List<? extends CreateProcurementContractLineVo> lineList,
+                                                       Map<String, ProcurementContractLine> oldLineMap) {
+    List<ProcurementContractLine> result = new ArrayList<>();
+    if (CollectionUtil.isEmpty(lineList)) {
+      return result;
+    }
+
+    for (CreateProcurementContractLineVo lineVo : lineList) {
+      ProcurementContractLine saveLine;
+      if (StringUtil.isNotBlank(lineVo.getId()) && oldLineMap != null) {
+        ProcurementContractLine oldLine = oldLineMap.get(lineVo.getId());
+        saveLine = BeanUtil.copyProperties(lineVo, ProcurementContractLine.class);
+        if (oldLine != null) {
+          saveLine.setId(oldLine.getId());
+        } else {
+          saveLine.setId(IdUtil.getId());
+        }
+      } else {
+        saveLine = BeanUtil.copyProperties(lineVo, ProcurementContractLine.class);
+        saveLine.setId(IdUtil.getId());
+      }
+      saveLine.setContractId(contractId);
+
+      BigDecimal qty = lineVo.getQuantity() == null ? BigDecimal.ZERO : lineVo.getQuantity();
+      BigDecimal price = lineVo.getUnitPrice() == null ? BigDecimal.ZERO : lineVo.getUnitPrice();
+      BigDecimal lineTotal = qty.multiply(price).setScale(4, RoundingMode.HALF_UP);
+      BigDecimal excludingTax = lineTotal.divide(TAX_RATE_DIVISOR, 4, RoundingMode.HALF_UP);
+      BigDecimal tax = lineTotal.subtract(excludingTax).setScale(4, RoundingMode.HALF_UP);
+      saveLine.setTotalAmount(lineTotal);
+      saveLine.setExcludingTaxAmount(excludingTax);
+      saveLine.setTaxAmount(tax);
+
+      result.add(saveLine);
+    }
+    return result;
+  }
+
+  private void saveOrUpdateLines(String contractId,
+                                  List<? extends CreateProcurementContractLineVo> lineList) {
+    String finalContractId = contractId;
+    if (StringUtil.isBlank(finalContractId) && !CollectionUtil.isEmpty(lineList)) {
+      finalContractId = lineList.stream()
+          .filter(l -> l != null && l instanceof UpdateProcurementContractLineVo
+              && StringUtil.isNotBlank(((UpdateProcurementContractLineVo) l).getContractId()))
+          .map(l -> ((UpdateProcurementContractLineVo) l).getContractId())
+          .findFirst().orElse(null);
+    }
+    if (StringUtil.isBlank(finalContractId)) {
+      throw new DefaultClientException("采购合同ID为空，无法保存明细！");
+    }
+    if (CollectionUtil.isEmpty(lineList)) {
+      List<ProcurementContractLine> old = lineService.getByContractId(finalContractId);
+      if (CollectionUtil.isNotEmpty(old)) {
+        lineService.removeByIds(old.stream().map(ProcurementContractLine::getId).collect(Collectors.toList()));
+      }
+      return;
+    }
+
+    List<ProcurementContractLine> oldLineList = lineService.getByContractId(finalContractId);
+    Map<String, ProcurementContractLine> oldLineMap = CollectionUtil.isEmpty(oldLineList)
+        ? Collections.emptyMap()
+        : oldLineList.stream().collect(Collectors.toMap(ProcurementContractLine::getId, v -> v));
+
+    List<String> existIdList = new ArrayList<>(lineList.size());
+    int orderNo = 0; // 每次保存全部重新分配排序号 从1开始连续
+    for (CreateProcurementContractLineVo lineVo : lineList) {
+      if (lineVo == null) continue;
+      ++orderNo;
+      BigDecimal qty = lineVo.getQuantity() == null ? BigDecimal.ZERO : lineVo.getQuantity();
+      BigDecimal price = lineVo.getUnitPrice() == null ? BigDecimal.ZERO : lineVo.getUnitPrice();
+      BigDecimal lineTotal = qty.multiply(price).setScale(4, RoundingMode.HALF_UP);
+      BigDecimal excludingTax = lineTotal.divide(TAX_RATE_DIVISOR, 4, RoundingMode.HALF_UP);
+      BigDecimal tax = lineTotal.subtract(excludingTax).setScale(4, RoundingMode.HALF_UP);
+
+      if (lineVo instanceof UpdateProcurementContractLineVo
+          && StringUtil.isNotBlank(lineVo.getId())) {
+        UpdateProcurementContractLineVo updateLineVo = (UpdateProcurementContractLineVo) lineVo;
+        ProcurementContractLine oldLine = oldLineMap.get(updateLineVo.getId());
+        if (oldLine == null) {
+          throw new DefaultClientException("采购合同明细不存在或不属于当前采购合同！");
+        }
+        existIdList.add(updateLineVo.getId());
+        if (StringUtil.isBlank(updateLineVo.getPlanLineId())) {
+          updateLineVo.setPlanLineId(oldLine.getPlanLineId());
+        }
+        if (StringUtil.isBlank(updateLineVo.getItemId())) {
+          updateLineVo.setItemId(oldLine.getItemId());
+        }
+        LambdaUpdateWrapper<ProcurementContractLine> updateWrapper = new LambdaUpdateWrapper<>(ProcurementContractLine.class);
+        updateWrapper.eq(ProcurementContractLine::getId, updateLineVo.getId())
+            .set(ProcurementContractLine::getContractId, finalContractId)
+            .set(ProcurementContractLine::getPlanLineId, updateLineVo.getPlanLineId())
+            .set(ProcurementContractLine::getInvoiceProductName, updateLineVo.getInvoiceProductName())
+            .set(ProcurementContractLine::getProductId, updateLineVo.getProductId())
+            .set(ProcurementContractLine::getQuantity, qty)
+            .set(ProcurementContractLine::getUnitPrice, price)
+            .set(ProcurementContractLine::getExcludingTaxAmount, excludingTax)
+            .set(ProcurementContractLine::getTaxAmount, tax)
+            .set(ProcurementContractLine::getTotalAmount, lineTotal)
+            .set(ProcurementContractLine::getDeliveryTime, updateLineVo.getDeliveryTime())
+            .set(ProcurementContractLine::getItemId, updateLineVo.getItemId());
+        lineService.update(updateWrapper);
+      } else {
+        ProcurementContractLine createLine = BeanUtil.copyProperties(lineVo, ProcurementContractLine.class);
+        createLine.setId(IdUtil.getId());
+        createLine.setContractId(finalContractId);
+        createLine.setQuantity(qty);
+        createLine.setUnitPrice(price);
+        createLine.setTotalAmount(lineTotal);
+        createLine.setExcludingTaxAmount(excludingTax);
+        createLine.setTaxAmount(tax);
+        lineService.save(createLine);
+        existIdList.add(createLine.getId());
+      }
+    }
+
+    List<ProcurementContractLine> safeOldLineList = oldLineList == null ? Collections.emptyList() : oldLineList;
+    List<String> needDeleteIdList = safeOldLineList.stream()
+        .map(ProcurementContractLine::getId)
+        .filter(oldLineId -> !existIdList.contains(oldLineId))
+        .collect(Collectors.toList());
+    if (CollectionUtil.isNotEmpty(needDeleteIdList)) {
+      lineService.removeByIds(needDeleteIdList);
+    }
+  }
+
+  private void fillShowExamineInfo(List<ProcurementContract> datas) {
+    if (CollectionUtil.isEmpty(datas)) {
+      return;
+    }
+
+    List<ProcurementContract> validDatas = datas.stream()
+        .filter(Objects::nonNull)
+        .collect(Collectors.toList());
+    if (CollectionUtil.isEmpty(validDatas)) {
+      return;
+    }
+
+    List<String> businessIds = validDatas.stream()
+        .map(ProcurementContract::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 (ProcurementContract contract : validDatas) {
+      boolean hasFlow = flowBusinessIdSet.contains(contract.getId());
+      boolean hasTodo = todoBusinessIdSet.contains(contract.getId());
+      contract.setShowExamineDetail(hasFlow && StringUtils.isNotBlank(contract.getApprovalStatus()));
+      contract.setShowExamine(hasTodo && CustomerDevelopStatus.AUDIT.name().equals(contract.getApprovalStatus()));
+    }
+  }
+}

@@ -37,10 +37,13 @@ import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
 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;
+import com.lframework.xingyun.sc.procurement.service.contract.ProcurementContractService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanLineService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService;
 import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationService;
 import com.lframework.xingyun.sc.procurement.vo.buyout.CreateProcurementBuyoutApplyVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractLineVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.CreateProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.ProcurementPlanLineVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.ProcurementPlanUpdateLineVo;
@@ -81,6 +84,8 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
   private SysRoleService sysRoleService;
   @Resource
   private SalesmanQuotationService salesmanQuotationService;
+  @Resource
+  private ProcurementContractService procurementContractService;
 
   @Override
   public PageResult<ProcurementPlan> query(Integer pageIndex, Integer pageSize,
@@ -334,7 +339,37 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
     if (procurementPlan == null || procurementPlan.getCompanyShortId() == null) {
       throw new InputErrorException("请先补充公司名称！");
     }
-    //todo 后面合同模块需要补充生成合同的逻辑
+    //生成合同
+    CreateProcurementContractVo vo = new CreateProcurementContractVo();
+    vo.setProcurementPlanId(procurementPlan.getId());
+    vo.setProcurementPlanCode(procurementPlan.getCode());
+    vo.setSupplierId(procurementPlan.getSupplierId());
+    vo.setCompanyShortId(procurementPlan.getCompanyShortId());
+    vo.setSignTime(procurementPlan.getDate());
+    vo.setDeliveryTime(procurementPlan.getDeliveryDate());
+    vo.setSettlementRatio(procurementPlan.getSettlementRatio());
+    vo.setOriginatorId(procurementPlan.getCreateById());
+    vo.setOriginatorName(procurementPlan.getCreateBy());
+    List<CreateProcurementContractLineVo> list = new ArrayList<>();
+    List<ProcurementPlanLine> lines = procurementPlanLineService.getByProcurementPlanId(id);
+    if (CollectionUtil.isEmpty(lines)) {
+      throw new InputErrorException("采购计划明细没有数据！");
+    }
+    for (ProcurementPlanLine line : lines) {
+      CreateProcurementContractLineVo lineVo = new CreateProcurementContractLineVo();
+      lineVo.setPlanLineId(line.getId());
+      lineVo.setItemId(IdUtil.getId());
+      //todo 开票品名逻辑需要修改
+      lineVo.setInvoiceProductName(procurementPlan.getInvoiceProductName());
+      lineVo.setProductId(line.getProductId());
+      lineVo.setQuantity(line.getQuantity());
+      lineVo.setUnitPrice(line.getActualPurchasePrice());
+      lineVo.setDeliveryTime(procurementPlan.getDeliveryDate());
+      list.add(lineVo);
+    }
+    vo.setProcurementContractLineList(list);
+    procurementContractService.create(vo);
+
     LambdaUpdateWrapper<ProcurementPlan> updateWrapper = Wrappers.lambdaUpdate(ProcurementPlan.class)
             .set(ProcurementPlan::getProcessNode, "GYGLKZLGLG")
             .set(ProcurementPlan::getProcessStatus, "TO_SPLIT")

@@ -31,18 +31,19 @@ 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;
 import com.lframework.xingyun.sc.procurement.mappers.replenish.ProcurementPlanReplenishMapper;
 import com.lframework.xingyun.sc.procurement.service.buyout.ProcurementBuyoutApplyService;
+import com.lframework.xingyun.sc.procurement.service.contract.ProcurementContractService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanLineService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService;
 import com.lframework.xingyun.sc.procurement.service.replenish.ProcurementPlanReplenishLineService;
 import com.lframework.xingyun.sc.procurement.service.replenish.ProcurementPlanReplenishService;
 import com.lframework.xingyun.sc.procurement.vo.buyout.CreateProcurementBuyoutApplyVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractLineVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.CreateProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.ProcurementPlanLineVo;
 import com.lframework.xingyun.sc.procurement.vo.replenish.CreateProcurementPlanReplenishLineVo;
@@ -89,6 +90,8 @@ public class ProcurementPlanReplenishServiceImpl
   private ProcurementBuyoutApplyService procurementBuyoutApplyService;
   @Resource
   private FlowTaskWrapperMapper flowTaskWrapperMapper;
+  @Resource
+  private ProcurementContractService procurementContractService;
 
 
   @Override
@@ -396,7 +399,6 @@ public class ProcurementPlanReplenishServiceImpl
       procurementPlanService.update(planWrapper);
 
       ProcurementPlanReplenish procurementPlanReplenish = this.getById(id);
-      //todo 生成新的合同
       //生成一个补的主计划
       // 归档主计划（ID新生成，保持原code以区分，添加补单标识）
       List<ProcurementPlanReplenishLine> mainLines =
@@ -444,6 +446,37 @@ public class ProcurementPlanReplenishServiceImpl
         procurementPlanLineService.saveBatch(archivedMainLines);
       }
 
+      //生成合同
+      ProcurementPlan procurementPlan = procurementPlanService.getById(archivedMain.getId());
+      CreateProcurementContractVo contractVo = new CreateProcurementContractVo();
+      contractVo.setProcurementPlanId(procurementPlan.getId());
+      contractVo.setProcurementPlanCode(procurementPlan.getCode());
+      contractVo.setSupplierId(procurementPlan.getSupplierId());
+      contractVo.setCompanyShortId(procurementPlan.getCompanyShortId());
+      contractVo.setSignTime(procurementPlan.getDate());
+      contractVo.setDeliveryTime(procurementPlan.getDeliveryDate());
+      contractVo.setSettlementRatio(procurementPlan.getSettlementRatio());
+      contractVo.setOriginatorId(procurementPlan.getCreateById());
+      contractVo.setOriginatorName(procurementPlan.getCreateBy());
+      List<CreateProcurementContractLineVo> contractLineVoList = new ArrayList<>();
+      List<ProcurementPlanLine> lineList = procurementPlanLineService.getByProcurementPlanId(archivedMain.getId());
+      if (CollectionUtil.isEmpty(lineList)) {
+        throw new InputErrorException("采购计划明细没有数据！");
+      }
+      for (ProcurementPlanLine line : lineList) {
+        CreateProcurementContractLineVo lineVo = new CreateProcurementContractLineVo();
+        lineVo.setPlanLineId(line.getId());
+        lineVo.setItemId(IdUtil.getId());
+        //todo 开票品名逻辑需要修改
+        lineVo.setInvoiceProductName(procurementPlan.getInvoiceProductName());
+        lineVo.setProductId(line.getProductId());
+        lineVo.setQuantity(line.getQuantity());
+        lineVo.setUnitPrice(line.getActualPurchasePrice());
+        lineVo.setDeliveryTime(procurementPlan.getDeliveryDate());
+        contractLineVoList.add(lineVo);
+      }
+      contractVo.setProcurementContractLineList(contractLineVoList);
+      procurementContractService.create(contractVo);
       //生成买断操作申请单
       if (CollectionUtil.isNotEmpty(allWorkshopIds) && allWorkshopIds.size() == 1) {
         CreateProcurementBuyoutApplyVo vo = new CreateProcurementBuyoutApplyVo();

+package com.lframework.xingyun.sc.procurement.mappers.contract;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContractLine;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ProcurementContractLineMapper extends BaseMapper<ProcurementContractLine> {
+
+  List<ProcurementContractLine> getByContractId(@Param("contractId") String contractId);
+
+  void deleteByContractId(@Param("contractId") String contractId);
+}

+package com.lframework.xingyun.sc.procurement.mappers.contract;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContract;
+import com.lframework.xingyun.sc.procurement.vo.contract.QueryProcurementContractVo;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ProcurementContractMapper extends BaseMapper<ProcurementContract> {
+
+  List<ProcurementContract> query(@Param("vo") QueryProcurementContractVo vo);
+
+  ProcurementContract findById(@Param("id") String id);
+}

+package com.lframework.xingyun.sc.procurement.service.contract;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContractLine;
+import java.util.List;
+
+public interface ProcurementContractLineService extends IService<ProcurementContractLine> {
+
+  List<ProcurementContractLine> getByContractId(String contractId);
+
+  void deleteByContractId(String contractId);
+}

+package com.lframework.xingyun.sc.procurement.service.contract;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.bo.procurement.GetProcurementContractBo;
+import com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContract;
+import com.lframework.xingyun.sc.procurement.vo.contract.CreateProcurementContractVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.QueryProcurementContractVo;
+import com.lframework.xingyun.sc.procurement.vo.contract.UpdateProcurementContractVo;
+import java.util.List;
+import java.util.Map;
+
+public interface ProcurementContractService extends IService<ProcurementContract> {
+
+  PageResult<ProcurementContract> query(Integer pageIndex, Integer pageSize,
+                                         QueryProcurementContractVo vo);
+
+  List<ProcurementContract> query(QueryProcurementContractVo vo);
+
+  GetProcurementContractBo findDetail(String id);
+
+  String create(CreateProcurementContractVo vo);
+
+  void update(UpdateProcurementContractVo vo);
+
+  /**
+   * 取消
+   */
+  void cancel(String id);
+
+  /**
+   * 提交审核
+   */
+  void submit(String id);
+
+  /**
+   * 根据计划ID废弃采购合同
+   */
+  void deleteById(String id);
+
+  /**
+   * 更新审核状态
+   */
+  void updateApprovalStatus(String id, String approvalStatus);
+
+}

+package com.lframework.xingyun.sc.procurement.vo.contract;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+@ApiModel("新增采购合同明细行Vo")
+public class CreateProcurementContractLineVo implements BaseVo, Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @ApiModelProperty("ID")
+  private String id;
+
+  @ApiModelProperty("前端行标识")
+  private String itemId;
+
+  @ApiModelProperty("原采购计划明细行ID（追溯用）")
+  private String planLineId;
+
+  @ApiModelProperty(value = "名称（开票品名） 必填", required = true)
+  @NotBlank(message = "开票品名不能为空！")
+  private String invoiceProductName;
+
+  @ApiModelProperty(value = "规格型号ID（品种ID） 必填", required = true)
+  @NotBlank(message = "规格型号ID不能为空！")
+  private String productId;
+
+  @ApiModelProperty(value = "数量 必填", required = true)
+  @NotNull(message = "数量不能为空！")
+  @Digits(integer = 14, fraction = 4, message = "数量最多支持14位整数和4位小数！")
+  private BigDecimal quantity;
+
+  @ApiModelProperty(value = "单价（实际采购价） 必填", required = true)
+  @NotNull(message = "单价不能为空！")
+  @Digits(integer = 14, fraction = 4, message = "单价最多支持14位整数和4位小数！")
+  private BigDecimal unitPrice;
+
+  @ApiModelProperty("不含税金额 后端重算 可不传")
+  private BigDecimal excludingTaxAmount;
+
+  @ApiModelProperty("税额 后端重算 可不传")
+  private BigDecimal taxAmount;
+
+  @ApiModelProperty("合计金额 = 数量 * 单价 后端重算 可不传")
+  private BigDecimal totalAmount;
+
+  @ApiModelProperty(value = "交货时间 必填", required = true)
+  @NotNull(message = "交货时间不能为空！")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate deliveryTime;
+}

+package com.lframework.xingyun.sc.procurement.vo.contract;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+@Data
+@ApiModel("新增采购合同Vo")
+public class CreateProcurementContractVo implements BaseVo, Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @ApiModelProperty(value = "关联采购计划ID 必填", required = true)
+  @NotBlank(message = "关联采购计划ID不能为空！")
+  private String procurementPlanId;
+
+  @ApiModelProperty(value = "投诉编码（计划单编号） 必填", required = true)
+  @NotBlank(message = "计划单编号不能为空！")
+  private String procurementPlanCode;
+
+  @ApiModelProperty(value = "供方ID（供应商ID） 必填", required = true)
+  @NotBlank(message = "供方ID不能为空！")
+  private String supplierId;
+
+  @ApiModelProperty(value = "需方ID（公司简称ID） 必填", required = true)
+  @NotBlank(message = "需方ID不能为空！")
+  private String companyShortId;
+
+  @ApiModelProperty("签订地点（固定 芜湖市）")
+  @Length(max = 64, message = "签订地点最多允许64个字符！")
+  private String signPlace;
+
+  @ApiModelProperty(value = "签订时间 必填", required = true)
+  @NotNull(message = "签订时间不能为空！")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate signTime;
+
+  @ApiModelProperty(value = "交货时间 必填", required = true)
+  @NotNull(message = "交货时间不能为空！")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate deliveryTime;
+
+  @ApiModelProperty(value = "结算比例% 必填", required = true)
+  @NotNull(message = "结算比例不能为空！")
+  private BigDecimal settlementRatio;
+
+  @ApiModelProperty("合计数量 后端根据明细重算 可不传")
+  private BigDecimal totalQuantity;
+
+  @ApiModelProperty("合计不含税金额 后端重算 可不传")
+  private BigDecimal totalExcludingTaxAmount;
+
+  @ApiModelProperty("合计税额 后端重算 可不传")
+  private BigDecimal totalTaxAmount;
+
+  @ApiModelProperty("合计金额 后端重算 可不传")
+  private BigDecimal totalAmount;
+
+  @ApiModelProperty("特殊约定（大文本）")
+  private String specialAgreement;
+
+  @ApiModelProperty("附件文件ID集合（多文件，逗号分隔）")
+  private String attachmentFileIds;
+
+  @ApiModelProperty("附件文件名称集合（多文件，逗号分隔）")
+  private String attachmentFileNames;
+
+  @ApiModelProperty("发起人ID（计划的创建人）")
+  private String originatorId;
+
+  @ApiModelProperty("发起人（显示）")
+  private String originatorName;
+
+  @ApiModelProperty(value = "明细列表 必填", required = true)
+  @Valid
+  private List<CreateProcurementContractLineVo> procurementContractLineList;
+}

+package com.lframework.xingyun.sc.procurement.vo.contract;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.vo.SortPageVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDate;
+import lombok.Data;
+
+@Data
+@ApiModel("查询采购合同")
+public class QueryProcurementContractVo extends SortPageVo implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @ApiModelProperty("计划单编号（精确或模糊匹配）")
+  private String procurementPlanCode;
+
+  @ApiModelProperty("供方名称")
+  private String supplierName;
+
+  @ApiModelProperty("需方名称")
+  private String companyFullName;
+
+  @ApiModelProperty("合同状态 1代表删除，0代表正常")
+  private Integer deleted;
+
+  @ApiModelProperty("审核状态 AUDIT/PASS/REFUSE/CANCEL")
+  private String approvalStatus;
+
+  @ApiModelProperty("签订时间开始")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate startSignTime;
+
+  @ApiModelProperty("签订时间结束")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate endSignTime;
+
+  @ApiModelProperty("交货时间开始")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate startDeliveryTime;
+
+  @ApiModelProperty("交货时间结束")
+  @JsonFormat(pattern = StringPool.DATE_PATTERN)
+  private LocalDate endDeliveryTime;
+}

+package com.lframework.xingyun.sc.procurement.vo.contract;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("修改采购合同明细行Vo")
+public class UpdateProcurementContractLineVo extends CreateProcurementContractLineVo implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @ApiModelProperty("明细行主键ID")
+  private String id;
+
+  @ApiModelProperty("主表ID")
+  private String contractId;
+}

+package com.lframework.xingyun.sc.procurement.vo.contract;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+@Data
+@ApiModel("修改采购合同Vo")
+public class UpdateProcurementContractVo implements BaseVo, Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @ApiModelProperty(value = "ID 必填", required = true)
+  @NotBlank(message = "ID不能为空！")
+  private String id;
+
+  @ApiModelProperty(value = "关联采购计划ID 必填", required = true)
+  @NotBlank(message = "关联采购计划ID不能为空！")
+  private String procurementPlanId;
+
+  @ApiModelProperty(value = "投诉编码（计划单编号） 必填", required = true)
+  @NotBlank(message = "计划单编号不能为空！")
+  private String procurementPlanCode;
+
+  @ApiModelProperty(value = "供方ID（供应商ID） 必填", required = true)
+  @NotBlank(message = "供方ID不能为空！")
+  private String supplierId;
+
+  @ApiModelProperty(value = "需方ID（公司简称ID） 必填", required = true)
+  @NotBlank(message = "需方ID不能为空！")
+  private String companyShortId;
+
+  @ApiModelProperty("签订地点")
+  @Length(max = 64, message = "签订地点最多允许64个字符！")
+  private String signPlace;
+
+  @ApiModelProperty(value = "签订时间 必填", required = true)
+  @NotNull(message = "签订时间不能为空！")
+  private LocalDate signTime;
+
+  @ApiModelProperty(value = "交货时间 必填", required = true)
+  @NotNull(message = "交货时间不能为空！")
+  private LocalDate deliveryTime;
+
+  @ApiModelProperty(value = "结算比例% 必填", required = true)
+  @NotNull(message = "结算比例不能为空！")
+  private BigDecimal settlementRatio;
+
+  @ApiModelProperty("合计数量 后端重算")
+  private BigDecimal totalQuantity;
+
+  @ApiModelProperty("合计不含税金额 后端重算")
+  private BigDecimal totalExcludingTaxAmount;
+
+  @ApiModelProperty("合计税额 后端重算")
+  private BigDecimal totalTaxAmount;
+
+  @ApiModelProperty("合计金额 后端重算")
+  private BigDecimal totalAmount;
+
+  @ApiModelProperty("特殊约定（大文本）")
+  private String specialAgreement;
+
+  @ApiModelProperty("附件文件ID集合")
+  private String attachmentFileIds;
+
+  @ApiModelProperty("附件文件名称集合")
+  private String attachmentFileNames;
+
+  @ApiModelProperty("发起人ID")
+  private String originatorId;
+
+  @ApiModelProperty("发起人")
+  private String originatorName;
+
+  @ApiModelProperty("明细列表")
+  @Valid
+  private List<UpdateProcurementContractLineVo> procurementContractLineList;
+}

@@ -8,11 +8,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.swing.*;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -445,4 +447,33 @@ public class ExcelUtil {
         }
         return null;
     }
+
+    /**
+     * 设置HTTP响应头
+     */
+    public static 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 替换模板占位符（${...} / #{...}）
+     */
+    public static 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);
+                    }
+                }
+            }
+        }
+    }
 }

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.sc.procurement.mappers.contract.ProcurementContractLineMapper">
+
+    <resultMap id="ProcurementContractLineResult" type="com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContractLine">
+        <id column="id" property="id"/>
+        <result column="contract_id" property="contractId"/>
+        <result column="plan_line_id" property="planLineId"/>
+        <result column="invoice_product_name" property="invoiceProductName"/>
+        <result column="product_id" property="productId"/>
+        <result column="product_name" property="productName"/>
+        <result column="quantity" property="quantity"/>
+        <result column="unit_price" property="unitPrice"/>
+        <result column="excluding_tax_amount" property="excludingTaxAmount"/>
+        <result column="tax_amount" property="taxAmount"/>
+        <result column="total_amount" property="totalAmount"/>
+        <result column="delivery_time" property="deliveryTime"/>
+        <result column="item_id" property="itemId"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="PCL_sql">
+        SELECT
+            pcl.id,
+            pcl.contract_id,
+            pcl.plan_line_id,
+            pcl.invoice_product_name,
+            pcl.product_id,
+            bbr.product_name,
+            pcl.quantity,
+            pcl.unit_price,
+            pcl.excluding_tax_amount,
+            pcl.tax_amount,
+            pcl.total_amount,
+            pcl.delivery_time,
+            pcl.item_id,
+            pcl.create_by_id,
+            pcl.create_by,
+            pcl.update_by_id,
+            pcl.update_by,
+            pcl.create_time,
+            pcl.update_time
+        FROM procurement_contract_line AS pcl
+        LEFT JOIN base_data_breed_relationship bbr ON bbr.id = pcl.product_id
+    </sql>
+
+    <select id="getByContractId" resultMap="ProcurementContractLineResult">
+        <include refid="PCL_sql"/>
+        WHERE pcl.contract_id = #{contractId}
+    </select>
+
+    <delete id="deleteByContractId">
+        DELETE FROM procurement_contract_line WHERE contract_id = #{contractId}
+    </delete>
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.sc.procurement.mappers.contract.ProcurementContractMapper">
+
+    <resultMap id="ProcurementContractResult" type="com.lframework.xingyun.sc.procurement.entity.contract.ProcurementContract">
+        <id column="id" property="id"/>
+        <result column="procurement_plan_id" property="procurementPlanId"/>
+        <result column="procurement_plan_code" property="procurementPlanCode"/>
+        <result column="supplier_id" property="supplierId"/>
+        <result column="supplier_name" property="supplierName"/>
+        <result column="company_short_id" property="companyShortId"/>
+        <result column="company_full_name" property="companyFullName"/>
+        <result column="sign_place" property="signPlace"/>
+        <result column="sign_time" property="signTime"/>
+        <result column="delivery_time" property="deliveryTime"/>
+        <result column="settlement_ratio" property="settlementRatio"/>
+        <result column="total_quantity" property="totalQuantity"/>
+        <result column="total_excluding_tax_amount" property="totalExcludingTaxAmount"/>
+        <result column="total_tax_amount" property="totalTaxAmount"/>
+        <result column="total_amount" property="totalAmount"/>
+        <result column="special_agreement" property="specialAgreement"/>
+        <result column="attachment_file_ids" property="attachmentFileIds"/>
+        <result column="attachment_file_names" property="attachmentFileNames"/>
+        <result column="approval_status" property="approvalStatus"/>
+        <result column="originator_id" property="originatorId"/>
+        <result column="originator_name" property="originatorName"/>
+        <result column="deleted" property="deleted"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="PC_sql">
+        SELECT
+            pc.id,
+            pc.procurement_plan_id,
+            pc.procurement_plan_code,
+            pc.supplier_id,
+            pdcc.unit_name AS supplier_name,
+            pc.company_short_id,
+            bdcs.company_name AS company_full_name,
+            pc.sign_place,
+            pc.sign_time,
+            pc.delivery_time,
+            pc.settlement_ratio,
+            pc.total_quantity,
+            pc.total_excluding_tax_amount,
+            pc.total_tax_amount,
+            pc.total_amount,
+            pc.special_agreement,
+            pc.attachment_file_ids,
+            pc.attachment_file_names,
+            pc.approval_status,
+            pc.originator_id,
+            pc.originator_name,
+            pc.deleted,
+            pc.create_by_id,
+            pc.create_by,
+            pc.update_by_id,
+            pc.update_by,
+            pc.create_time,
+            pc.update_time
+        FROM procurement_contract AS pc
+        LEFT JOIN procurement_domestic_customer_credit pdcc ON pdcc.id = pc.supplier_id
+        LEFT JOIN base_data_company_short bdcs ON bdcs.id = pc.company_short_id
+    </sql>
+
+    <select id="query" resultMap="ProcurementContractResult">
+        <include refid="PC_sql"/>
+        <where>
+            pc.deleted = 0
+            <if test="vo.procurementPlanCode != null and vo.procurementPlanCode != ''">
+                AND pc.procurement_plan_code LIKE CONCAT('%', #{vo.procurementPlanCode}, '%')
+            </if>
+            <if test="vo.supplierName != null and vo.supplierName != ''">
+                AND pdcc.unit_name LIKE CONCAT('%', #{vo.supplierName}, '%')
+            </if>
+            <if test="vo.companyFullName != null and vo.companyFullName != ''">
+                AND bdcs.company_name LIKE CONCAT('%', #{vo.companyFullName}, '%')
+            </if>
+            <if test="vo.approvalStatus != null and vo.approvalStatus != ''">
+                AND pc.approval_status = #{vo.approvalStatus}
+            </if>
+            <if test="vo.startSignTime != null">
+                AND pc.sign_time <![CDATA[ >= ]]> #{vo.startSignTime}
+            </if>
+            <if test="vo.endSignTime != null">
+                AND pc.sign_time <![CDATA[ <= ]]> #{vo.endSignTime}
+            </if>
+            <if test="vo.startDeliveryTime != null">
+                AND pc.delivery_time <![CDATA[ >= ]]> #{vo.startDeliveryTime}
+            </if>
+            <if test="vo.endDeliveryTime != null">
+                AND pc.delivery_time <![CDATA[ <= ]]> #{vo.endDeliveryTime}
+            </if>
+        </where>
+        ORDER BY pc.create_time DESC
+    </select>
+
+    <select id="findById" resultMap="ProcurementContractResult">
+        <include refid="PC_sql"/>
+        WHERE pc.id = #{id} AND pc.deleted = 0
+    </select>
+</mapper>