yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.6 物料关联销售名称

Browse Source
dev
yinq 2 months ago
parent 470b5b8b4e
commit 2dffcab306
9 changed files with 182 additions and 131 deletions
Show Stats Download Patch File Download Diff File

70
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseRelationMaterielController.java → ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseRelationMaterialController.java
Unescape Escape View File

@ -17,99 +17,99 @@ import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType; import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.oa.base.domain.vo.BaseRelationMaterielVo; import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
import org.dromara.oa.base.domain.bo.BaseRelationMaterielBo; import org.dromara.oa.base.domain.bo.BaseRelationMaterialBo;
import org.dromara.oa.base.service.IBaseRelationMaterielService; import org.dromara.oa.base.service.IBaseRelationMaterialService;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
/** /**
* 关联销售物料信息 * 关联销售物料信息
* 前端访问路由地址为:/oa/base/relationMateriel * 前端访问路由地址为:/oa/base/relationMaterial
* *
* @author Yinq * @author Yinq
* @date 2025-09-28 * @date 2025-09-30
*/ */
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/base/relationMateriel") @RequestMapping("/base/relationMaterial")
public class BaseRelationMaterielController extends BaseController { public class BaseRelationMaterialController extends BaseController {
private final IBaseRelationMaterielService baseRelationMaterielService; private final IBaseRelationMaterialService baseRelationMaterialService;
/** /**
* 查询关联销售物料信息列表 * 查询关联销售物料信息列表
*/ */
@SaCheckPermission("oa/base:relationMateriel:list") @SaCheckPermission("oa/base:relationMaterial:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<BaseRelationMaterielVo> list(BaseRelationMaterielBo bo, PageQuery pageQuery) { public TableDataInfo<BaseRelationMaterialVo> list(BaseRelationMaterialBo bo, PageQuery pageQuery) {
return baseRelationMaterielService.queryPageList(bo, pageQuery); return baseRelationMaterialService.queryPageList(bo, pageQuery);
} }
/** /**
* 导出关联销售物料信息列表 * 导出关联销售物料信息列表
*/ */
@SaCheckPermission("oa/base:relationMateriel:export") @SaCheckPermission("oa/base:relationMaterial:export")
@Log(title = "关联销售物料信息", businessType = BusinessType.EXPORT) @Log(title = "关联销售物料信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(BaseRelationMaterielBo bo, HttpServletResponse response) { public void export(BaseRelationMaterialBo bo, HttpServletResponse response) {
List<BaseRelationMaterielVo> list = baseRelationMaterielService.queryList(bo); List<BaseRelationMaterialVo> list = baseRelationMaterialService.queryList(bo);
ExcelUtil.exportExcel(list, "关联销售物料信息", BaseRelationMaterielVo.class, response); ExcelUtil.exportExcel(list, "关联销售物料信息", BaseRelationMaterialVo.class, response);
} }
/** /**
* 获取关联销售物料信息详细信息 * 获取关联销售物料信息详细信息
* *
* @param relationMaterielId 主键 * @param relationMaterialId 主键
*/ */
@SaCheckPermission("oa/base:relationMateriel:query") @SaCheckPermission("oa/base:relationMaterial:query")
@GetMapping("/{relationMaterielId}") @GetMapping("/{relationMaterialId}")
public R<BaseRelationMaterielVo> getInfo(@NotNull(message = "主键不能为空") public R<BaseRelationMaterialVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("relationMaterielId") Long relationMaterielId) { @PathVariable("relationMaterialId") Long relationMaterialId) {
return R.ok(baseRelationMaterielService.queryById(relationMaterielId)); return R.ok(baseRelationMaterialService.queryById(relationMaterialId));
} }
/** /**
* 新增关联销售物料信息 * 新增关联销售物料信息
*/ */
@SaCheckPermission("oa/base:relationMateriel:add") @SaCheckPermission("oa/base:relationMaterial:add")
@Log(title = "关联销售物料信息", businessType = BusinessType.INSERT) @Log(title = "关联销售物料信息", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseRelationMaterielBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseRelationMaterialBo bo) {
return toAjax(baseRelationMaterielService.insertByBo(bo)); return toAjax(baseRelationMaterialService.insertByBo(bo));
} }
/** /**
* 修改关联销售物料信息 * 修改关联销售物料信息
*/ */
@SaCheckPermission("oa/base:relationMateriel:edit") @SaCheckPermission("oa/base:relationMaterial:edit")
@Log(title = "关联销售物料信息", businessType = BusinessType.UPDATE) @Log(title = "关联销售物料信息", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseRelationMaterielBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseRelationMaterialBo bo) {
return toAjax(baseRelationMaterielService.updateByBo(bo)); return toAjax(baseRelationMaterialService.updateByBo(bo));
} }
/** /**
* 删除关联销售物料信息 * 删除关联销售物料信息
* *
* @param relationMaterielIds 主键串 * @param relationMaterialIds 主键串
*/ */
@SaCheckPermission("oa/base:relationMateriel:remove") @SaCheckPermission("oa/base:relationMaterial:remove")
@Log(title = "关联销售物料信息", businessType = BusinessType.DELETE) @Log(title = "关联销售物料信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{relationMaterielIds}") @DeleteMapping("/{relationMaterialIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("relationMaterielIds") Long[] relationMaterielIds) { @PathVariable("relationMaterialIds") Long[] relationMaterialIds) {
return toAjax(baseRelationMaterielService.deleteWithValidByIds(List.of(relationMaterielIds), true)); return toAjax(baseRelationMaterialService.deleteWithValidByIds(List.of(relationMaterialIds), true));
} }
/** /**
* 下拉框查询关联销售物料信息列表 * 下拉框查询关联销售物料信息列表
*/ */
@GetMapping("/getBaseRelationMaterielList") @GetMapping("/getBaseRelationMaterialList")
public R<List<BaseRelationMaterielVo>> getBaseRelationMaterielList(BaseRelationMaterielBo bo) { public R<List<BaseRelationMaterialVo>> getBaseRelationMaterialList(BaseRelationMaterialBo bo) {
List<BaseRelationMaterielVo> list = baseRelationMaterielService.queryList(bo); List<BaseRelationMaterialVo> list = baseRelationMaterialService.queryList(bo);
return R.ok(list); return R.ok(list);
} }

