From daa46b067134e9ece17c9954512227f70e87b8b1 Mon Sep 17 00:00:00 2001 From: yinq Date: Sat, 11 Oct 2025 15:33:44 +0800 Subject: [PATCH] =?UTF-8?q?1.0.9=20=E5=88=9D=E5=A7=8B=E5=8C=96=E5=90=88?= =?UTF-8?q?=E5=90=8C=E3=80=81=E5=90=88=E5=90=8C=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ErpContractInfoController.java | 116 ++++++++++ .../ErpContractMaterielController.java | 116 ++++++++++ .../oa/erp/domain/ErpContractInfo.java | 160 +++++++++++++ .../oa/erp/domain/ErpContractMateriel.java | 103 +++++++++ .../oa/erp/domain/bo/ErpContractInfoBo.java | 153 +++++++++++++ .../erp/domain/bo/ErpContractMaterielBo.java | 95 ++++++++ .../oa/erp/domain/vo/ErpContractInfoVo.java | 215 ++++++++++++++++++ .../erp/domain/vo/ErpContractMaterielVo.java | 118 ++++++++++ .../oa/erp/mapper/ErpContractInfoMapper.java | 37 +++ .../erp/mapper/ErpContractMaterielMapper.java | 37 +++ .../erp/service/IErpContractInfoService.java | 69 ++++++ .../service/IErpContractMaterielService.java | 69 ++++++ .../impl/ErpContractInfoServiceImpl.java | 154 +++++++++++++ .../impl/ErpContractMaterielServiceImpl.java | 143 ++++++++++++ .../mapper/oa/erp/ErpContractInfoMapper.xml | 14 ++ .../oa/erp/ErpContractMaterielMapper.xml | 14 ++ 16 files changed, 1613 insertions(+) create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractMaterielController.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMateriel.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractMaterielBo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterielVo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractMaterielMapper.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractMaterielService.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterielServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml create mode 100644 ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterielMapper.xml diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java new file mode 100644 index 00000000..a216126f --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java @@ -0,0 +1,116 @@ +package org.dromara.oa.erp.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.oa.erp.domain.vo.ErpContractInfoVo; +import org.dromara.oa.erp.domain.bo.ErpContractInfoBo; +import org.dromara.oa.erp.service.IErpContractInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 合同信息 + * 前端访问路由地址为:/oa/erp/contractInfo + * + * @author Yinq + * @date 2025-10-11 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/erp/contractInfo") +public class ErpContractInfoController extends BaseController { + + private final IErpContractInfoService erpContractInfoService; + + /** + * 查询合同信息列表 + */ + @SaCheckPermission("oa/erp:contractInfo:list") + @GetMapping("/list") + public TableDataInfo list(ErpContractInfoBo bo, PageQuery pageQuery) { + return erpContractInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出合同信息列表 + */ + @SaCheckPermission("oa/erp:contractInfo:export") + @Log(title = "合同信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ErpContractInfoBo bo, HttpServletResponse response) { + List list = erpContractInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "合同信息", ErpContractInfoVo.class, response); + } + + /** + * 获取合同信息详细信息 + * + * @param contractId 主键 + */ + @SaCheckPermission("oa/erp:contractInfo:query") + @GetMapping("/{contractId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("contractId") Long contractId) { + return R.ok(erpContractInfoService.queryById(contractId)); + } + + /** + * 新增合同信息 + */ + @SaCheckPermission("oa/erp:contractInfo:add") + @Log(title = "合同信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) { + return toAjax(erpContractInfoService.insertByBo(bo)); + } + + /** + * 修改合同信息 + */ + @SaCheckPermission("oa/erp:contractInfo:edit") + @Log(title = "合同信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ErpContractInfoBo bo) { + return toAjax(erpContractInfoService.updateByBo(bo)); + } + + /** + * 删除合同信息 + * + * @param contractIds 主键串 + */ + @SaCheckPermission("oa/erp:contractInfo:remove") + @Log(title = "合同信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{contractIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("contractIds") Long[] contractIds) { + return toAjax(erpContractInfoService.deleteWithValidByIds(List.of(contractIds), true)); + } + + /** + * 下拉框查询合同信息列表 + */ + @GetMapping("/getErpContractInfoList") + public R> getErpContractInfoList(ErpContractInfoBo bo) { + List list = erpContractInfoService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractMaterielController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractMaterielController.java new file mode 100644 index 00000000..7cb2b43f --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractMaterielController.java @@ -0,0 +1,116 @@ +package org.dromara.oa.erp.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.oa.erp.domain.vo.ErpContractMaterielVo; +import org.dromara.oa.erp.domain.bo.ErpContractMaterielBo; +import org.dromara.oa.erp.service.IErpContractMaterielService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 合同物料信息 + * 前端访问路由地址为:/oa/erp/contractMateriel + * + * @author Yinq + * @date 2025-10-11 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/erp/contractMateriel") +public class ErpContractMaterielController extends BaseController { + + private final IErpContractMaterielService erpContractMaterielService; + + /** + * 查询合同物料信息列表 + */ + @SaCheckPermission("oa/erp:contractMateriel:list") + @GetMapping("/list") + public TableDataInfo list(ErpContractMaterielBo bo, PageQuery pageQuery) { + return erpContractMaterielService.queryPageList(bo, pageQuery); + } + + /** + * 导出合同物料信息列表 + */ + @SaCheckPermission("oa/erp:contractMateriel:export") + @Log(title = "合同物料信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ErpContractMaterielBo bo, HttpServletResponse response) { + List list = erpContractMaterielService.queryList(bo); + ExcelUtil.exportExcel(list, "合同物料信息", ErpContractMaterielVo.class, response); + } + + /** + * 获取合同物料信息详细信息 + * + * @param contractMaterielId 主键 + */ + @SaCheckPermission("oa/erp:contractMateriel:query") + @GetMapping("/{contractMaterielId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("contractMaterielId") Long contractMaterielId) { + return R.ok(erpContractMaterielService.queryById(contractMaterielId)); + } + + /** + * 新增合同物料信息 + */ + @SaCheckPermission("oa/erp:contractMateriel:add") + @Log(title = "合同物料信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ErpContractMaterielBo bo) { + return toAjax(erpContractMaterielService.insertByBo(bo)); + } + + /** + * 修改合同物料信息 + */ + @SaCheckPermission("oa/erp:contractMateriel:edit") + @Log(title = "合同物料信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ErpContractMaterielBo bo) { + return toAjax(erpContractMaterielService.updateByBo(bo)); + } + + /** + * 删除合同物料信息 + * + * @param contractMaterielIds 主键串 + */ + @SaCheckPermission("oa/erp:contractMateriel:remove") + @Log(title = "合同物料信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{contractMaterielIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("contractMaterielIds") Long[] contractMaterielIds) { + return toAjax(erpContractMaterielService.deleteWithValidByIds(List.of(contractMaterielIds), true)); + } + + /** + * 下拉框查询合同物料信息列表 + */ + @GetMapping("/getErpContractMaterielList") + public R> getErpContractMaterielList(ErpContractMaterielBo bo) { + List list = erpContractMaterielService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java new file mode 100644 index 00000000..351e9fc9 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java @@ -0,0 +1,160 @@ +package org.dromara.oa.erp.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 合同信息对象 erp_contract_info + * + * @author Yinq + * @date 2025-10-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("erp_contract_info") +public class ErpContractInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 合同ID + */ + @TableId(value = "contract_id", type = IdType.AUTO) + private Long contractId; + + /** + * 有无合同（1有 2无） + */ + private String contractFlag; + + /** + * 合同编号 + */ + private String contractCode; + + /** + * 合同名称 + */ + private String contractName; + + /** + * 合同大类(1市场项目 2备件销售） + */ + private String contractCategory; + + /** + * 合同类型(1对内 2对外） + */ + private String contractType; + + /** + * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售） + */ + private String businessDirection; + + /** + * 部门 + */ + private Long contractDeptId; + + /** + * 合同时间 + */ + private Date contractDate; + + /** + * 合同总价 + */ + private BigDecimal totalPrice; + + /** + * 甲方公司 + */ + private Long aCustomerId; + + /** + * 甲方授权代表 + */ + private String aRepresent; + + /** + * 甲方签字日期 + */ + private Date aDate; + + /** + * 乙方公司 + */ + private Long bCustomerId; + + /** + * 乙方授权代表 + */ + private String bRepresent; + + /** + * 乙方签字日期 + */ + private Date bDate; + + /** + * 合同状态(1暂存 2审批中 3可用) + */ + private String contractStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 合同模板ID + */ + private Long templateId; + + /** + * 附件ID + */ + private String ossId; + + /** + * 付款方式 + */ + private String paymentMethod; + + /** + * 签字合同附件 + */ + private Long signatureAppendix; + + /** + * 合同税率(预留) + */ + private BigDecimal taxRate; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 删除标志（0代表存在 1代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMateriel.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMateriel.java new file mode 100644 index 00000000..79cff757 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMateriel.java @@ -0,0 +1,103 @@ +package org.dromara.oa.erp.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 合同物料信息对象 erp_contract_materiel + * + * @author Yinq + * @date 2025-10-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("erp_contract_materiel") +public class ErpContractMateriel extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 合同物料ID + */ + @TableId(value = "contract_materiel_id", type = IdType.AUTO) + private Long contractMaterielId; + + /** + * 合同ID + */ + private Long contractId; + + /** + * 产品名称 + */ + private String productName; + + /** + * 规格描述 + */ + private String specificationDescription; + + /** + * 物料ID + */ + private Long materielId; + + /** + * 销售物料ID + */ + private Long relationMaterielId; + + /** + * 数量 + */ + private Long amount; + + /** + * 单位ID + */ + private Long unitId; + + /** + * 未税单价 + */ + private BigDecimal beforePrice; + + /** + * 税率 + */ + private BigDecimal taxRate; + + /** + * 含税单价 + */ + private BigDecimal includingPrice; + + /** + * 小计 + */ + private BigDecimal subtotal; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 删除标志（0代表存在 1代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java new file mode 100644 index 00000000..35380350 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java @@ -0,0 +1,153 @@ +package org.dromara.oa.erp.domain.bo; + +import org.dromara.oa.erp.domain.ErpContractInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 合同信息业务对象 erp_contract_info + * + * @author Yinq + * @date 2025-10-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ErpContractInfo.class, reverseConvertGenerate = false) +public class ErpContractInfoBo extends BaseEntity { + + /** + * 合同ID + */ + @NotNull(message = "合同ID不能为空", groups = { EditGroup.class }) + private Long contractId; + + /** + * 有无合同（1有 2无） + */ + private String contractFlag; + + /** + * 合同编号 + */ + private String contractCode; + + /** + * 合同名称 + */ + private String contractName; + + /** + * 合同大类(1市场项目 2备件销售） + */ + private String contractCategory; + + /** + * 合同类型(1对内 2对外） + */ + private String contractType; + + /** + * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售） + */ + private String businessDirection; + + /** + * 部门 + */ + private Long contractDeptId; + + /** + * 合同时间 + */ + private Date contractDate; + + /** + * 合同总价 + */ + private BigDecimal totalPrice; + + /** + * 甲方公司 + */ + private Long aCustomerId; + + /** + * 甲方授权代表 + */ + private String aRepresent; + + /** + * 甲方签字日期 + */ + private Date aDate; + + /** + * 乙方公司 + */ + private Long bCustomerId; + + /** + * 乙方授权代表 + */ + private String bRepresent; + + /** + * 乙方签字日期 + */ + private Date bDate; + + /** + * 合同状态(1暂存 2审批中 3可用) + */ + private String contractStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 合同模板ID + */ + private Long templateId; + + /** + * 附件ID + */ + private String ossId; + + /** + * 付款方式 + */ + private String paymentMethod; + + /** + * 签字合同附件 + */ + private Long signatureAppendix; + + /** + * 合同税率(预留) + */ + private BigDecimal taxRate; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractMaterielBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractMaterielBo.java new file mode 100644 index 00000000..0768da50 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractMaterielBo.java @@ -0,0 +1,95 @@ +package org.dromara.oa.erp.domain.bo; + +import org.dromara.oa.erp.domain.ErpContractMateriel; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +/** + * 合同物料信息业务对象 erp_contract_materiel + * + * @author Yinq + * @date 2025-10-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ErpContractMateriel.class, reverseConvertGenerate = false) +public class ErpContractMaterielBo extends BaseEntity { + + /** + * 合同物料ID + */ + private Long contractMaterielId; + + /** + * 合同ID + */ + private Long contractId; + + /** + * 产品名称 + */ + private String productName; + + /** + * 规格描述 + */ + private String specificationDescription; + + /** + * 物料ID + */ + private Long materielId; + + /** + * 销售物料ID + */ + private Long relationMaterielId; + + /** + * 数量 + */ + private Long amount; + + /** + * 单位ID + */ + private Long unitId; + + /** + * 未税单价 + */ + private BigDecimal beforePrice; + + /** + * 税率 + */ + private BigDecimal taxRate; + + /** + * 含税单价 + */ + private BigDecimal includingPrice; + + /** + * 小计 + */ + private BigDecimal subtotal; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java new file mode 100644 index 00000000..a3675940 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java @@ -0,0 +1,215 @@ +package org.dromara.oa.erp.domain.vo; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.oa.erp.domain.ErpContractInfo; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 合同信息视图对象 erp_contract_info + * + * @author Yinq + * @date 2025-10-11 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ErpContractInfo.class) +public class ErpContractInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 合同ID + */ + @ExcelProperty(value = "合同ID") + private Long contractId; + + /** + * 有无合同（1有 2无） + */ + @ExcelProperty(value = "有无合同", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "contract_flag") + private String contractFlag; + + /** + * 合同编号 + */ + @ExcelProperty(value = "合同编号") + private String contractCode; + + /** + * 合同名称 + */ + @ExcelProperty(value = "合同名称") + private String contractName; + + /** + * 合同大类(1市场项目 2备件销售） + */ + @ExcelProperty(value = "合同大类(1市场项目 2备件销售）", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "contract_category") + private String contractCategory; + + /** + * 合同类型(1对内 2对外） + */ + @ExcelProperty(value = "合同类型(1对内 2对外）", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "contract_type") + private String contractType; + + /** + * 业务方向（1智能轮胎 2轮胎工厂 3快递物流 4锂电 5工业软件 6智能制造 7新行业及零售） + */ + @ExcelProperty(value = "业务方向", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "business_direction") + private String businessDirection; + + /** + * 部门 + */ + @ExcelProperty(value = "部门") + private Long contractDeptId; + + /** + * 合同时间 + */ + @ExcelProperty(value = "合同时间") + private Date contractDate; + + /** + * 合同总价 + */ + @ExcelProperty(value = "合同总价") + private BigDecimal totalPrice; + + /** + * 甲方公司 + */ + @ExcelProperty(value = "甲方公司") + private Long aCustomerId; + + /** + * 甲方授权代表 + */ + @ExcelProperty(value = "甲方授权代表") + private String aRepresent; + + /** + * 甲方签字日期 + */ + @ExcelProperty(value = "甲方签字日期") + private Date aDate; + + /** + * 乙方公司 + */ + @ExcelProperty(value = "乙方公司") + private Long bCustomerId; + + /** + * 乙方授权代表 + */ + @ExcelProperty(value = "乙方授权代表") + private String bRepresent; + + /** + * 乙方签字日期 + */ + @ExcelProperty(value = "乙方签字日期") + private Date bDate; + + /** + * 合同状态(1暂存 2审批中 3可用) + */ + @ExcelProperty(value = "合同状态(1暂存 2审批中 3可用)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "contract_status") + private String contractStatus; + + /** + * 流程状态 + */ + @ExcelProperty(value = "流程状态") + private String flowStatus; + + /** + * 合同模板ID + */ + @ExcelProperty(value = "合同模板ID") + private Long templateId; + + /** + * 附件ID + */ + @ExcelProperty(value = "附件ID") + private String ossId; + + /** + * 付款方式 + */ + @ExcelProperty(value = "付款方式") + private String paymentMethod; + + /** + * 签字合同附件 + */ + @ExcelProperty(value = "签字合同附件") + private Long signatureAppendix; + + /** + * 合同税率(预留) + */ + @ExcelProperty(value = "合同税率(预留)") + private BigDecimal taxRate; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterielVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterielVo.java new file mode 100644 index 00000000..aff45057 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterielVo.java @@ -0,0 +1,118 @@ +package org.dromara.oa.erp.domain.vo; + +import java.math.BigDecimal; +import org.dromara.oa.erp.domain.ErpContractMateriel; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 合同物料信息视图对象 erp_contract_materiel + * + * @author Yinq + * @date 2025-10-11 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ErpContractMateriel.class) +public class ErpContractMaterielVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 合同物料ID + */ + @ExcelProperty(value = "合同物料ID") + private Long contractMaterielId; + + /** + * 合同ID + */ + @ExcelProperty(value = "合同ID") + private Long contractId; + + /** + * 产品名称 + */ + @ExcelProperty(value = "产品名称") + private String productName; + + /** + * 规格描述 + */ + @ExcelProperty(value = "规格描述") + private String specificationDescription; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materielId; + + /** + * 销售物料ID + */ + @ExcelProperty(value = "销售物料ID") + private Long relationMaterielId; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private Long amount; + + /** + * 单位ID + */ + @ExcelProperty(value = "单位ID") + private Long unitId; + + /** + * 未税单价 + */ + @ExcelProperty(value = "未税单价") + private BigDecimal beforePrice; + + /** + * 税率 + */ + @ExcelProperty(value = "税率") + private BigDecimal taxRate; + + /** + * 含税单价 + */ + @ExcelProperty(value = "含税单价") + private BigDecimal includingPrice; + + /** + * 小计 + */ + @ExcelProperty(value = "小计") + private BigDecimal subtotal; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java new file mode 100644 index 00000000..25d597be --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java @@ -0,0 +1,37 @@ +package org.dromara.oa.erp.mapper; + +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.oa.erp.domain.ErpContractInfo; +import org.dromara.oa.erp.domain.vo.ErpContractInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 合同信息Mapper接口 + * + * @author Yinq + * @date 2025-10-11 + */ +public interface ErpContractInfoMapper extends BaseMapperPlus { + + /** + * 查询合同信息列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 合同信息集合 + */ + public Page selectCustomErpContractInfoVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询合同信息列表 + * + * @param queryWrapper 条件 + * @return 合同信息集合 + */ + public List selectCustomErpContractInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractMaterielMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractMaterielMapper.java new file mode 100644 index 00000000..717c52f4 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractMaterielMapper.java @@ -0,0 +1,37 @@ +package org.dromara.oa.erp.mapper; + +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.oa.erp.domain.ErpContractMateriel; +import org.dromara.oa.erp.domain.vo.ErpContractMaterielVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 合同物料信息Mapper接口 + * + * @author Yinq + * @date 2025-10-11 + */ +public interface ErpContractMaterielMapper extends BaseMapperPlus { + + /** + * 查询合同物料信息列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 合同物料信息集合 + */ + public Page selectCustomErpContractMaterielVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询合同物料信息列表 + * + * @param queryWrapper 条件 + * @return 合同物料信息集合 + */ + public List selectCustomErpContractMaterielVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java new file mode 100644 index 00000000..1fe7fa2f --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java @@ -0,0 +1,69 @@ +package org.dromara.oa.erp.service; + +import org.dromara.oa.erp.domain.ErpContractInfo; +import org.dromara.oa.erp.domain.vo.ErpContractInfoVo; +import org.dromara.oa.erp.domain.bo.ErpContractInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 合同信息Service接口 + * + * @author Yinq + * @date 2025-10-11 + */ +public interface IErpContractInfoService { + + /** + * 查询合同信息 + * + * @param contractId 主键 + * @return 合同信息 + */ + ErpContractInfoVo queryById(Long contractId); + + /** + * 分页查询合同信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同信息分页列表 + */ + TableDataInfo queryPageList(ErpContractInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的合同信息列表 + * + * @param bo 查询条件 + * @return 合同信息列表 + */ + List queryList(ErpContractInfoBo bo); + + /** + * 新增合同信息 + * + * @param bo 合同信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ErpContractInfoBo bo); + + /** + * 修改合同信息 + * + * @param bo 合同信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ErpContractInfoBo bo); + + /** + * 校验并批量删除合同信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractMaterielService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractMaterielService.java new file mode 100644 index 00000000..1b1d02c2 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractMaterielService.java @@ -0,0 +1,69 @@ +package org.dromara.oa.erp.service; + +import org.dromara.oa.erp.domain.ErpContractMateriel; +import org.dromara.oa.erp.domain.vo.ErpContractMaterielVo; +import org.dromara.oa.erp.domain.bo.ErpContractMaterielBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 合同物料信息Service接口 + * + * @author Yinq + * @date 2025-10-11 + */ +public interface IErpContractMaterielService { + + /** + * 查询合同物料信息 + * + * @param contractMaterielId 主键 + * @return 合同物料信息 + */ + ErpContractMaterielVo queryById(Long contractMaterielId); + + /** + * 分页查询合同物料信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同物料信息分页列表 + */ + TableDataInfo queryPageList(ErpContractMaterielBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的合同物料信息列表 + * + * @param bo 查询条件 + * @return 合同物料信息列表 + */ + List queryList(ErpContractMaterielBo bo); + + /** + * 新增合同物料信息 + * + * @param bo 合同物料信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ErpContractMaterielBo bo); + + /** + * 修改合同物料信息 + * + * @param bo 合同物料信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ErpContractMaterielBo bo); + + /** + * 校验并批量删除合同物料信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java new file mode 100644 index 00000000..71342d28 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java @@ -0,0 +1,154 @@ +package org.dromara.oa.erp.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; + import org.dromara.common.mybatis.core.page.TableDataInfo; + import org.dromara.common.mybatis.core.page.PageQuery; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.oa.erp.domain.bo.ErpContractInfoBo; +import org.dromara.oa.erp.domain.vo.ErpContractInfoVo; +import org.dromara.oa.erp.domain.ErpContractInfo; +import org.dromara.oa.erp.mapper.ErpContractInfoMapper; +import org.dromara.oa.erp.service.IErpContractInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 合同信息Service业务层处理 + * + * @author Yinq + * @date 2025-10-11 + */ +@RequiredArgsConstructor +@Service +public class ErpContractInfoServiceImpl implements IErpContractInfoService { + + private final ErpContractInfoMapper baseMapper; + + /** + * 查询合同信息 + * + * @param contractId 主键 + * @return 合同信息 + */ + @Override + public ErpContractInfoVo queryById(Long contractId){ + return baseMapper.selectVoById(contractId); + } + + /** + * 分页查询合同信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ErpContractInfoBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的合同信息列表 + * + * @param bo 查询条件 + * @return 合同信息列表 + */ + @Override + public List queryList(ErpContractInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ErpContractInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractInfo.class) + .selectAll(ErpContractInfo.class) + .eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpContractInfo::getContractFlag, bo.getContractFlag()) + .eq(StringUtils.isNotBlank(bo.getContractCode()), ErpContractInfo::getContractCode, bo.getContractCode()) + .like(StringUtils.isNotBlank(bo.getContractName()), ErpContractInfo::getContractName, bo.getContractName()) + .eq(StringUtils.isNotBlank(bo.getContractCategory()), ErpContractInfo::getContractCategory, bo.getContractCategory()) + .eq(StringUtils.isNotBlank(bo.getContractType()), ErpContractInfo::getContractType, bo.getContractType()) + .eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpContractInfo::getBusinessDirection, bo.getBusinessDirection()) + .eq(bo.getContractDeptId() != null, ErpContractInfo::getContractDeptId, bo.getContractDeptId()) + .eq(bo.getContractDate() != null, ErpContractInfo::getContractDate, bo.getContractDate()) + .eq(bo.getTotalPrice() != null, ErpContractInfo::getTotalPrice, bo.getTotalPrice()) + .eq(bo.getACustomerId() != null, ErpContractInfo::getACustomerId, bo.getACustomerId()) + .eq(StringUtils.isNotBlank(bo.getARepresent()), ErpContractInfo::getARepresent, bo.getARepresent()) + .eq(bo.getADate() != null, ErpContractInfo::getADate, bo.getADate()) + .eq(bo.getBCustomerId() != null, ErpContractInfo::getBCustomerId, bo.getBCustomerId()) + .eq(StringUtils.isNotBlank(bo.getBRepresent()), ErpContractInfo::getBRepresent, bo.getBRepresent()) + .eq(bo.getBDate() != null, ErpContractInfo::getBDate, bo.getBDate()) + .eq(StringUtils.isNotBlank(bo.getContractStatus()), ErpContractInfo::getContractStatus, bo.getContractStatus()) + .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpContractInfo::getFlowStatus, bo.getFlowStatus()) + .eq(bo.getTemplateId() != null, ErpContractInfo::getTemplateId, bo.getTemplateId()) + .eq(StringUtils.isNotBlank(bo.getOssId()), ErpContractInfo::getOssId, bo.getOssId()) + .eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpContractInfo::getPaymentMethod, bo.getPaymentMethod()) + .eq(bo.getSignatureAppendix() != null, ErpContractInfo::getSignatureAppendix, bo.getSignatureAppendix()) + .eq(bo.getTaxRate() != null, ErpContractInfo::getTaxRate, bo.getTaxRate()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractInfo::getActiveFlag, bo.getActiveFlag()) +; + return lqw; + } + + /** + * 新增合同信息 + * + * @param bo 合同信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ErpContractInfoBo bo) { + ErpContractInfo add = MapstructUtils.convert(bo, ErpContractInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setContractId(add.getContractId()); + } + return flag; + } + + /** + * 修改合同信息 + * + * @param bo 合同信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ErpContractInfoBo bo) { + ErpContractInfo update = MapstructUtils.convert(bo, ErpContractInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ErpContractInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除合同信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterielServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterielServiceImpl.java new file mode 100644 index 00000000..d7e86035 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterielServiceImpl.java @@ -0,0 +1,143 @@ +package org.dromara.oa.erp.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; + import org.dromara.common.mybatis.core.page.TableDataInfo; + import org.dromara.common.mybatis.core.page.PageQuery; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.oa.erp.domain.bo.ErpContractMaterielBo; +import org.dromara.oa.erp.domain.vo.ErpContractMaterielVo; +import org.dromara.oa.erp.domain.ErpContractMateriel; +import org.dromara.oa.erp.mapper.ErpContractMaterielMapper; +import org.dromara.oa.erp.service.IErpContractMaterielService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 合同物料信息Service业务层处理 + * + * @author Yinq + * @date 2025-10-11 + */ +@RequiredArgsConstructor +@Service +public class ErpContractMaterielServiceImpl implements IErpContractMaterielService { + + private final ErpContractMaterielMapper baseMapper; + + /** + * 查询合同物料信息 + * + * @param contractMaterielId 主键 + * @return 合同物料信息 + */ + @Override + public ErpContractMaterielVo queryById(Long contractMaterielId){ + return baseMapper.selectVoById(contractMaterielId); + } + + /** + * 分页查询合同物料信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 合同物料信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ErpContractMaterielBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的合同物料信息列表 + * + * @param bo 查询条件 + * @return 合同物料信息列表 + */ + @Override + public List queryList(ErpContractMaterielBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ErpContractMaterielBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractMateriel.class) + .selectAll(ErpContractMateriel.class) + .eq(bo.getContractId() != null, ErpContractMateriel::getContractId, bo.getContractId()) + .like(StringUtils.isNotBlank(bo.getProductName()), ErpContractMateriel::getProductName, bo.getProductName()) + .eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpContractMateriel::getSpecificationDescription, bo.getSpecificationDescription()) + .eq(bo.getMaterielId() != null, ErpContractMateriel::getMaterielId, bo.getMaterielId()) + .eq(bo.getRelationMaterielId() != null, ErpContractMateriel::getRelationMaterielId, bo.getRelationMaterielId()) + .eq(bo.getAmount() != null, ErpContractMateriel::getAmount, bo.getAmount()) + .eq(bo.getUnitId() != null, ErpContractMateriel::getUnitId, bo.getUnitId()) + .eq(bo.getBeforePrice() != null, ErpContractMateriel::getBeforePrice, bo.getBeforePrice()) + .eq(bo.getTaxRate() != null, ErpContractMateriel::getTaxRate, bo.getTaxRate()) + .eq(bo.getIncludingPrice() != null, ErpContractMateriel::getIncludingPrice, bo.getIncludingPrice()) + .eq(bo.getSubtotal() != null, ErpContractMateriel::getSubtotal, bo.getSubtotal()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractMateriel::getActiveFlag, bo.getActiveFlag()) +; + return lqw; + } + + /** + * 新增合同物料信息 + * + * @param bo 合同物料信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ErpContractMaterielBo bo) { + ErpContractMateriel add = MapstructUtils.convert(bo, ErpContractMateriel.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setContractMaterielId(add.getContractMaterielId()); + } + return flag; + } + + /** + * 修改合同物料信息 + * + * @param bo 合同物料信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ErpContractMaterielBo bo) { + ErpContractMateriel update = MapstructUtils.convert(bo, ErpContractMateriel.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ErpContractMateriel entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除合同物料信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml new file mode 100644 index 00000000..471cf6a2 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterielMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterielMapper.xml new file mode 100644 index 00000000..666bf93c --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterielMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + +