diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java index 38f2f4cc..4c13f1db 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseMaterialInfoBo.java @@ -50,7 +50,6 @@ public class BaseMaterialInfoBo extends BaseEntity { /** * 单位ID */ - @NotNull(message = "单位ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long unitId; /** diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectChangeController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectChangeController.java index bc271e1e..19341cc9 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectChangeController.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectChangeController.java @@ -136,4 +136,16 @@ public class ErpProjectChangeController extends BaseController { return toAjax(erpProjectChangeService.projectChangeSubmitAndFlowStart(bo)); } + /** + * 查询指定项目计划的所有变更记录 + * + * @param projectPlanId 项目计划ID + */ + @SaCheckPermission("oa/erp:erpProjectChange:query") + @GetMapping("/queryByProjectPlanId/{projectPlanId}") + public R> queryByProjectPlanId(@NotNull(message = "项目计划ID不能为空") + @PathVariable("projectPlanId") Long projectPlanId) { + return R.ok(erpProjectChangeService.queryByProjectPlanId(projectPlanId)); + } + } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectInfoController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectInfoController.java index fb53bbc4..be8e283c 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectInfoController.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectInfoController.java @@ -127,14 +127,4 @@ public class ErpProjectInfoController extends BaseController { List list = erpProjectInfoService.queryList(bo); return R.ok(list); } - - /** - * 根据部门id查询项目信息列表 - */ - @SaCheckPermission("oa/erp:projectInfo:listByDept") - @GetMapping("/listByDept") - public TableDataInfo listByDept(ErpProjectInfoBo bo, PageQuery pageQuery) { - bo.setDeptId(LoginHelper.getDeptId()); - return erpProjectInfoService.queryPageList(bo, pageQuery); - } } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseController.java new file mode 100644 index 00000000..f4a94024 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseController.java @@ -0,0 +1,127 @@ +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.ErpProjectPurchaseVo; +import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseBo; +import org.dromara.oa.erp.service.IErpProjectPurchaseService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 项目采购信息 + * 前端访问路由地址为:/oa/erp/projectPurchase + * + * @author Yinq + * @date 2025-11-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/erp/projectPurchase") +public class ErpProjectPurchaseController extends BaseController { + + private final IErpProjectPurchaseService erpProjectPurchaseService; + + /** + * 查询项目采购信息列表 + */ + @SaCheckPermission("oa/erp:projectPurchase:list") + @GetMapping("/list") + public TableDataInfo list(ErpProjectPurchaseBo bo, PageQuery pageQuery) { + return erpProjectPurchaseService.queryPageList(bo, pageQuery); + } + + /** + * 导出项目采购信息列表 + */ + @SaCheckPermission("oa/erp:projectPurchase:export") + @Log(title = "项目采购信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ErpProjectPurchaseBo bo, HttpServletResponse response) { + List list = erpProjectPurchaseService.queryList(bo); + ExcelUtil.exportExcel(list, "项目采购信息", ErpProjectPurchaseVo.class, response); + } + + /** + * 获取项目采购信息详细信息 + * + * @param projectPurchaseId 主键 + */ + @SaCheckPermission("oa/erp:projectPurchase:query") + @GetMapping("/{projectPurchaseId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("projectPurchaseId") Long projectPurchaseId) { + return R.ok(erpProjectPurchaseService.queryById(projectPurchaseId)); + } + + /** + * 新增项目采购信息 + */ + @SaCheckPermission("oa/erp:projectPurchase:add") + @Log(title = "项目采购信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ErpProjectPurchaseBo bo) { + return toAjax(erpProjectPurchaseService.insertByBo(bo)); + } + + /** + * 提交项目采购信息并提交流程 + */ + @SaCheckPermission("oa/erp:projectPurchase:add") + @Log(title = "项目采购信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/submitAndFlowStart") + public R submitAndFlowStart(@Validated(AddGroup.class) @RequestBody ErpProjectPurchaseBo bo) { + return R.ok(erpProjectPurchaseService.projectPurchaseSubmitAndFlowStart(bo)); + } + + /** + * 修改项目采购信息 + */ + @SaCheckPermission("oa/erp:projectPurchase:edit") + @Log(title = "项目采购信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ErpProjectPurchaseBo bo) { + return toAjax(erpProjectPurchaseService.updateByBo(bo)); + } + + /** + * 删除项目采购信息 + * + * @param projectPurchaseIds 主键串 + */ + @SaCheckPermission("oa/erp:projectPurchase:remove") + @Log(title = "项目采购信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{projectPurchaseIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("projectPurchaseIds") Long[] projectPurchaseIds) { + return toAjax(erpProjectPurchaseService.deleteWithValidByIds(List.of(projectPurchaseIds), true)); + } + + /** + * 下拉框查询项目采购信息列表 + */ + @GetMapping("/getErpProjectPurchaseList") + public R> getErpProjectPurchaseList(ErpProjectPurchaseBo bo) { + List list = erpProjectPurchaseService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseMaterialController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseMaterialController.java new file mode 100644 index 00000000..796d1cde --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpProjectPurchaseMaterialController.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.ErpProjectPurchaseMaterialVo; +import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseMaterialBo; +import org.dromara.oa.erp.service.IErpProjectPurchaseMaterialService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 项目采购物料 + * 前端访问路由地址为:/oa/erp/projectPurchaseMaterial + * + * @author Yinq + * @date 2025-11-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/erp/projectPurchaseMaterial") +public class ErpProjectPurchaseMaterialController extends BaseController { + + private final IErpProjectPurchaseMaterialService erpProjectPurchaseMaterialService; + + /** + * 查询项目采购物料列表 + */ + @SaCheckPermission("oa/erp:projectPurchaseMaterial:list") + @GetMapping("/list") + public TableDataInfo list(ErpProjectPurchaseMaterialBo bo, PageQuery pageQuery) { + return erpProjectPurchaseMaterialService.queryPageList(bo, pageQuery); + } + + /** + * 导出项目采购物料列表 + */ + @SaCheckPermission("oa/erp:projectPurchaseMaterial:export") + @Log(title = "项目采购物料", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ErpProjectPurchaseMaterialBo bo, HttpServletResponse response) { + List list = erpProjectPurchaseMaterialService.queryList(bo); + ExcelUtil.exportExcel(list, "项目采购物料", ErpProjectPurchaseMaterialVo.class, response); + } + + /** + * 获取项目采购物料详细信息 + * + * @param purchaseMaterialId 主键 + */ + @SaCheckPermission("oa/erp:projectPurchaseMaterial:query") + @GetMapping("/{purchaseMaterialId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("purchaseMaterialId") Long purchaseMaterialId) { + return R.ok(erpProjectPurchaseMaterialService.queryById(purchaseMaterialId)); + } + + /** + * 新增项目采购物料 + */ + @SaCheckPermission("oa/erp:projectPurchaseMaterial:add") + @Log(title = "项目采购物料", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ErpProjectPurchaseMaterialBo bo) { + return toAjax(erpProjectPurchaseMaterialService.insertByBo(bo)); + } + + /** + * 修改项目采购物料 + */ + @SaCheckPermission("oa/erp:projectPurchaseMaterial:edit") + @Log(title = "项目采购物料", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ErpProjectPurchaseMaterialBo bo) { + return toAjax(erpProjectPurchaseMaterialService.updateByBo(bo)); + } + + /** + * 删除项目采购物料 + * + * @param purchaseMaterialIds 主键串 + */ + @SaCheckPermission("oa/erp:projectPurchaseMaterial:remove") + @Log(title = "项目采购物料", businessType = BusinessType.DELETE) + @DeleteMapping("/{purchaseMaterialIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("purchaseMaterialIds") Long[] purchaseMaterialIds) { + return toAjax(erpProjectPurchaseMaterialService.deleteWithValidByIds(List.of(purchaseMaterialIds), true)); + } + + /** + * 下拉框查询项目采购物料列表 + */ + @GetMapping("/getErpProjectPurchaseMaterialList") + public R> getErpProjectPurchaseMaterialList(ErpProjectPurchaseMaterialBo bo) { + List list = erpProjectPurchaseMaterialService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMaterial.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMaterial.java index a01b0f79..5bfc7dbf 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMaterial.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractMaterial.java @@ -29,9 +29,9 @@ public class ErpContractMaterial extends TenantEntity { private Long contractMaterialId; /** - * 计划标识（1计划内 2计划外） + * 标准物料标识（1标准物料 2非标物料） */ - private String planFlag; + private String materialFlag; /** * 合同ID diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPurchase.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPurchase.java new file mode 100644 index 00000000..ed9daa0e --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPurchase.java @@ -0,0 +1,123 @@ +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.io.Serial; + +/** + * 项目采购信息对象 erp_project_purchase + * + * @author Yinq + * @date 2025-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("erp_project_purchase") +public class ErpProjectPurchase extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 项目采购ID + */ + @TableId(value = "project_purchase_id", type = IdType.AUTO) + private Long projectPurchaseId; + + /** + * 项目ID + */ + private Long projectId; + + /** + * 项目号 + */ + private String projectCode; + + /** + * 项目经理 + */ + private Long managerId; + + /** + * 部门负责人 + */ + private Long chargeId; + + /** + * 分管副总 + */ + private Long deputyId; + + /** + * 版本 + */ + @Version + private Long version; + + /** + * 提报人 + */ + private Long reporterId; + + /** + * 收货人 + */ + private String consigneeUser; + + /** + * 收货地址 + */ + private String consigneeAddress; + + /** + * 收货人联系方式 + */ + private String consigneeContact; + + /** + * 项目采购状态(1暂存 2审批中 3审批完成 4作废 5已发货 6已收货 7已完成) + */ + private String projectPurchaseStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 排序号 + */ + private Long sortOrder; + + /** + * 合同/预算ID + */ + private Long relationId; + + /** + * 备注 + */ + private String remark; + + /** + * 是否备件类（1是 0否） + */ + private String spareFlag; + + /** + * 激活标识（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/ErpProjectPurchaseMaterial.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPurchaseMaterial.java new file mode 100644 index 00000000..ca5bc9de --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPurchaseMaterial.java @@ -0,0 +1,125 @@ +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_project_purchase_material + * + * @author Yinq + * @date 2025-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("erp_project_purchase_material") +public class ErpProjectPurchaseMaterial extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 项目采购ID + */ + @TableId(value = "purchase_material_id", type = IdType.AUTO) + private Long purchaseMaterialId; + + /** + * 项目采购ID + */ + private Long projectPurchaseId; + + /** + * 关联明细ID + */ + private Long relationDetailsId; + + /** + * 是否备件类（1是 0否） + */ + private String spareFlag; + + /** + * 计划标识（1计划内 2计划外） + */ + private String purchasePlanFlag; + + /** + * 标准物料标识（1标准物料 2非标物料） + */ + private String materialFlag; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 销售物料ID + */ + private Long relationMaterialId; + + /** + * 采购物料编码 + */ + private String materialCode; + + /** + * 采购物料名称 + */ + private String materialName; + + /** + * 详细参数 + */ + private String specificationDescription; + + /** + * 单位ID + */ + private Long unitId; + + /** + * 需采购总数量 + */ + private BigDecimal needPurchaseAmount; + + /** + * 本次采购数量 + */ + private BigDecimal purchaseAmount; + + /** + * 需求到货时间 + */ + private Date arrivalTime; + + /** + * 序号 + */ + private Long serialNumber; + + /** + * 备注 + */ + 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/ErpContractMaterialBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractMaterialBo.java index 6ec6d213..4f7f948e 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractMaterialBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractMaterialBo.java @@ -28,9 +28,9 @@ public class ErpContractMaterialBo extends BaseEntity { private Long contractMaterialId; /** - * 计划标识（1计划内 2计划外） + * 标准物料标识（1标准物料 2非标物料） */ - private String planFlag; + private String materialFlag; /** * 合同ID diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPurchaseBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPurchaseBo.java new file mode 100644 index 00000000..ae2f6b60 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPurchaseBo.java @@ -0,0 +1,130 @@ +package org.dromara.oa.erp.domain.bo; + +import org.dromara.oa.erp.domain.ErpProjectPurchase; +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 org.dromara.workflow.api.domain.RemoteFlowInstanceBizExt; + +import java.util.Map; + +/** + * 项目采购信息业务对象 erp_project_purchase + * + * @author Yinq + * @date 2025-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ErpProjectPurchase.class, reverseConvertGenerate = false) +public class ErpProjectPurchaseBo extends BaseEntity { + + /** + * 项目采购ID + */ + private Long projectPurchaseId; + + /** + * 项目ID + */ + private Long projectId; + + /** + * 项目号 + */ + @NotBlank(message = "项目号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectCode; + + /** + * 项目经理 + */ + private Long managerId; + + /** + * 部门负责人 + */ + private Long chargeId; + + /** + * 分管副总 + */ + private Long deputyId; + + /** + * 提报人 + */ + private Long reporterId; + + /** + * 收货人 + */ + @NotBlank(message = "收货人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String consigneeUser; + + /** + * 收货地址 + */ + @NotBlank(message = "收货地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String consigneeAddress; + + /** + * 收货人联系方式 + */ + private String consigneeContact; + + /** + * 项目采购状态(1暂存 2审批中 3审批完成 4作废 5已发货 6已收货 7已完成) + */ + private String projectPurchaseStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 排序号 + */ + private Long sortOrder; + + /** + * 合同/预算ID + */ + private Long relationId; + + /** + * 备注 + */ + private String remark; + + /** + * 是否备件类（1是 0否） + */ + private String spareFlag; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 流程变量 + */ + private Map variables; + + /** + * 流程业务扩展信息 + */ + private RemoteFlowInstanceBizExt bizExt; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPurchaseMaterialBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPurchaseMaterialBo.java new file mode 100644 index 00000000..c5496018 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPurchaseMaterialBo.java @@ -0,0 +1,119 @@ +package org.dromara.oa.erp.domain.bo; + +import org.dromara.oa.erp.domain.ErpProjectPurchaseMaterial; +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_project_purchase_material + * + * @author Yinq + * @date 2025-11-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ErpProjectPurchaseMaterial.class, reverseConvertGenerate = false) +public class ErpProjectPurchaseMaterialBo extends BaseEntity { + + /** + * 项目采购ID + */ + private Long purchaseMaterialId; + + /** + * 项目采购ID + */ + private Long projectPurchaseId; + + /** + * 关联明细ID + */ + private Long relationDetailsId; + + /** + * 是否备件类（1是 0否） + */ + private String spareFlag; + + /** + * 计划标识（1计划内 2计划外） + */ + private String purchasePlanFlag; + + /** + * 标准物料标识（1标准物料 2非标物料） + */ + @NotBlank(message = "标准物料标识（1标准物料 2非标物料）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialFlag; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 销售物料ID + */ + private Long relationMaterialId; + + /** + * 采购物料编码 + */ + private String materialCode; + + /** + * 采购物料名称 + */ + @NotBlank(message = "采购物料名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialName; + + /** + * 详细参数 + */ + private String specificationDescription; + + /** + * 单位ID + */ + private Long unitId; + + /** + * 需采购总数量 + */ + private BigDecimal needPurchaseAmount; + + /** + * 本次采购数量 + */ + private BigDecimal purchaseAmount; + + /** + * 需求到货时间 + */ + private Date arrivalTime; + + /** + * 序号 + */ + private Long serialNumber; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java index 92e3d3cc..477ccce9 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractMaterialVo.java @@ -36,11 +36,11 @@ public class ErpContractMaterialVo implements Serializable { private Long contractMaterialId; /** - * 计划标识（1计划内 2计划外） + * 标准物料标识（1标准物料 2非标物料） */ - @ExcelProperty(value = "计划标识", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "plan_flag") - private String planFlag; + @ExcelProperty(value = "标准物料标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "material_flag") + private String materialFlag; /** * 合同ID diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseMaterialVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseMaterialVo.java new file mode 100644 index 00000000..0a802768 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseMaterialVo.java @@ -0,0 +1,147 @@ +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.ErpProjectPurchaseMaterial; +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_project_purchase_material + * + * @author Yinq + * @date 2025-11-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ErpProjectPurchaseMaterial.class) +public class ErpProjectPurchaseMaterialVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 项目采购ID + */ + @ExcelProperty(value = "项目采购ID") + private Long purchaseMaterialId; + + /** + * 项目采购ID + */ + @ExcelProperty(value = "项目采购ID") + private Long projectPurchaseId; + + /** + * 关联明细ID + */ + @ExcelProperty(value = "关联明细ID") + private Long relationDetailsId; + + /** + * 是否备件类（1是 0否） + */ + @ExcelProperty(value = "是否备件类", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "spare_flag") + private String spareFlag; + + /** + * 计划标识（1计划内 2计划外） + */ + @ExcelProperty(value = "计划标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "purchase_plan_flag") + private String purchasePlanFlag; + + /** + * 标准物料标识（1标准物料 2非标物料） + */ + @ExcelProperty(value = "标准物料标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "material_flag") + private String materialFlag; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materialId; + + /** + * 销售物料ID + */ + @ExcelProperty(value = "销售物料ID") + private Long relationMaterialId; + + /** + * 采购物料编码 + */ + @ExcelProperty(value = "采购物料编码") + private String materialCode; + + /** + * 采购物料名称 + */ + @ExcelProperty(value = "采购物料名称") + private String materialName; + + /** + * 详细参数 + */ + @ExcelProperty(value = "详细参数") + private String specificationDescription; + + /** + * 单位ID + */ + @ExcelProperty(value = "单位ID") + private Long unitId; + + /** + * 需采购总数量 + */ + @ExcelProperty(value = "需采购总数量") + private BigDecimal needPurchaseAmount; + + /** + * 本次采购数量 + */ + @ExcelProperty(value = "本次采购数量") + private BigDecimal purchaseAmount; + + /** + * 需求到货时间 + */ + @ExcelProperty(value = "需求到货时间") + private Date arrivalTime; + + /** + * 序号 + */ + @ExcelProperty(value = "序号") + private Long serialNumber; + + /** + * 备注 + */ + @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/domain/vo/ErpProjectPurchaseVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseVo.java new file mode 100644 index 00000000..9e1058a2 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseVo.java @@ -0,0 +1,137 @@ +package org.dromara.oa.erp.domain.vo; + +import org.dromara.oa.erp.domain.ErpProjectPurchase; +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_project_purchase + * + * @author Yinq + * @date 2025-11-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ErpProjectPurchase.class) +public class ErpProjectPurchaseVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 项目采购ID + */ + @ExcelProperty(value = "项目采购ID") + private Long projectPurchaseId; + + /** + * 项目ID + */ + @ExcelProperty(value = "项目ID") + private Long projectId; + + /** + * 项目号 + */ + @ExcelProperty(value = "项目号") + private String projectCode; + + /** + * 项目经理 + */ + @ExcelProperty(value = "项目经理") + private Long managerId; + + /** + * 部门负责人 + */ + @ExcelProperty(value = "部门负责人") + private Long chargeId; + + /** + * 分管副总 + */ + @ExcelProperty(value = "分管副总") + private Long deputyId; + + /** + * 提报人 + */ + @ExcelProperty(value = "提报人") + private Long reporterId; + + /** + * 收货人 + */ + @ExcelProperty(value = "收货人") + private String consigneeUser; + + /** + * 收货地址 + */ + @ExcelProperty(value = "收货地址") + private String consigneeAddress; + + /** + * 收货人联系方式 + */ + @ExcelProperty(value = "收货人联系方式") + private String consigneeContact; + + /** + * 项目采购状态(1暂存 2审批中 3审批完成 4作废 5已发货 6已收货 7已完成) + */ + @ExcelProperty(value = "项目采购状态(1暂存 2审批中 3审批完成 4作废 5已发货 6已收货 7已完成)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "project_purchase_status") + private String projectPurchaseStatus; + + /** + * 流程状态 + */ + @ExcelProperty(value = "流程状态") + private String flowStatus; + + /** + * 排序号 + */ + @ExcelProperty(value = "排序号") + private Long sortOrder; + + /** + * 合同/预算ID + */ + @ExcelProperty(value = "合同/预算ID") + private Long relationId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 是否备件类（1是 0否） + */ + @ExcelProperty(value = "是否备件类", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "spare_flag") + private String spareFlag; + + /** + * 激活标识（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/domain/vo/ErpProjectReportVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportVo.java index f3a58af1..e449f6bd 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReportVo.java @@ -111,6 +111,34 @@ public class ErpProjectReportVo implements Serializable { */ @ExcelProperty(value = "项目编码") private String projectCode; + /** + * 项目类型名称 + */ + @ExcelProperty(value = "项目类型名称") + private String typeName; + /** + * 部门名称 + */ + @ExcelProperty(value = "部门名称") + private String deptName; + + /** + * 项目经理名称 + */ + @ExcelProperty(value = "项目经理名称") + private String managerName; + + /** + * 部门负责人名称 + */ + @ExcelProperty(value = "部门负责人名称") + private String chargeName; + + /** + * 分管副总名称 + */ + @ExcelProperty(value = "分管副总名称") + private String deputyName; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectPurchaseMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectPurchaseMapper.java new file mode 100644 index 00000000..8ecb8194 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectPurchaseMapper.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.ErpProjectPurchase; +import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 项目采购信息Mapper接口 + * + * @author Yinq + * @date 2025-11-13 + */ +public interface ErpProjectPurchaseMapper extends BaseMapperPlus { + + /** + * 查询项目采购信息列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 项目采购信息集合 + */ + public Page selectCustomErpProjectPurchaseVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询项目采购信息列表 + * + * @param queryWrapper 条件 + * @return 项目采购信息集合 + */ + public List selectCustomErpProjectPurchaseVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectPurchaseMaterialMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectPurchaseMaterialMapper.java new file mode 100644 index 00000000..7c2cfc65 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectPurchaseMaterialMapper.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.ErpProjectPurchaseMaterial; +import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseMaterialVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 项目采购物料Mapper接口 + * + * @author Yinq + * @date 2025-11-13 + */ +public interface ErpProjectPurchaseMaterialMapper extends BaseMapperPlus { + + /** + * 查询项目采购物料列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 项目采购物料集合 + */ + public Page selectCustomErpProjectPurchaseMaterialVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询项目采购物料列表 + * + * @param queryWrapper 条件 + * @return 项目采购物料集合 + */ + public List selectCustomErpProjectPurchaseMaterialVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectReportMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectReportMapper.java index 55858d8b..7cde812d 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectReportMapper.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpProjectReportMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.oa.erp.domain.ErpProjectReport; import org.dromara.oa.erp.domain.vo.ErpProjectReportVo; @@ -25,6 +27,10 @@ public interface ErpProjectReportMapper extends BaseMapperPlus selectCustomErpProjectReportVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); /** @@ -33,6 +39,10 @@ public interface ErpProjectReportMapper extends BaseMapperPlus selectCustomErpProjectReportVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectChangeService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectChangeService.java index d51736a7..98850d9c 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectChangeService.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectChangeService.java @@ -81,5 +81,13 @@ public interface IErpProjectChangeService { * @param bo 项目变更申请 * @return 是否成功 */ - ErpProjectChangeVo projectChangeSubmitAndFlowStart(ErpProjectChangeBo bo); + Boolean projectChangeSubmitAndFlowStart(ErpProjectChangeBo bo); + + /** + * 查询指定项目计划的所有变更记录 + * + * @param projectPlanId 项目计划 ID + * @return 变更记录列表 + */ + List queryByProjectPlanId(Long projectPlanId); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectPurchaseMaterialService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectPurchaseMaterialService.java new file mode 100644 index 00000000..682e6faf --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectPurchaseMaterialService.java @@ -0,0 +1,69 @@ +package org.dromara.oa.erp.service; + +import org.dromara.oa.erp.domain.ErpProjectPurchaseMaterial; +import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseMaterialVo; +import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseMaterialBo; +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-11-13 + */ +public interface IErpProjectPurchaseMaterialService { + + /** + * 查询项目采购物料 + * + * @param purchaseMaterialId 主键 + * @return 项目采购物料 + */ + ErpProjectPurchaseMaterialVo queryById(Long purchaseMaterialId); + + /** + * 分页查询项目采购物料列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 项目采购物料分页列表 + */ + TableDataInfo queryPageList(ErpProjectPurchaseMaterialBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的项目采购物料列表 + * + * @param bo 查询条件 + * @return 项目采购物料列表 + */ + List queryList(ErpProjectPurchaseMaterialBo bo); + + /** + * 新增项目采购物料 + * + * @param bo 项目采购物料 + * @return 是否新增成功 + */ + Boolean insertByBo(ErpProjectPurchaseMaterialBo bo); + + /** + * 修改项目采购物料 + * + * @param bo 项目采购物料 + * @return 是否修改成功 + */ + Boolean updateByBo(ErpProjectPurchaseMaterialBo 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/IErpProjectPurchaseService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectPurchaseService.java new file mode 100644 index 00000000..4e58cf47 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpProjectPurchaseService.java @@ -0,0 +1,77 @@ +package org.dromara.oa.erp.service; + +import org.dromara.oa.erp.domain.ErpProjectPurchase; +import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseVo; +import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseBo; +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-11-13 + */ +public interface IErpProjectPurchaseService { + + /** + * 查询项目采购信息 + * + * @param projectPurchaseId 主键 + * @return 项目采购信息 + */ + ErpProjectPurchaseVo queryById(Long projectPurchaseId); + + /** + * 分页查询项目采购信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 项目采购信息分页列表 + */ + TableDataInfo queryPageList(ErpProjectPurchaseBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的项目采购信息列表 + * + * @param bo 查询条件 + * @return 项目采购信息列表 + */ + List queryList(ErpProjectPurchaseBo bo); + + /** + * 新增项目采购信息 + * + * @param bo 项目采购信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ErpProjectPurchaseBo bo); + + /** + * 提交项目采购并发起流程 + * + * @param bo 项目采购信息 + * @return 项目采购信息 + */ + ErpProjectPurchaseVo projectPurchaseSubmitAndFlowStart(ErpProjectPurchaseBo bo); + + /** + * 修改项目采购信息 + * + * @param bo 项目采购信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ErpProjectPurchaseBo 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/ErpContractMaterialServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterialServiceImpl.java index 7af08b78..9a6e88ba 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterialServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractMaterialServiceImpl.java @@ -73,7 +73,7 @@ public class ErpContractMaterialServiceImpl implements IErpContractMaterialServi Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractMaterial.class) .selectAll(ErpContractMaterial.class) - .eq(StringUtils.isNotBlank(bo.getPlanFlag()), ErpContractMaterial::getPlanFlag, bo.getPlanFlag()) + .eq(StringUtils.isNotBlank(bo.getMaterialFlag()), ErpContractMaterial::getMaterialFlag, bo.getMaterialFlag()) .eq(bo.getContractId() != null, ErpContractMaterial::getContractId, bo.getContractId()) .like(StringUtils.isNotBlank(bo.getProductName()), ErpContractMaterial::getProductName, bo.getProductName()) .eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpContractMaterial::getSpecificationDescription, bo.getSpecificationDescription()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java index 26560545..b29a493b 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java @@ -189,6 +189,18 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { // 权限校验：只有项目经理才能提交 validateProjectManager(bo.getProjectManagerId()); + Long projectId = bo.getProjectId(); + ErpProjectInfo projectInfo = projectInfoMapper.selectById(projectId); + if (projectInfo == null) { + throw new ServiceException("项目不存在"); + } + // 验证项目状态 +/* + if (!OAStatusEnum.COMPLETED.getStatus().equals(projectInfo.getProjectStatus())) { + throw new ServiceException("项目未审批通过"); + } +*/ + ErpProjectChange add = MapstructUtils.convert(bo, ErpProjectChange.class); validEntityBeforeSave(add); @@ -558,6 +570,61 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { //TODO 做一些数据校验,如唯一约束 } + /** + * 查询指定项目计划的所有变更记录 + * 注意：ErpProjectChange 绑定的是 project_id 而非 project_plan_id + * 需要先通过项目计划查询出项目ID，再查询该项目的所有变更记录 + * + * @param projectPlanId 项目计划 ID + * @return 变更记录列表 + */ + @Override + public List queryByProjectPlanId(Long projectPlanId) { + if (projectPlanId == null) { + return new ArrayList<>(); + } + + // 第一步：通过项目计划ID查询项目计划信息，获取项目ID + ErpProjectPlan projectPlan = projectPlanMapper.selectById(projectPlanId); + if (projectPlan == null || projectPlan.getProjectId() == null) { + return new ArrayList<>(); + } + + Long projectId = projectPlan.getProjectId(); + + // 第二步：通过项目ID查询该项目的所有变更记录 + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ErpProjectChange.class) + .eq(ErpProjectChange::getProjectId, projectId) + .eq(ErpProjectChange::getDelFlag, "0") + .orderByDesc(ErpProjectChange::getCreateTime); + + List list = baseMapper.selectList(lqw); + + // 第三步：转换为VO并关联子表数据 + List voList = new ArrayList<>(); + for (ErpProjectChange entity : list) { + ErpProjectChangeVo vo = MapstructUtils.convert(entity, ErpProjectChangeVo.class); + + // 关联子表数据 + vo.setBudgetList(changeBudgetMapper.selectList( + Wrappers.lambdaQuery(ErpProjectChangeBudget.class) + .eq(ErpProjectChangeBudget::getProjectChangeId, entity.getProjectChangeId()) + .eq(ErpProjectChangeBudget::getDelFlag, "0") + )); + + vo.setProgressList(changeProgressMapper.selectList( + Wrappers.lambdaQuery(ErpProjectChangeProgress.class) + .eq(ErpProjectChangeProgress::getProjectChangeId, entity.getProjectChangeId()) + .eq(ErpProjectChangeProgress::getDelFlag, "0") + .orderByAsc(ErpProjectChangeProgress::getSortOrder) + )); + + voList.add(vo); + } + + return voList; + } + /** * 项目变更流程监听器 * diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseMaterialServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseMaterialServiceImpl.java new file mode 100644 index 00000000..427f8caa --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseMaterialServiceImpl.java @@ -0,0 +1,147 @@ +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.ErpProjectPurchaseMaterialBo; +import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseMaterialVo; +import org.dromara.oa.erp.domain.ErpProjectPurchaseMaterial; +import org.dromara.oa.erp.mapper.ErpProjectPurchaseMaterialMapper; +import org.dromara.oa.erp.service.IErpProjectPurchaseMaterialService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 项目采购物料Service业务层处理 + * + * @author Yinq + * @date 2025-11-13 + */ +@RequiredArgsConstructor +@Service +public class ErpProjectPurchaseMaterialServiceImpl implements IErpProjectPurchaseMaterialService { + + private final ErpProjectPurchaseMaterialMapper baseMapper; + + /** + * 查询项目采购物料 + * + * @param purchaseMaterialId 主键 + * @return 项目采购物料 + */ + @Override + public ErpProjectPurchaseMaterialVo queryById(Long purchaseMaterialId) { + return baseMapper.selectVoById(purchaseMaterialId); + } + + /** + * 分页查询项目采购物料列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 项目采购物料分页列表 + */ + @Override + public TableDataInfo queryPageList(ErpProjectPurchaseMaterialBo 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(ErpProjectPurchaseMaterialBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ErpProjectPurchaseMaterialBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectPurchaseMaterial.class) + .selectAll(ErpProjectPurchaseMaterial.class) + .eq(ErpProjectPurchaseMaterial::getDelFlag, "0") + .eq(bo.getProjectPurchaseId() != null, ErpProjectPurchaseMaterial::getProjectPurchaseId, bo.getProjectPurchaseId()) + .eq(bo.getRelationDetailsId() != null, ErpProjectPurchaseMaterial::getRelationDetailsId, bo.getRelationDetailsId()) + .eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectPurchaseMaterial::getSpareFlag, bo.getSpareFlag()) + .eq(StringUtils.isNotBlank(bo.getPurchasePlanFlag()), ErpProjectPurchaseMaterial::getPurchasePlanFlag, bo.getPurchasePlanFlag()) + .eq(StringUtils.isNotBlank(bo.getMaterialFlag()), ErpProjectPurchaseMaterial::getMaterialFlag, bo.getMaterialFlag()) + .eq(bo.getMaterialId() != null, ErpProjectPurchaseMaterial::getMaterialId, bo.getMaterialId()) + .eq(bo.getRelationMaterialId() != null, ErpProjectPurchaseMaterial::getRelationMaterialId, bo.getRelationMaterialId()) + .eq(StringUtils.isNotBlank(bo.getMaterialCode()), ErpProjectPurchaseMaterial::getMaterialCode, bo.getMaterialCode()) + .like(StringUtils.isNotBlank(bo.getMaterialName()), ErpProjectPurchaseMaterial::getMaterialName, bo.getMaterialName()) + .eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpProjectPurchaseMaterial::getSpecificationDescription, bo.getSpecificationDescription()) + .eq(bo.getUnitId() != null, ErpProjectPurchaseMaterial::getUnitId, bo.getUnitId()) + .eq(bo.getNeedPurchaseAmount() != null, ErpProjectPurchaseMaterial::getNeedPurchaseAmount, bo.getNeedPurchaseAmount()) + .eq(bo.getPurchaseAmount() != null, ErpProjectPurchaseMaterial::getPurchaseAmount, bo.getPurchaseAmount()) + .eq(bo.getArrivalTime() != null, ErpProjectPurchaseMaterial::getArrivalTime, bo.getArrivalTime()) + .eq(bo.getSerialNumber() != null, ErpProjectPurchaseMaterial::getSerialNumber, bo.getSerialNumber()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectPurchaseMaterial::getActiveFlag, bo.getActiveFlag()); + return lqw; + } + + /** + * 新增项目采购物料 + * + * @param bo 项目采购物料 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ErpProjectPurchaseMaterialBo bo) { + ErpProjectPurchaseMaterial add = MapstructUtils.convert(bo, ErpProjectPurchaseMaterial.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPurchaseMaterialId(add.getPurchaseMaterialId()); + } + return flag; + } + + /** + * 修改项目采购物料 + * + * @param bo 项目采购物料 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ErpProjectPurchaseMaterialBo bo) { + ErpProjectPurchaseMaterial update = MapstructUtils.convert(bo, ErpProjectPurchaseMaterial.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ErpProjectPurchaseMaterial 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/ErpProjectPurchaseServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java new file mode 100644 index 00000000..c03c1ee7 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java @@ -0,0 +1,237 @@ +package org.dromara.oa.erp.service.impl; + +import cn.hutool.core.convert.Convert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; +import org.apache.seata.spring.annotation.GlobalTransactional; +import org.dromara.common.core.enums.BusinessStatusEnum; +import org.dromara.common.core.enums.OAStatusEnum; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.oa.erp.domain.ErpProjectPurchase; +import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseBo; +import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseVo; +import org.dromara.oa.erp.mapper.ErpProjectPurchaseMapper; +import org.dromara.oa.erp.service.IErpProjectPurchaseService; +import org.dromara.workflow.api.RemoteWorkflowService; +import org.dromara.workflow.api.domain.RemoteFlowInstanceBizExt; +import org.dromara.workflow.api.domain.RemoteStartProcess; +import org.dromara.workflow.api.event.ProcessEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 项目采购信息Service业务层处理 + * + * @author Yinq + * @date 2025-11-13 + */ +@RequiredArgsConstructor +@Service +@Slf4j +public class ErpProjectPurchaseServiceImpl implements IErpProjectPurchaseService { + + private final ErpProjectPurchaseMapper baseMapper; + + @DubboReference(timeout = 30000) + private RemoteWorkflowService remoteWorkflowService; + + /** + * 查询项目采购信息 + * + * @param projectPurchaseId 主键 + * @return 项目采购信息 + */ + @Override + public ErpProjectPurchaseVo queryById(Long projectPurchaseId) { + return baseMapper.selectVoById(projectPurchaseId); + } + + /** + * 分页查询项目采购信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 项目采购信息分页列表 + */ + @Override + public TableDataInfo queryPageList(ErpProjectPurchaseBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectCustomErpProjectPurchaseVoList(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的项目采购信息列表 + * + * @param bo 查询条件 + * @return 项目采购信息列表 + */ + @Override + public List queryList(ErpProjectPurchaseBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCustomErpProjectPurchaseVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ErpProjectPurchaseBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpProjectPurchase.class) + .selectAll(ErpProjectPurchase.class) + .eq(ErpProjectPurchase::getDelFlag, "0") + .eq(bo.getProjectId() != null, ErpProjectPurchase::getProjectId, bo.getProjectId()) + .eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectPurchase::getProjectCode, bo.getProjectCode()) + .eq(bo.getManagerId() != null, ErpProjectPurchase::getManagerId, bo.getManagerId()) + .eq(bo.getChargeId() != null, ErpProjectPurchase::getChargeId, bo.getChargeId()) + .eq(bo.getDeputyId() != null, ErpProjectPurchase::getDeputyId, bo.getDeputyId()) + .eq(bo.getReporterId() != null, ErpProjectPurchase::getReporterId, bo.getReporterId()) + .eq(StringUtils.isNotBlank(bo.getConsigneeUser()), ErpProjectPurchase::getConsigneeUser, bo.getConsigneeUser()) + .eq(StringUtils.isNotBlank(bo.getConsigneeAddress()), ErpProjectPurchase::getConsigneeAddress, bo.getConsigneeAddress()) + .eq(StringUtils.isNotBlank(bo.getConsigneeContact()), ErpProjectPurchase::getConsigneeContact, bo.getConsigneeContact()) + .eq(StringUtils.isNotBlank(bo.getProjectPurchaseStatus()), ErpProjectPurchase::getProjectPurchaseStatus, bo.getProjectPurchaseStatus()) + .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpProjectPurchase::getFlowStatus, bo.getFlowStatus()) + .eq(bo.getSortOrder() != null, ErpProjectPurchase::getSortOrder, bo.getSortOrder()) + .eq(bo.getRelationId() != null, ErpProjectPurchase::getRelationId, bo.getRelationId()) + .eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectPurchase::getSpareFlag, bo.getSpareFlag()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectPurchase::getActiveFlag, bo.getActiveFlag()); + return lqw; + } + + /** + * 新增项目采购信息 + * + * @param bo 项目采购信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ErpProjectPurchaseBo bo) { + ErpProjectPurchase add = MapstructUtils.convert(bo, ErpProjectPurchase.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setProjectPurchaseId(add.getProjectPurchaseId()); + } + return flag; + } + + /** + * 提交项目采购并提交流程 + * + * @param bo 项目采购信息 + * @return 项目采购信息 + */ + @Override + @GlobalTransactional(rollbackFor = Exception.class) + public ErpProjectPurchaseVo projectPurchaseSubmitAndFlowStart(ErpProjectPurchaseBo bo) { + ErpProjectPurchase entity = MapstructUtils.convert(bo, ErpProjectPurchase.class); + validEntityBeforeSave(entity); + if (bo.getProjectPurchaseId() == null) { + this.insertByBo(bo); + } else { + this.updateByBo(bo); + } + if (bo.getVariables() == null) { + bo.setVariables(new HashMap<>()); + } + bo.getVariables().put("ignore", true); + if (StringUtils.isBlank(bo.getFlowCode())) { + throw new ServiceException("流程编码不能为空"); + } + RemoteFlowInstanceBizExt bizExt = bo.getBizExt(); + if (bizExt == null) { + bizExt = new RemoteFlowInstanceBizExt(); + bo.setBizExt(bizExt); + } + RemoteStartProcess startProcess = new RemoteStartProcess(); + startProcess.setBusinessId(String.valueOf(bo.getProjectPurchaseId())); + startProcess.setFlowCode(bo.getFlowCode()); + startProcess.setVariables(bo.getVariables()); + bizExt.setBusinessId(startProcess.getBusinessId()); + startProcess.setBizExt(bizExt); + boolean started = remoteWorkflowService.startCompleteTask(startProcess); + if (!started) { + throw new ServiceException("流程发起异常"); + } + // 更新状态为审批中 + ErpProjectPurchase updateStatus = new ErpProjectPurchase(); + updateStatus.setProjectPurchaseId(bo.getProjectPurchaseId()); + updateStatus.setFlowStatus(BusinessStatusEnum.WAITING.getStatus()); + updateStatus.setProjectPurchaseStatus("2"); + baseMapper.updateById(updateStatus); + return queryById(bo.getProjectPurchaseId()); + } + + /** + * 修改项目采购信息 + * + * @param bo 项目采购信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ErpProjectPurchaseBo bo) { + ErpProjectPurchase update = MapstructUtils.convert(bo, ErpProjectPurchase.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ErpProjectPurchase entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除项目采购信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 项目采购流程事件监听 + * + * @param processEvent 流程事件 + */ + @EventListener(condition = "#processEvent.flowCode =='xmcg'") + public void processHandler(ProcessEvent processEvent) { + TenantHelper.dynamic(processEvent.getTenantId(), () -> { + Long businessId = Convert.toLong(processEvent.getBusinessId()); + ErpProjectPurchase purchase = baseMapper.selectById(businessId); + purchase.setFlowStatus(processEvent.getStatus()); + if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.WAITING.getStatus())) { + purchase.setProjectPurchaseStatus(OAStatusEnum.APPROVING.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { + purchase.setProjectPurchaseStatus(OAStatusEnum.COMPLETED.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus()) + || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) { + purchase.setProjectPurchaseStatus(OAStatusEnum.INVALID.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus()) + || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.CANCEL.getStatus())) { + purchase.setProjectPurchaseStatus(OAStatusEnum.DRAFT.getStatus()); + } + baseMapper.updateById(purchase); + }); + } +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java index e896faee..10e74258 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReportServiceImpl.java @@ -52,7 +52,7 @@ public class ErpProjectReportServiceImpl implements IErpProjectReportService { @Override public TableDataInfo queryPageList(ErpProjectReportBo bo, PageQuery pageQuery) { MPJLambdaWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectCustomErpProjectReportVoList(pageQuery.build(), lqw); return TableDataInfo.build(result); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml index f0c66dbf..e487c54a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractMaterialMapper.xml @@ -9,7 +9,7 @@ + select project_purchase_id, + tenant_id, + project_id, + project_code, + manager_id, + charge_id, + deputy_id, + version, + reporter_id, + consignee_user, + consignee_address, + consignee_contact, + project_purchase_status, + flow_status, + sort_order, + relation_id, + remark, + spare_flag, + active_flag, + del_flag, + create_dept, + create_by, + create_time, + update_by, + update_time + from erp_project_purchase t + ${ew.getCustomSqlSegment} + + + diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMaterialMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMaterialMapper.xml new file mode 100644 index 00000000..5691509c --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMaterialMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml index 34b86e80..f31353d3 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReportMapper.xml @@ -7,7 +7,36 @@