20
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseRelationMateriel.java → ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseRelationMaterial.java
Unescape Escape View File

@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode;
import java.io.Serial; import java.io.Serial;
/** /**
* 关联销售物料信息对象 base_relation_materiel * 关联销售物料信息对象 base_relation_material
* *
* @author Yinq * @author Yinq
* @date 2025-09-28 * @date 2025-09-30
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("base_relation_materiel") @TableName("base_relation_material")
public class BaseRelationMateriel extends TenantEntity { public class BaseRelationMaterial extends TenantEntity {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -24,13 +24,13 @@ public class BaseRelationMateriel extends TenantEntity {
/** /**
* 关联物料ID * 关联物料ID
*/ */
@TableId(value = "relation_materiel_id", type = IdType.AUTO) @TableId(value = "relation_material_id", type = IdType.AUTO)
private Long relationMaterielId; private Long relationMaterialId;
/** /**
* 物料ID * 物料ID
*/ */
private Long materielId; private Long materialId;
/** /**
* 客户ID * 客户ID
@ -40,7 +40,7 @@ public class BaseRelationMateriel extends TenantEntity {
/** /**
* 销售物料名称 * 销售物料名称
*/ */
private String saleMaterielName; private String saleMaterialName;
/** /**
* 备注 * 备注
@ -62,13 +62,13 @@ public class BaseRelationMateriel extends TenantEntity {
* SAP物料编码 * SAP物料编码
*/ */
@TableField(exist = false) @TableField(exist = false)
private String materielCode; private String materialCode;
/** /**
* SAP物料名称 * SAP物料名称
*/ */
@TableField(exist = false) @TableField(exist = false)
private String materielName; private String materialName;
/** /**
* 客户名称 * 客户名称

14
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseRelationMaterielBo.java → ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseRelationMaterialBo.java
Unescape Escape View File

@ -1,7 +1,6 @@
package org.dromara.oa.base.domain.bo; package org.dromara.oa.base.domain.bo;
import com.baomidou.mybatisplus.annotation.TableField; import org.dromara.oa.base.domain.BaseRelationMaterial;
import org.dromara.oa.base.domain.BaseRelationMateriel;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
@ -11,15 +10,15 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
/** /**
* 关联销售物料信息业务对象 base_relation_materiel * 关联销售物料信息业务对象 base_relation_material
* *
* @author Yinq * @author Yinq
* @date 2025-09-28 * @date 2025-09-30
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@AutoMapper(target = BaseRelationMateriel.class, reverseConvertGenerate = false) @AutoMapper(target = BaseRelationMaterial.class, reverseConvertGenerate = false)
public class BaseRelationMaterielBo extends BaseEntity { public class BaseRelationMaterialBo extends BaseEntity {
/** /**
* 关联物料ID * 关联物料ID
@ -35,12 +34,13 @@ public class BaseRelationMaterielBo extends BaseEntity {
/** /**
* 客户ID * 客户ID
*/ */
@NotNull(message = "客户ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long customerId; private Long customerId;
/** /**
* 销售物料名称 * 销售物料名称
*/ */
private String saleMaterielName; private String saleMaterialName;
/** /**
* 备注 * 备注

71
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseRelationMaterielVo.java → ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseRelationMaterialVo.java
Unescape Escape View File

@ -1,6 +1,6 @@
package org.dromara.oa.base.domain.vo; package org.dromara.oa.base.domain.vo;
import org.dromara.oa.base.domain.BaseRelationMateriel; import org.dromara.oa.base.domain.BaseRelationMaterial;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
@ -15,15 +15,15 @@ import java.util.Date;
/** /**
* 关联销售物料信息视图对象 base_relation_materiel * 关联销售物料信息视图对象 base_relation_material
* *
* @author Yinq * @author Yinq
* @date 2025-09-28 * @date 2025-09-30
*/ */
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@AutoMapper(target = BaseRelationMateriel.class) @AutoMapper(target = BaseRelationMaterial.class)
public class BaseRelationMaterielVo implements Serializable { public class BaseRelationMaterialVo implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -32,25 +32,13 @@ public class BaseRelationMaterielVo implements Serializable {
* 关联物料ID * 关联物料ID
*/ */
@ExcelProperty(value = "关联物料ID") @ExcelProperty(value = "关联物料ID")
private Long relationMaterielId; private Long relationMaterialId;
/** /**
* 物料ID * 物料ID
*/ */
@ExcelProperty(value = "物料ID") @ExcelProperty(value = "物料ID")
private Long materielId; private Long materialId;
/**
* SAP物料编码
*/
@ExcelProperty(value = "SAP物料编码")
private String materielCode;
/**
* SAP物料名称
*/
@ExcelProperty(value = "SAP物料名称")
private String materielName;
/** /**
* 客户ID * 客户ID
@ -58,6 +46,18 @@ public class BaseRelationMaterielVo implements Serializable {
@ExcelProperty(value = "客户ID") @ExcelProperty(value = "客户ID")
private Long customerId; private Long customerId;
/**
* SAP物料编码
*/
@ExcelProperty(value = "SAP物料编码")
private String materialCode;
/**
* SAP物料名称
*/
@ExcelProperty(value = "SAP物料名称")
private String materialName;
/** /**
* 客户名称 * 客户名称
*/ */
@ -68,7 +68,7 @@ public class BaseRelationMaterielVo implements Serializable {
* 销售物料名称 * 销售物料名称
*/ */
@ExcelProperty(value = "销售物料名称") @ExcelProperty(value = "销售物料名称")
private String saleMaterielName; private String saleMaterialName;
/** /**
* 备注 * 备注
@ -83,4 +83,35 @@ public class BaseRelationMaterielVo implements Serializable {
@ExcelDictFormat(dictType = "active_flag") @ExcelDictFormat(dictType = "active_flag")
private String activeFlag; private String activeFlag;
/**
* 创建部门
*/
@ExcelProperty(value = "创建部门")
private Long createDept;
/**
* 创建人
*/
@ExcelProperty(value = "创建人")
private Long createBy;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
/**
* 更新人
*/
@ExcelProperty(value = "更新人")
private Long updateBy;
/**
* 更新时间
*/
@ExcelProperty(value = "更新时间")
private Date updateTime;
} }

12
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BaseRelationMaterielMapper.java → ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BaseRelationMaterialMapper.java
Unescape Escape View File

@ -5,17 +5,17 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.dromara.oa.base.domain.BaseRelationMateriel; import org.dromara.oa.base.domain.BaseRelationMaterial;
import org.dromara.oa.base.domain.vo.BaseRelationMaterielVo; import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/** /**
* 关联销售物料信息Mapper接口 * 关联销售物料信息Mapper接口
* *
* @author Yinq * @author Yinq
* @date 2025-09-28 * @date 2025-09-30
*/ */
public interface BaseRelationMaterielMapper extends BaseMapperPlus<BaseRelationMateriel, BaseRelationMaterielVo> { public interface BaseRelationMaterialMapper extends BaseMapperPlus<BaseRelationMaterial, BaseRelationMaterialVo> {
/** /**
* 查询关联销售物料信息列表 * 查询关联销售物料信息列表
@ -24,7 +24,7 @@ public interface BaseRelationMaterielMapper extends BaseMapperPlus<BaseRelationM
* @param queryWrapper 条件 * @param queryWrapper 条件
* @return 关联销售物料信息集合 * @return 关联销售物料信息集合
*/ */
public Page<BaseRelationMaterielVo> selectCustomBaseRelationMaterielVoList(@Param("page") Page<BaseRelationMaterielVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<BaseRelationMateriel> queryWrapper); public Page<BaseRelationMaterialVo> selectCustomBaseRelationMaterialVoList(@Param("page") Page<BaseRelationMaterialVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<BaseRelationMaterial> queryWrapper);
/** /**
* 查询关联销售物料信息列表 * 查询关联销售物料信息列表
@ -32,6 +32,6 @@ public interface BaseRelationMaterielMapper extends BaseMapperPlus<BaseRelationM
* @param queryWrapper 条件 * @param queryWrapper 条件
* @return 关联销售物料信息集合 * @return 关联销售物料信息集合
*/ */
public List<BaseRelationMaterielVo> selectCustomBaseRelationMaterielVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<BaseRelationMateriel> queryWrapper); public List<BaseRelationMaterialVo> selectCustomBaseRelationMaterialVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<BaseRelationMaterial> queryWrapper);
} }

