模块迁移

hx-sale/src/main/java/com/fjhx/sale/controller/purchase/EhsdPurchaseArrivalController.java

@@ -0,0 +1,71 @@
+package com.fjhx.sale.controller.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseArrivalDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseArrivalSelectDto;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseArrivalVo;
+import com.fjhx.sale.service.purchase.EhsdPurchaseArrivalService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 采购合同-到货计划 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@RestController
+@RequestMapping("/ehsdPurchaseArrival")
+public class EhsdPurchaseArrivalController {
+
+    @Autowired
+    private EhsdPurchaseArrivalService ehsdPurchaseArrivalService;
+
+    /**
+     * 采购合同-到货计划分页
+     */
+    @PostMapping("/page")
+    public Page<EhsdPurchaseArrivalVo> page(@RequestBody EhsdPurchaseArrivalSelectDto dto) {
+        return ehsdPurchaseArrivalService.getPage(dto);
+    }
+
+    /**
+     * 采购合同-到货计划明细
+     */
+    @PostMapping("/detail")
+    public EhsdPurchaseArrivalVo detail(@RequestBody BaseSelectDto dto) {
+        return ehsdPurchaseArrivalService.detail(dto.getId());
+    }
+
+    /**
+     * 采购合同-到货计划新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody EhsdPurchaseArrivalDto ehsdPurchaseArrivalDto) {
+        ehsdPurchaseArrivalService.add(ehsdPurchaseArrivalDto);
+    }
+
+    /**
+     * 采购合同-到货计划编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody EhsdPurchaseArrivalDto ehsdPurchaseArrivalDto) {
+        ehsdPurchaseArrivalService.edit(ehsdPurchaseArrivalDto);
+    }
+
+    /**
+     * 采购合同-到货计划删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        ehsdPurchaseArrivalService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/purchase/EhsdPurchaseController.java

@@ -0,0 +1,71 @@
+package com.fjhx.sale.controller.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseSelectDto;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo;
+import com.fjhx.sale.service.purchase.EhsdPurchaseService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * ehsd采购表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@RestController
+@RequestMapping("/ehsdPurchase")
+public class EhsdPurchaseController {
+
+    @Autowired
+    private EhsdPurchaseService ehsdPurchaseService;
+
+    /**
+     * ehsd采购表分页
+     */
+    @PostMapping("/page")
+    public Page<EhsdPurchaseVo> page(@RequestBody EhsdPurchaseSelectDto dto) {
+        return ehsdPurchaseService.getPage(dto);
+    }
+
+    /**
+     * ehsd采购表明细
+     */
+    @PostMapping("/detail")
+    public EhsdPurchaseVo detail(@RequestBody BaseSelectDto dto) {
+        return ehsdPurchaseService.detail(dto.getId());
+    }
+
+    /**
+     * ehsd采购表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody EhsdPurchaseDto ehsdPurchaseDto) {
+        ehsdPurchaseService.add(ehsdPurchaseDto);
+    }
+
+    /**
+     * ehsd采购表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody EhsdPurchaseDto ehsdPurchaseDto) {
+        ehsdPurchaseService.edit(ehsdPurchaseDto);
+    }
+
+    /**
+     * ehsd采购表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        ehsdPurchaseService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/purchase/EhsdPurchaseProductController.java

@@ -0,0 +1,71 @@
+package com.fjhx.sale.controller.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductSelectDto;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
+import com.fjhx.sale.service.purchase.EhsdPurchaseProductService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * ehsd采购产品表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@RestController
+@RequestMapping("/ehsdPurchaseProduct")
+public class EhsdPurchaseProductController {
+
+    @Autowired
+    private EhsdPurchaseProductService ehsdPurchaseProductService;
+
+    /**
+     * ehsd采购产品表分页
+     */
+    @PostMapping("/page")
+    public Page<EhsdPurchaseProductVo> page(@RequestBody EhsdPurchaseProductSelectDto dto) {
+        return ehsdPurchaseProductService.getPage(dto);
+    }
+
+    /**
+     * ehsd采购产品表明细
+     */
+    @PostMapping("/detail")
+    public EhsdPurchaseProductVo detail(@RequestBody BaseSelectDto dto) {
+        return ehsdPurchaseProductService.detail(dto.getId());
+    }
+
+    /**
+     * ehsd采购产品表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody EhsdPurchaseProductDto ehsdPurchaseProductDto) {
+        ehsdPurchaseProductService.add(ehsdPurchaseProductDto);
+    }
+
+    /**
+     * ehsd采购产品表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody EhsdPurchaseProductDto ehsdPurchaseProductDto) {
+        ehsdPurchaseProductService.edit(ehsdPurchaseProductDto);
+    }
+
+    /**
+     * ehsd采购产品表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        ehsdPurchaseProductService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/purchase/EhsdPurchaseProductMountingsController.java

@@ -0,0 +1,71 @@
+package com.fjhx.sale.controller.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductMountingsDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductMountingsSelectDto;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductMountingsVo;
+import com.fjhx.sale.service.purchase.EhsdPurchaseProductMountingsService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * ehsd采购产品配件表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@RestController
+@RequestMapping("/ehsdPurchaseProductMountings")
+public class EhsdPurchaseProductMountingsController {
+
+    @Autowired
+    private EhsdPurchaseProductMountingsService ehsdPurchaseProductMountingsService;
+
+    /**
+     * ehsd采购产品配件表分页
+     */
+    @PostMapping("/page")
+    public Page<EhsdPurchaseProductMountingsVo> page(@RequestBody EhsdPurchaseProductMountingsSelectDto dto) {
+        return ehsdPurchaseProductMountingsService.getPage(dto);
+    }
+
+    /**
+     * ehsd采购产品配件表明细
+     */
+    @PostMapping("/detail")
+    public EhsdPurchaseProductMountingsVo detail(@RequestBody BaseSelectDto dto) {
+        return ehsdPurchaseProductMountingsService.detail(dto.getId());
+    }
+
+    /**
+     * ehsd采购产品配件表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody EhsdPurchaseProductMountingsDto ehsdPurchaseProductMountingsDto) {
+        ehsdPurchaseProductMountingsService.add(ehsdPurchaseProductMountingsDto);
+    }
+
+    /**
+     * ehsd采购产品配件表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody EhsdPurchaseProductMountingsDto ehsdPurchaseProductMountingsDto) {
+        ehsdPurchaseProductMountingsService.edit(ehsdPurchaseProductMountingsDto);
+    }
+
+    /**
+     * ehsd采购产品配件表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        ehsdPurchaseProductMountingsService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/controller/purchase/EhsdPurchaseProjectController.java

@@ -0,0 +1,71 @@
+package com.fjhx.sale.controller.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProjectDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProjectSelectDto;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProjectVo;
+import com.fjhx.sale.service.purchase.EhsdPurchaseProjectService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 采购合同-收费项目 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@RestController
+@RequestMapping("/ehsdPurchaseProject")
+public class EhsdPurchaseProjectController {
+
+    @Autowired
+    private EhsdPurchaseProjectService ehsdPurchaseProjectService;
+
+    /**
+     * 采购合同-收费项目分页
+     */
+    @PostMapping("/page")
+    public Page<EhsdPurchaseProjectVo> page(@RequestBody EhsdPurchaseProjectSelectDto dto) {
+        return ehsdPurchaseProjectService.getPage(dto);
+    }
+
+    /**
+     * 采购合同-收费项目明细
+     */
+    @PostMapping("/detail")
+    public EhsdPurchaseProjectVo detail(@RequestBody BaseSelectDto dto) {
+        return ehsdPurchaseProjectService.detail(dto.getId());
+    }
+
+    /**
+     * 采购合同-收费项目新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody EhsdPurchaseProjectDto ehsdPurchaseProjectDto) {
+        ehsdPurchaseProjectService.add(ehsdPurchaseProjectDto);
+    }
+
+    /**
+     * 采购合同-收费项目编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody EhsdPurchaseProjectDto ehsdPurchaseProjectDto) {
+        ehsdPurchaseProjectService.edit(ehsdPurchaseProjectDto);
+    }
+
+    /**
+     * 采购合同-收费项目删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        ehsdPurchaseProjectService.delete(dto.getId());
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -77,17 +77,17 @@ public class Contract extends BasePo {
     /**
      * 卖方国家表id
      */
-    private String sellCountryId;
+    private Long sellCountryId;
 
     /**
      * 卖方省份id
      */
-    private String sellProvinceId;
+    private Long sellProvinceId;
 
     /**
      * 卖方城市id
      */
-    private String sellCityId;
+    private Long sellCityId;
 
     /**
      * 卖方详细地址
@@ -115,17 +115,17 @@ public class Contract extends BasePo {
     /**
      * 买方国家表id
      */
-    private String buyCountryId;
+    private Long buyCountryId;
 
     /**
      * 买方省份id
      */
-    private String buyProvinceId;
+    private Long buyProvinceId;
 
     /**
      * 买方城市id
      */
-    private String buyCityId;
+    private Long buyCityId;
 
     /**
      * 买方详细地址

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseArrivalDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseArrival;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同-到货计划新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseArrivalDto extends EhsdPurchaseArrival {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseArrivalSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同-到货计划列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseArrivalSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseDto extends EhsdPurchase {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseProductDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购产品表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProductDto extends EhsdPurchaseProduct {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseProductMountingsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProductMountings;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购产品配件表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProductMountingsDto extends EhsdPurchaseProductMountings {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseProductMountingsSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购产品配件表列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProductMountingsSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseProductSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购产品表列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProductSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseProjectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同-收费项目新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProjectDto extends EhsdPurchaseProject {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseProjectSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同-收费项目列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProjectSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/dto/EhsdPurchaseSelectDto.java

@@ -0,0 +1,36 @@
+package com.fjhx.sale.entity.purchase.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购表列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseSelectDto extends BaseSelectDto {
+
+    /**
+     * 采购状态
+     */
+    private Integer purchaseStatus;
+
+    /**
+     * 到货状态
+     */
+    private Integer arrivalStatus;
+
+    /**
+     * 付款状态
+     */
+    private Integer payStatus;
+
+    /**
+     * 供应商名称
+     */
+    private String supplyName;
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchase.java

@@ -0,0 +1,193 @@
+package com.fjhx.sale.entity.purchase.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * ehsd采购表
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+@TableName("ehsd_purchase")
+public class EhsdPurchase extends BasePo {
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 合同模版ID
+     */
+    private Long contractTemplateId;
+
+    /**
+     * 卖方公司ID
+     */
+    private Long sellCorporationId;
+
+    /**
+     * 卖方联系人名称
+     */
+    private String sellContactName;
+
+    /**
+     * 卖方联系人电话
+     */
+    private String sellContactNumber;
+
+    /**
+     * 卖方国家表id
+     */
+    private String sellCountryId;
+
+    /**
+     * 卖方省份id
+     */
+    private String sellProvinceId;
+
+    /**
+     * 卖方城市id
+     */
+    private String sellCityId;
+
+    /**
+     * 卖方详细地址
+     */
+    private String sellAddress;
+
+    /**
+     * 买方公司ID
+     */
+    private Long buyCorporationId;
+
+    /**
+     * 买方联系人名称
+     */
+    private String buyContactName;
+
+    /**
+     * 买方联系人电话
+     */
+    private String buyContactNumber;
+
+    /**
+     * 买方国家表id
+     */
+    private String buyCountryId;
+
+    /**
+     * 买方省份id
+     */
+    private String buyProvinceId;
+
+    /**
+     * 买方城市id
+     */
+    private String buyCityId;
+
+    /**
+     * 买方详细地址
+     */
+    private String buyAddress;
+
+    /**
+     * 买方邮编
+     */
+    private String buyPostalCode;
+
+    /**
+     * 审批状态 0草稿 10、审批中；20、驳回  30、审批通过 88：作废   99终止
+     */
+    private Integer status;
+
+    /**
+     * 付款状态 0未付款  10部分付款  20已付款
+     */
+    private Integer payStatus;
+
+    /**
+     * 采购总金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 条款内容
+     */
+    private String remark;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 交期
+     */
+    private String deliveryTime;
+
+    /**
+     * 交货类型字典（delivery_type）
+     */
+    private String deliveryType;
+
+    /**
+     * 发票类型
+     */
+    private String invoiceType;
+
+    /**
+     * 付款方式（字典funds_payment_method
+     */
+    private String paymentMethod;
+
+    /**
+     * 质保期
+     */
+    private Integer warranty;
+
+    /**
+     * 流程KEY
+     */
+    private String processInstanceId;
+
+    /**
+     * 审核通过时间
+     */
+    private Date approvedDate;
+
+    /**
+     * 创建人名称
+     */
+    private String userName;
+
+    /**
+     * 采购到货列表
+     */
+    @TableField(exist = false)
+    private List<EhsdPurchaseArrival> purchaseArrivalList;
+
+    /**
+     * 采购商品列表
+     */
+    @TableField(exist = false)
+    private List<EhsdPurchaseProduct> purchaseProductList;
+
+    /**
+     * 采购商品列表
+     */
+    @TableField(exist = false)
+    private List<EhsdPurchaseProject> purchaseProjectList;
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchaseArrival.java

@@ -0,0 +1,49 @@
+package com.fjhx.sale.entity.purchase.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 采购合同-到货计划
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+@TableName("ehsd_purchase_arrival")
+public class EhsdPurchaseArrival extends BasePo {
+
+    /**
+     * 采购合同ID
+     */
+    private Long purchaseId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 到货日期
+     */
+    private Date arrivalTime;
+
+    /**
+     * 到货数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchaseProduct.java

@@ -0,0 +1,92 @@
+package com.fjhx.sale.entity.purchase.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fjhx.file.entity.ObsFile;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * ehsd采购产品表
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+@TableName("ehsd_purchase_product")
+public class EhsdPurchaseProduct extends BasePo {
+
+    /**
+     * 采购单ID
+     */
+    private Long purchaseId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 商品名称
+     */
+    private String productName;
+
+    /**
+     * 商品型号
+     */
+    private String productModel;
+
+    /**
+     * 商品数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 商品单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 商品金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 尔弘时代扩展JSON
+     */
+    private String json;
+
+    /**
+     * 业务来源 0自建  1外销合同采购
+     */
+    private Integer dataResource;
+
+    /**
+     * 业务来源ID
+     */
+    private Long dataResourceId;
+
+    /**
+     * 产品配件列表
+     */
+    @TableField(exist = false)
+    private List<EhsdPurchaseProductMountings> purchaseProductMountingsList;
+
+    /**
+     * 附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchaseProductMountings.java

@@ -0,0 +1,68 @@
+package com.fjhx.sale.entity.purchase.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * ehsd采购产品配件表
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+@TableName("ehsd_purchase_product_mountings")
+public class EhsdPurchaseProductMountings extends BasePo {
+
+    /**
+     * 采购单ID
+     */
+    private Long purchaseProductId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 商品名称
+     */
+    private String productName;
+
+    /**
+     * 商品型号
+     */
+    private String productModel;
+
+    /**
+     * 商品数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 商品单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 商品金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 尔弘时代扩展JSON
+     */
+    private String json;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/po/EhsdPurchaseProject.java

@@ -0,0 +1,44 @@
+package com.fjhx.sale.entity.purchase.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 采购合同-收费项目
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+@TableName("ehsd_purchase_project")
+public class EhsdPurchaseProject extends BasePo {
+
+    /**
+     * 采购单ID
+     */
+    private Long purchaseId;
+
+    /**
+     * 收费项目
+
+     */
+    private String payName;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseArrivalVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.vo;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseArrival;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同-到货计划列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseArrivalVo extends EhsdPurchaseArrival {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseProductMountingsVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.vo;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProductMountings;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购产品配件表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProductMountingsVo extends EhsdPurchaseProductMountings {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseProductVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.vo;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购产品表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProductVo extends EhsdPurchaseProduct {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseProjectVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.purchase.vo;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购合同-收费项目列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseProjectVo extends EhsdPurchaseProject {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/purchase/vo/EhsdPurchaseVo.java

@@ -0,0 +1,21 @@
+package com.fjhx.sale.entity.purchase.vo;
+
+import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * ehsd采购表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Getter
+@Setter
+public class EhsdPurchaseVo extends EhsdPurchase {
+
+    /**
+     * 供应商名称
+     */
+    private String supplyName;
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/purchase/EhsdPurchaseArrivalMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseArrival;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseArrivalVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 采购合同-到货计划 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseArrivalMapper extends BaseMapper<EhsdPurchaseArrival> {
+
+    /**
+     * 采购合同-到货计划分页
+     */
+    Page<EhsdPurchaseArrivalVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<EhsdPurchaseArrival> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/purchase/EhsdPurchaseMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * ehsd采购表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseMapper extends BaseMapper<EhsdPurchase> {
+
+    /**
+     * ehsd采购表分页
+     */
+    Page<EhsdPurchaseVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<EhsdPurchase> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/purchase/EhsdPurchaseProductMapper.java

@@ -0,0 +1,36 @@
+package com.fjhx.sale.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * ehsd采购产品表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseProductMapper extends BaseMapper<EhsdPurchaseProduct> {
+
+    /**
+     * ehsd采购产品表分页
+     */
+    Page<EhsdPurchaseProductVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<EhsdPurchaseProduct> wrapper);
+
+    /**
+     * 查询采购产品总金额，通过数据来源ID
+     * @param contractIds
+     * @return
+     */
+    Map<Long, BigDecimal> getGroupSumAmount(List<Long> contractIds);
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/purchase/EhsdPurchaseProductMountingsMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProductMountings;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductMountingsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * ehsd采购产品配件表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseProductMountingsMapper extends BaseMapper<EhsdPurchaseProductMountings> {
+
+    /**
+     * ehsd采购产品配件表分页
+     */
+    Page<EhsdPurchaseProductMountingsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<EhsdPurchaseProductMountings> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/purchase/EhsdPurchaseProjectMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProject;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProjectVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 采购合同-收费项目 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseProjectMapper extends BaseMapper<EhsdPurchaseProject> {
+
+    /**
+     * 采购合同-收费项目分页
+     */
+    Page<EhsdPurchaseProjectVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<EhsdPurchaseProject> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/EhsdPurchaseArrivalService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseArrivalDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseArrivalSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseArrival;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseArrivalVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 采购合同-到货计划 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseArrivalService extends BaseService<EhsdPurchaseArrival> {
+
+    /**
+     * 采购合同-到货计划分页
+     */
+    Page<EhsdPurchaseArrivalVo> getPage(EhsdPurchaseArrivalSelectDto dto);
+
+    /**
+     * 采购合同-到货计划明细
+     */
+    EhsdPurchaseArrivalVo detail(Long id);
+
+    /**
+     * 采购合同-到货计划新增
+     */
+    void add(EhsdPurchaseArrivalDto ehsdPurchaseArrivalDto);
+
+    /**
+     * 采购合同-到货计划编辑
+     */
+    void edit(EhsdPurchaseArrivalDto ehsdPurchaseArrivalDto);
+
+    /**
+     * 采购合同-到货计划删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/EhsdPurchaseProductMountingsService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductMountingsDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductMountingsSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProductMountings;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductMountingsVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * ehsd采购产品配件表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseProductMountingsService extends BaseService<EhsdPurchaseProductMountings> {
+
+    /**
+     * ehsd采购产品配件表分页
+     */
+    Page<EhsdPurchaseProductMountingsVo> getPage(EhsdPurchaseProductMountingsSelectDto dto);
+
+    /**
+     * ehsd采购产品配件表明细
+     */
+    EhsdPurchaseProductMountingsVo detail(Long id);
+
+    /**
+     * ehsd采购产品配件表新增
+     */
+    void add(EhsdPurchaseProductMountingsDto ehsdPurchaseProductMountingsDto);
+
+    /**
+     * ehsd采购产品配件表编辑
+     */
+    void edit(EhsdPurchaseProductMountingsDto ehsdPurchaseProductMountingsDto);
+
+    /**
+     * ehsd采购产品配件表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/EhsdPurchaseProductService.java

@@ -0,0 +1,56 @@
+package com.fjhx.sale.service.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * ehsd采购产品表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseProductService extends BaseService<EhsdPurchaseProduct> {
+
+    /**
+     * ehsd采购产品表分页
+     */
+    Page<EhsdPurchaseProductVo> getPage(EhsdPurchaseProductSelectDto dto);
+
+    /**
+     * ehsd采购产品表明细
+     */
+    EhsdPurchaseProductVo detail(Long id);
+
+    /**
+     * ehsd采购产品表新增
+     */
+    void add(EhsdPurchaseProductDto ehsdPurchaseProductDto);
+
+    /**
+     * ehsd采购产品表编辑
+     */
+    void edit(EhsdPurchaseProductDto ehsdPurchaseProductDto);
+
+    /**
+     * ehsd采购产品表删除
+     */
+    void delete(Long id);
+
+    /**
+     * 查询采购产品总金额，通过数据来源ID
+     * @param contractIds
+     * @return
+     */
+    Map<Long, BigDecimal> getGroupSumAmount(List<Long> contractIds);
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/EhsdPurchaseProjectService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProjectDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProjectSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProject;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProjectVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 采购合同-收费项目 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseProjectService extends BaseService<EhsdPurchaseProject> {
+
+    /**
+     * 采购合同-收费项目分页
+     */
+    Page<EhsdPurchaseProjectVo> getPage(EhsdPurchaseProjectSelectDto dto);
+
+    /**
+     * 采购合同-收费项目明细
+     */
+    EhsdPurchaseProjectVo detail(Long id);
+
+    /**
+     * 采购合同-收费项目新增
+     */
+    void add(EhsdPurchaseProjectDto ehsdPurchaseProjectDto);
+
+    /**
+     * 采购合同-收费项目编辑
+     */
+    void edit(EhsdPurchaseProjectDto ehsdPurchaseProjectDto);
+
+    /**
+     * 采购合同-收费项目删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/EhsdPurchaseService.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.service.purchase;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * ehsd采购表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+public interface EhsdPurchaseService extends BaseService<EhsdPurchase> {
+
+    /**
+     * ehsd采购表分页
+     */
+    Page<EhsdPurchaseVo> getPage(EhsdPurchaseSelectDto dto);
+
+    /**
+     * ehsd采购表明细
+     */
+    EhsdPurchaseVo detail(Long id);
+
+    /**
+     * ehsd采购表新增
+     */
+    void add(EhsdPurchaseDto ehsdPurchaseDto);
+
+    /**
+     * ehsd采购表编辑
+     */
+    void edit(EhsdPurchaseDto ehsdPurchaseDto);
+
+    /**
+     * ehsd采购表删除
+     */
+    void delete(Long id);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseArrivalServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.purchase.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseArrivalDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseArrivalSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseArrival;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseArrivalVo;
+import com.fjhx.sale.mapper.purchase.EhsdPurchaseArrivalMapper;
+import com.fjhx.sale.service.purchase.EhsdPurchaseArrivalService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 采购合同-到货计划 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Service
+public class EhsdPurchaseArrivalServiceImpl extends ServiceImpl<EhsdPurchaseArrivalMapper, EhsdPurchaseArrival> implements EhsdPurchaseArrivalService {
+
+    @Override
+    public Page<EhsdPurchaseArrivalVo> getPage(EhsdPurchaseArrivalSelectDto dto) {
+        IWrapper<EhsdPurchaseArrival> wrapper = getWrapper();
+        wrapper.orderByDesc("epa", EhsdPurchaseArrival::getId);
+        Page<EhsdPurchaseArrivalVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public EhsdPurchaseArrivalVo detail(Long id) {
+        EhsdPurchaseArrival EhsdPurchaseArrival = this.getById(id);
+        EhsdPurchaseArrivalVo result = BeanUtil.toBean(EhsdPurchaseArrival, EhsdPurchaseArrivalVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(EhsdPurchaseArrivalDto ehsdPurchaseArrivalDto) {
+        this.save(ehsdPurchaseArrivalDto);
+    }
+
+    @Override
+    public void edit(EhsdPurchaseArrivalDto ehsdPurchaseArrivalDto) {
+        this.updateById(ehsdPurchaseArrivalDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseProductMountingsServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.purchase.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductMountingsDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductMountingsSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProductMountings;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductMountingsVo;
+import com.fjhx.sale.mapper.purchase.EhsdPurchaseProductMountingsMapper;
+import com.fjhx.sale.service.purchase.EhsdPurchaseProductMountingsService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * ehsd采购产品配件表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Service
+public class EhsdPurchaseProductMountingsServiceImpl extends ServiceImpl<EhsdPurchaseProductMountingsMapper, EhsdPurchaseProductMountings> implements EhsdPurchaseProductMountingsService {
+
+    @Override
+    public Page<EhsdPurchaseProductMountingsVo> getPage(EhsdPurchaseProductMountingsSelectDto dto) {
+        IWrapper<EhsdPurchaseProductMountings> wrapper = getWrapper();
+        wrapper.orderByDesc("eppm", EhsdPurchaseProductMountings::getId);
+        Page<EhsdPurchaseProductMountingsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public EhsdPurchaseProductMountingsVo detail(Long id) {
+        EhsdPurchaseProductMountings EhsdPurchaseProductMountings = this.getById(id);
+        EhsdPurchaseProductMountingsVo result = BeanUtil.toBean(EhsdPurchaseProductMountings, EhsdPurchaseProductMountingsVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(EhsdPurchaseProductMountingsDto ehsdPurchaseProductMountingsDto) {
+        this.save(ehsdPurchaseProductMountingsDto);
+    }
+
+    @Override
+    public void edit(EhsdPurchaseProductMountingsDto ehsdPurchaseProductMountingsDto) {
+        this.updateById(ehsdPurchaseProductMountingsDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseProductServiceImpl.java

@@ -0,0 +1,72 @@
+package com.fjhx.sale.service.purchase.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProductSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProduct;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
+import com.fjhx.sale.mapper.purchase.EhsdPurchaseProductMapper;
+import com.fjhx.sale.service.purchase.EhsdPurchaseProductService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * ehsd采购产品表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Service
+public class EhsdPurchaseProductServiceImpl extends ServiceImpl<EhsdPurchaseProductMapper, EhsdPurchaseProduct> implements EhsdPurchaseProductService {
+
+    @Override
+    public Page<EhsdPurchaseProductVo> getPage(EhsdPurchaseProductSelectDto dto) {
+        IWrapper<EhsdPurchaseProduct> wrapper = getWrapper();
+        wrapper.orderByDesc("epp", EhsdPurchaseProduct::getId);
+        Page<EhsdPurchaseProductVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public EhsdPurchaseProductVo detail(Long id) {
+        EhsdPurchaseProduct EhsdPurchaseProduct = this.getById(id);
+        EhsdPurchaseProductVo result = BeanUtil.toBean(EhsdPurchaseProduct, EhsdPurchaseProductVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(EhsdPurchaseProductDto ehsdPurchaseProductDto) {
+        this.save(ehsdPurchaseProductDto);
+    }
+
+    @Override
+    public void edit(EhsdPurchaseProductDto ehsdPurchaseProductDto) {
+        this.updateById(ehsdPurchaseProductDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    /**
+     * 查询采购产品总金额，通过数据来源ID
+     * @param contractIds
+     * @return
+     */
+    @Override
+    public Map<Long, BigDecimal> getGroupSumAmount(List<Long> contractIds) {
+        return baseMapper.getGroupSumAmount(contractIds);
+    }
+
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseProjectServiceImpl.java

@@ -0,0 +1,57 @@
+package com.fjhx.sale.service.purchase.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProjectDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseProjectSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchaseProject;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProjectVo;
+import com.fjhx.sale.mapper.purchase.EhsdPurchaseProjectMapper;
+import com.fjhx.sale.service.purchase.EhsdPurchaseProjectService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 采购合同-收费项目 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Service
+public class EhsdPurchaseProjectServiceImpl extends ServiceImpl<EhsdPurchaseProjectMapper, EhsdPurchaseProject> implements EhsdPurchaseProjectService {
+
+    @Override
+    public Page<EhsdPurchaseProjectVo> getPage(EhsdPurchaseProjectSelectDto dto) {
+        IWrapper<EhsdPurchaseProject> wrapper = getWrapper();
+        wrapper.orderByDesc("epp", EhsdPurchaseProject::getId);
+        Page<EhsdPurchaseProjectVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public EhsdPurchaseProjectVo detail(Long id) {
+        EhsdPurchaseProject EhsdPurchaseProject = this.getById(id);
+        EhsdPurchaseProjectVo result = BeanUtil.toBean(EhsdPurchaseProject, EhsdPurchaseProjectVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(EhsdPurchaseProjectDto ehsdPurchaseProjectDto) {
+        this.save(ehsdPurchaseProjectDto);
+    }
+
+    @Override
+    public void edit(EhsdPurchaseProjectDto ehsdPurchaseProjectDto) {
+        this.updateById(ehsdPurchaseProjectDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -0,0 +1,76 @@
+package com.fjhx.sale.service.purchase.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
+import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseSelectDto;
+import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
+import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo;
+import com.fjhx.sale.mapper.purchase.EhsdPurchaseMapper;
+import com.fjhx.sale.service.purchase.EhsdPurchaseService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * ehsd采购表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-17
+ */
+@Service
+@DS(SourceConstant.SALE)
+public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, EhsdPurchase> implements EhsdPurchaseService {
+
+    /**
+     * 分页
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<EhsdPurchaseVo> getPage(EhsdPurchaseSelectDto dto) {
+        IWrapper<EhsdPurchase> wrapper = getWrapper();
+        wrapper.orderByDesc("t1", EhsdPurchase::getCreateTime);
+        if (ObjectUtils.isNotEmpty(dto.getPurchaseStatus())) {
+            wrapper.eq("t1", EhsdPurchase::getStatus, dto.getPurchaseStatus());
+        }
+        if (ObjectUtils.isNotEmpty(dto.getPayStatus())) {
+            wrapper.eq("t1", EhsdPurchase::getPayStatus, dto.getPayStatus());
+        }
+        if (ObjectUtils.isNotEmpty(dto.getKeyword())) {
+            wrapper.keyword(dto.getKeyword(),new SqlField("t2.name"),new SqlField("t1.`code`"));
+        }
+        Page<EhsdPurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public EhsdPurchaseVo detail(Long id) {
+        EhsdPurchase EhsdPurchase = this.getById(id);
+        EhsdPurchaseVo result = BeanUtil.toBean(EhsdPurchase, EhsdPurchaseVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(EhsdPurchaseDto ehsdPurchaseDto) {
+        this.save(ehsdPurchaseDto);
+    }
+
+    @Override
+    public void edit(EhsdPurchaseDto ehsdPurchaseDto) {
+        this.updateById(ehsdPurchaseDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseArrivalMapper.xml

@@ -0,0 +1,20 @@
+<?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.fjhx.sale.mapper.purchase.EhsdPurchaseArrivalMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseArrivalVo">
+        select
+            epa.id,
+            epa.purchase_id,
+            epa.product_id,
+            epa.arrival_time,
+            epa.quantity,
+            epa.remark,
+            epa.create_user,
+            epa.create_time,
+            epa.update_user,
+            epa.update_time
+        from ehsd_purchase_arrival epa
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseMapper.xml

@@ -0,0 +1,14 @@
+<?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.fjhx.sale.mapper.purchase.EhsdPurchaseMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseVo">
+        SELECT
+            t1.*,
+            t2.`name` AS supplyName
+        FROM
+            ehsd_purchase t1
+                LEFT JOIN bytesailing_supply.supplier_info t2 ON t1.sell_corporation_id = t2.id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProductMapper.xml

@@ -0,0 +1,40 @@
+<?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.fjhx.sale.mapper.purchase.EhsdPurchaseProductMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo">
+        select
+            epp.id,
+            epp.purchase_id,
+            epp.product_id,
+            epp.product_name,
+            epp.product_model,
+            epp.quantity,
+            epp.price,
+            epp.amount,
+            epp.remark,
+            epp.json,
+            epp.create_user,
+            epp.create_time,
+            epp.update_user,
+            epp.update_time
+        from ehsd_purchase_product epp
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getGroupSumAmount" resultType="java.util.Map">
+        SELECT
+            SUM(amount) ,
+            data_resource_id
+        FROM
+            ehsd_purchase_product
+        WHERE
+        t2.`status` &gt;= 30
+        AND t2.`status` &lt; 88
+        <if test="contractIds neq null and contractIds.size() > 0">
+            <foreach collection="contractIds" item="contractId" open="AND data_resource_id IN (" separator="," close=")">
+                #{contractId}
+            </foreach>
+        </if>
+        GROUP BY data_resource_id
+    </select>
+</mapper>

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProductMountingsMapper.xml

@@ -0,0 +1,24 @@
+<?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.fjhx.sale.mapper.purchase.EhsdPurchaseProductMountingsMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductMountingsVo">
+        select
+            eppm.id,
+            eppm.purchase_product_id,
+            eppm.product_id,
+            eppm.product_name,
+            eppm.product_model,
+            eppm.quantity,
+            eppm.price,
+            eppm.amount,
+            eppm.remark,
+            eppm.json,
+            eppm.create_user,
+            eppm.create_time,
+            eppm.update_user,
+            eppm.update_time
+        from ehsd_purchase_product_mountings eppm
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-sale/src/main/resources/mapper/purchase/EhsdPurchaseProjectMapper.xml

@@ -0,0 +1,19 @@
+<?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.fjhx.sale.mapper.purchase.EhsdPurchaseProjectMapper">
+    <select id="getPage" resultType="com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProjectVo">
+        select
+            epp.id,
+            epp.purchase_id,
+            epp.pay_name,
+            epp.amount,
+            epp.remark,
+            epp.create_user,
+            epp.create_time,
+            epp.update_user,
+            epp.update_time
+        from ehsd_purchase_project epp
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>