22
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBaseRelationMaterielService.java → ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBaseRelationMaterialService.java
Unescape Escape View File

@ -1,8 +1,8 @@
package org.dromara.oa.base.service; package org.dromara.oa.base.service;
import org.dromara.oa.base.domain.BaseRelationMateriel; import org.dromara.oa.base.domain.BaseRelationMaterial;
import org.dromara.oa.base.domain.vo.BaseRelationMaterielVo; import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
import org.dromara.oa.base.domain.bo.BaseRelationMaterielBo; import org.dromara.oa.base.domain.bo.BaseRelationMaterialBo;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
@ -13,17 +13,17 @@ import java.util.List;
* 关联销售物料信息Service接口 * 关联销售物料信息Service接口
* *
* @author Yinq * @author Yinq
* @date 2025-09-28 * @date 2025-09-30
*/ */
public interface IBaseRelationMaterielService { public interface IBaseRelationMaterialService {
/** /**
* 查询关联销售物料信息 * 查询关联销售物料信息
* *
* @param relationMaterielId 主键 * @param relationMaterialId 主键
* @return 关联销售物料信息 * @return 关联销售物料信息
*/ */
BaseRelationMaterielVo queryById(Long relationMaterielId); BaseRelationMaterialVo queryById(Long relationMaterialId);
/** /**
* 分页查询关联销售物料信息列表 * 分页查询关联销售物料信息列表
@ -32,7 +32,7 @@ public interface IBaseRelationMaterielService {
* @param pageQuery 分页参数 * @param pageQuery 分页参数
* @return 关联销售物料信息分页列表 * @return 关联销售物料信息分页列表
*/ */
TableDataInfo<BaseRelationMaterielVo> queryPageList(BaseRelationMaterielBo bo, PageQuery pageQuery); TableDataInfo<BaseRelationMaterialVo> queryPageList(BaseRelationMaterialBo bo, PageQuery pageQuery);
/** /**
* 查询符合条件的关联销售物料信息列表 * 查询符合条件的关联销售物料信息列表
@ -40,7 +40,7 @@ public interface IBaseRelationMaterielService {
* @param bo 查询条件 * @param bo 查询条件
* @return 关联销售物料信息列表 * @return 关联销售物料信息列表
*/ */
List<BaseRelationMaterielVo> queryList(BaseRelationMaterielBo bo); List<BaseRelationMaterialVo> queryList(BaseRelationMaterialBo bo);
/** /**
* 新增关联销售物料信息 * 新增关联销售物料信息
@ -48,7 +48,7 @@ public interface IBaseRelationMaterielService {
* @param bo 关联销售物料信息 * @param bo 关联销售物料信息
* @return 是否新增成功 * @return 是否新增成功
*/ */
Boolean insertByBo(BaseRelationMaterielBo bo); Boolean insertByBo(BaseRelationMaterialBo bo);
/** /**
* 修改关联销售物料信息 * 修改关联销售物料信息
@ -56,7 +56,7 @@ public interface IBaseRelationMaterielService {
* @param bo 关联销售物料信息 * @param bo 关联销售物料信息
* @return 是否修改成功 * @return 是否修改成功
*/ */
Boolean updateByBo(BaseRelationMaterielBo bo); Boolean updateByBo(BaseRelationMaterialBo bo);
/** /**
* 校验并批量删除关联销售物料信息信息 * 校验并批量删除关联销售物料信息信息

63
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseRelationMaterielServiceImpl.java → ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseRelationMaterialServiceImpl.java
Unescape Escape View File

@ -12,11 +12,11 @@ import lombok.RequiredArgsConstructor;
import org.dromara.oa.base.domain.BaseMaterialInfo; import org.dromara.oa.base.domain.BaseMaterialInfo;
import org.dromara.oa.crm.domain.CrmCustomerInfo; import org.dromara.oa.crm.domain.CrmCustomerInfo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.oa.base.domain.bo.BaseRelationMaterielBo; import org.dromara.oa.base.domain.bo.BaseRelationMaterialBo;
import org.dromara.oa.base.domain.vo.BaseRelationMaterielVo; import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
import org.dromara.oa.base.domain.BaseRelationMateriel; import org.dromara.oa.base.domain.BaseRelationMaterial;
import org.dromara.oa.base.mapper.BaseRelationMaterielMapper; import org.dromara.oa.base.mapper.BaseRelationMaterialMapper;
import org.dromara.oa.base.service.IBaseRelationMaterielService; import org.dromara.oa.base.service.IBaseRelationMaterialService;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -26,23 +26,26 @@ import java.util.Collection;
* 关联销售物料信息Service业务层处理 * 关联销售物料信息Service业务层处理
* *
* @author Yinq * @author Yinq
* @date 2025-09-28 * @date 2025-09-30
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielService { public class BaseRelationMaterialServiceImpl implements IBaseRelationMaterialService {
private final BaseRelationMaterielMapper baseMapper; private final BaseRelationMaterialMapper baseMapper;
/** /**
* 查询关联销售物料信息 * 查询关联销售物料信息
* *
* @param relationMaterielId 主键 * @param relationMaterialId 主键
* @return 关联销售物料信息 * @return 关联销售物料信息
*/ */
@Override @Override
public BaseRelationMaterielVo queryById(Long relationMaterielId) { public BaseRelationMaterialVo queryById(Long relationMaterialId) {
return baseMapper.selectVoById(relationMaterielId); BaseRelationMaterialBo bo = new BaseRelationMaterialBo();
bo.setRelationMaterialId(relationMaterialId);
MPJLambdaWrapper<BaseRelationMaterial> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw).get(0);
} }
/** /**
@ -53,9 +56,9 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
* @return 关联销售物料信息分页列表 * @return 关联销售物料信息分页列表
*/ */
@Override @Override
public TableDataInfo<BaseRelationMaterielVo> queryPageList(BaseRelationMaterielBo bo, PageQuery pageQuery) { public TableDataInfo<BaseRelationMaterialVo> queryPageList(BaseRelationMaterialBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<BaseRelationMateriel> lqw = buildQueryWrapper(bo); MPJLambdaWrapper<BaseRelationMaterial> lqw = buildQueryWrapper(bo);
Page<BaseRelationMaterielVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<BaseRelationMaterialVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@ -66,24 +69,27 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
* @return 关联销售物料信息列表 * @return 关联销售物料信息列表
*/ */
@Override @Override
public List<BaseRelationMaterielVo> queryList(BaseRelationMaterielBo bo) { public List<BaseRelationMaterialVo> queryList(BaseRelationMaterialBo bo) {
MPJLambdaWrapper<BaseRelationMateriel> lqw = buildQueryWrapper(bo); MPJLambdaWrapper<BaseRelationMaterial> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw); return baseMapper.selectVoList(lqw);
} }
private MPJLambdaWrapper<BaseRelationMateriel> buildQueryWrapper(BaseRelationMaterielBo bo) { private MPJLambdaWrapper<BaseRelationMaterial> buildQueryWrapper(BaseRelationMaterialBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<BaseRelationMateriel> lqw = JoinWrappers.lambda(BaseRelationMateriel.class) MPJLambdaWrapper<BaseRelationMaterial> lqw = JoinWrappers.lambda(BaseRelationMaterial.class)
.selectAll(BaseRelationMateriel.class) .selectAll(BaseRelationMaterial.class)
.select(BaseMaterialInfo::getMaterialCode) .select(BaseMaterialInfo::getMaterialCode)
.select(BaseMaterialInfo::getMaterialName) .select(BaseMaterialInfo::getMaterialName)
.select(CrmCustomerInfo::getCustomerName) .select(CrmCustomerInfo::getCustomerName)
.leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, BaseRelationMaterial::getMaterialId)
.eq(bo.getCustomerId() != null, BaseRelationMateriel::getCustomerId, bo.getCustomerId()) .leftJoin(CrmCustomerInfo.class, CrmCustomerInfo::getCustomerId, BaseRelationMaterial::getCustomerId)
.eq(bo.getMaterialId() != null, BaseRelationMaterial::getMaterialId, bo.getMaterialId())
.eq(bo.getCustomerId() != null, BaseRelationMaterial::getCustomerId, bo.getCustomerId())
.like(StringUtils.isNotBlank(bo.getMaterialCode()), BaseMaterialInfo::getMaterialCode, bo.getMaterialCode()) .like(StringUtils.isNotBlank(bo.getMaterialCode()), BaseMaterialInfo::getMaterialCode, bo.getMaterialCode())
.like(StringUtils.isNotBlank(bo.getMaterialName()), BaseMaterialInfo::getMaterialName, bo.getMaterialName()) .like(StringUtils.isNotBlank(bo.getMaterialName()), BaseMaterialInfo::getMaterialName, bo.getMaterialName())
.like(StringUtils.isNotBlank(bo.getSaleMaterielName()), BaseRelationMateriel::getSaleMaterielName, bo.getSaleMaterielName()) .like(StringUtils.isNotBlank(bo.getCustomerName()), CrmCustomerInfo::getCustomerName, bo.getCustomerName())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseRelationMateriel::getActiveFlag, bo.getActiveFlag()); .like(StringUtils.isNotBlank(bo.getSaleMaterialName()), BaseRelationMaterial::getSaleMaterialName, bo.getSaleMaterialName())
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseRelationMaterial::getActiveFlag, bo.getActiveFlag());
return lqw; return lqw;
} }
@ -94,11 +100,12 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
* @return 是否新增成功 * @return 是否新增成功
*/ */
@Override @Override
public Boolean insertByBo(BaseRelationMaterielBo bo) { public Boolean insertByBo(BaseRelationMaterialBo bo) {
BaseRelationMateriel add = MapstructUtils.convert(bo, BaseRelationMateriel.class); BaseRelationMaterial add = MapstructUtils.convert(bo, BaseRelationMaterial.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setRelationMaterialId(add.getRelationMaterialId());
} }
return flag; return flag;
} }
@ -110,8 +117,8 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
* @return 是否修改成功 * @return 是否修改成功
*/ */
@Override @Override
public Boolean updateByBo(BaseRelationMaterielBo bo) { public Boolean updateByBo(BaseRelationMaterialBo bo) {
BaseRelationMateriel update = MapstructUtils.convert(bo, BaseRelationMateriel.class); BaseRelationMaterial update = MapstructUtils.convert(bo, BaseRelationMaterial.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }
@ -119,7 +126,7 @@ public class BaseRelationMaterielServiceImpl implements IBaseRelationMaterielSer
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(BaseRelationMateriel entity) { private void validEntityBeforeSave(BaseRelationMaterial entity) {
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }

27
ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseRelationMaterialMapper.xml
Unescape Escape View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.oa.base.mapper.BaseRelationMaterialMapper">
<resultMap type="org.dromara.oa.base.domain.vo.BaseRelationMaterialVo" id="BaseRelationMaterialResult">
</resultMap>
<select id="selectCustomBaseRelationMaterialVoList" resultMap="BaseRelationMaterialResult">
select relation_material_id,
tenant_id,
material_id,
customer_id,
sale_material_name,
remark,
active_flag,
del_flag,
create_dept,
create_by,
create_time,
update_by,
update_time
from base_relation_material t
${ew.getCustomSqlSegment}
</select>
</mapper>

14
ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseRelationMaterielMapper.xml
Unescape Escape View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.oa.base.mapper.BaseRelationMaterielMapper">
<resultMap type="org.dromara.oa.base.domain.vo.BaseRelationMaterielVo" id="BaseRelationMaterielResult">
</resultMap>
<select id="selectCustomBaseRelationMaterielVoList" resultMap="BaseRelationMaterielResult">
select relation_materiel_id, tenant_id, materiel_id, customer_id, sale_materiel_name, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from base_relation_materiel t
${ew.getCustomSqlSegment}
</select>
</mapper>
Write Preview
Loading…
Cancel
Save