From c39fc25a1ace19dcd0abd6a8cacac2f10163fd12 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 7 May 2026 16:23:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(bonus):=20=E6=B7=BB=E5=8A=A0=E5=A5=96?= =?UTF-8?q?=E9=87=91=E5=88=86=E9=85=8D=E3=80=81=E5=A5=96=E9=87=91=E6=B1=A0?= =?UTF-8?q?=E5=92=8C=E5=B2=97=E4=BD=8D=E7=B3=BB=E6=95=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 WmsBonusConfig 实体类用于奖金分配对象 - 新增 WmsBonusPool 实体类用于奖金池对象 - 新增 WmsPostCoeffConfig 实体类用于岗位系数配置对象 - 创建 IWmsBonusConfigService 接口及其实现类 - 创建 IWmsBonusPoolService 接口及其实现类 - 创建 IWmsPostCoeffConfigService 接口及其实现类 - 添加 WmsBonusConfigController 控制器实现 CRUD 操作 - 添加 WmsBonusPoolController 控制器实现 CRUD 操作 - 添加 WmsPostCoeffConfigController 控制器实现 CRUD 操作 - 创建对应的 Mapper 接口和 XML 映射文件 - 实现分页查询、导出 Excel 等功能 - 添加数据验证和业务逻辑处理 --- .../controller/WmsBonusConfigController.java | 99 +++++++++++++++ .../controller/WmsBonusPoolController.java | 99 +++++++++++++++ .../WmsPostCoeffConfigController.java | 99 +++++++++++++++ .../java/com/klp/domain/WmsBonusConfig.java | 74 +++++++++++ .../java/com/klp/domain/WmsBonusPool.java | 52 ++++++++ .../com/klp/domain/WmsPostCoeffConfig.java | 50 ++++++++ .../com/klp/domain/bo/WmsBonusConfigBo.java | 77 ++++++++++++ .../com/klp/domain/bo/WmsBonusPoolBo.java | 49 ++++++++ .../klp/domain/bo/WmsPostCoeffConfigBo.java | 47 +++++++ .../com/klp/domain/vo/WmsBonusConfigVo.java | 91 ++++++++++++++ .../com/klp/domain/vo/WmsBonusPoolVo.java | 56 +++++++++ .../klp/domain/vo/WmsPostCoeffConfigVo.java | 54 ++++++++ .../com/klp/mapper/WmsBonusConfigMapper.java | 15 +++ .../com/klp/mapper/WmsBonusPoolMapper.java | 15 +++ .../klp/mapper/WmsPostCoeffConfigMapper.java | 15 +++ .../klp/service/IWmsBonusConfigService.java | 49 ++++++++ .../com/klp/service/IWmsBonusPoolService.java | 49 ++++++++ .../service/IWmsPostCoeffConfigService.java | 49 ++++++++ .../impl/WmsBonusConfigServiceImpl.java | 117 ++++++++++++++++++ .../service/impl/WmsBonusPoolServiceImpl.java | 111 +++++++++++++++++ .../impl/WmsPostCoeffConfigServiceImpl.java | 111 +++++++++++++++++ .../mapper/klp/WmsBonusConfigMapper.xml | 27 ++++ .../mapper/klp/WmsBonusPoolMapper.xml | 21 ++++ .../mapper/klp/WmsPostCoeffConfigMapper.xml | 21 ++++ 24 files changed, 1447 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsBonusConfigController.java create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsBonusPoolController.java create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsPostCoeffConfigController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsBonusConfig.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsPostCoeffConfig.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsBonusConfigBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsPostCoeffConfigBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsBonusConfigVo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsPostCoeffConfigVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsBonusConfigMapper.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsBonusPoolMapper.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsPostCoeffConfigMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsBonusConfigService.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsBonusPoolService.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsPostCoeffConfigService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsBonusConfigServiceImpl.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsPostCoeffConfigServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsBonusConfigMapper.xml create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsPostCoeffConfigMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsBonusConfigController.java b/klp-wms/src/main/java/com/klp/controller/WmsBonusConfigController.java new file mode 100644 index 00000000..c0f200a7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsBonusConfigController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsBonusConfigVo; +import com.klp.domain.bo.WmsBonusConfigBo; +import com.klp.service.IWmsBonusConfigService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 奖金分配 + * + * @author klp + * @date 2026-05-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/bonusConfig") +public class WmsBonusConfigController extends BaseController { + + private final IWmsBonusConfigService iWmsBonusConfigService; + + /** + * 查询奖金分配列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsBonusConfigBo bo, PageQuery pageQuery) { + return iWmsBonusConfigService.queryPageList(bo, pageQuery); + } + + /** + * 导出奖金分配列表 + */ + @Log(title = "奖金分配", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsBonusConfigBo bo, HttpServletResponse response) { + List list = iWmsBonusConfigService.queryList(bo); + ExcelUtil.exportExcel(list, "奖金分配", WmsBonusConfigVo.class, response); + } + + /** + * 获取奖金分配详细信息 + * + * @param configId 主键 + */ + @GetMapping("/{configId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long configId) { + return R.ok(iWmsBonusConfigService.queryById(configId)); + } + + /** + * 新增奖金分配 + */ + @Log(title = "奖金分配", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsBonusConfigBo bo) { + return toAjax(iWmsBonusConfigService.insertByBo(bo)); + } + + /** + * 修改奖金分配 + */ + @Log(title = "奖金分配", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsBonusConfigBo bo) { + return toAjax(iWmsBonusConfigService.updateByBo(bo)); + } + + /** + * 删除奖金分配 + * + * @param configIds 主键串 + */ + @Log(title = "奖金分配", businessType = BusinessType.DELETE) + @DeleteMapping("/{configIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] configIds) { + return toAjax(iWmsBonusConfigService.deleteWithValidByIds(Arrays.asList(configIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsBonusPoolController.java b/klp-wms/src/main/java/com/klp/controller/WmsBonusPoolController.java new file mode 100644 index 00000000..2a76d4ec --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsBonusPoolController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsBonusPoolVo; +import com.klp.domain.bo.WmsBonusPoolBo; +import com.klp.service.IWmsBonusPoolService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 奖金池 + * + * @author klp + * @date 2026-05-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/bonusPool") +public class WmsBonusPoolController extends BaseController { + + private final IWmsBonusPoolService iWmsBonusPoolService; + + /** + * 查询奖金池列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsBonusPoolBo bo, PageQuery pageQuery) { + return iWmsBonusPoolService.queryPageList(bo, pageQuery); + } + + /** + * 导出奖金池列表 + */ + @Log(title = "奖金池", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsBonusPoolBo bo, HttpServletResponse response) { + List list = iWmsBonusPoolService.queryList(bo); + ExcelUtil.exportExcel(list, "奖金池", WmsBonusPoolVo.class, response); + } + + /** + * 获取奖金池详细信息 + * + * @param poolId 主键 + */ + @GetMapping("/{poolId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long poolId) { + return R.ok(iWmsBonusPoolService.queryById(poolId)); + } + + /** + * 新增奖金池 + */ + @Log(title = "奖金池", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsBonusPoolBo bo) { + return toAjax(iWmsBonusPoolService.insertByBo(bo)); + } + + /** + * 修改奖金池 + */ + @Log(title = "奖金池", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsBonusPoolBo bo) { + return toAjax(iWmsBonusPoolService.updateByBo(bo)); + } + + /** + * 删除奖金池 + * + * @param poolIds 主键串 + */ + @Log(title = "奖金池", businessType = BusinessType.DELETE) + @DeleteMapping("/{poolIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] poolIds) { + return toAjax(iWmsBonusPoolService.deleteWithValidByIds(Arrays.asList(poolIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsPostCoeffConfigController.java b/klp-wms/src/main/java/com/klp/controller/WmsPostCoeffConfigController.java new file mode 100644 index 00000000..84cccf88 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsPostCoeffConfigController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsPostCoeffConfigVo; +import com.klp.domain.bo.WmsPostCoeffConfigBo; +import com.klp.service.IWmsPostCoeffConfigService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 岗位系数配置 + * + * @author klp + * @date 2026-05-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/postCoeffConfig") +public class WmsPostCoeffConfigController extends BaseController { + + private final IWmsPostCoeffConfigService iWmsPostCoeffConfigService; + + /** + * 查询岗位系数配置列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsPostCoeffConfigBo bo, PageQuery pageQuery) { + return iWmsPostCoeffConfigService.queryPageList(bo, pageQuery); + } + + /** + * 导出岗位系数配置列表 + */ + @Log(title = "岗位系数配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsPostCoeffConfigBo bo, HttpServletResponse response) { + List list = iWmsPostCoeffConfigService.queryList(bo); + ExcelUtil.exportExcel(list, "岗位系数配置", WmsPostCoeffConfigVo.class, response); + } + + /** + * 获取岗位系数配置详细信息 + * + * @param configId 主键 + */ + @GetMapping("/{configId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long configId) { + return R.ok(iWmsPostCoeffConfigService.queryById(configId)); + } + + /** + * 新增岗位系数配置 + */ + @Log(title = "岗位系数配置", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsPostCoeffConfigBo bo) { + return toAjax(iWmsPostCoeffConfigService.insertByBo(bo)); + } + + /** + * 修改岗位系数配置 + */ + @Log(title = "岗位系数配置", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsPostCoeffConfigBo bo) { + return toAjax(iWmsPostCoeffConfigService.updateByBo(bo)); + } + + /** + * 删除岗位系数配置 + * + * @param configIds 主键串 + */ + @Log(title = "岗位系数配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{configIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] configIds) { + return toAjax(iWmsPostCoeffConfigService.deleteWithValidByIds(Arrays.asList(configIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsBonusConfig.java b/klp-wms/src/main/java/com/klp/domain/WmsBonusConfig.java new file mode 100644 index 00000000..e3add225 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsBonusConfig.java @@ -0,0 +1,74 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 奖金分配对象 wms_bonus_config + * + * @author klp + * @date 2026-05-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_bonus_config") +public class WmsBonusConfig extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "config_id") + private Long configId; + /** + * 奖金池ID（关联bonus_pool.id） + */ + private Long poolId; + /** + * 员工ID + */ + private Long empId; + /** + * 员工姓名 + */ + private String empName; + /** + * 岗位 + */ + private String postName; + /** + * 职务系数 + */ + private BigDecimal dutyCoeff; + /** + * 基本系数 + */ + private BigDecimal baseCoeff; + /** + * 主任加减系数 + */ + private BigDecimal adjustCoeff; + /** + * 分配基数(底薪/元) + */ + private BigDecimal allocBase; + /** + * 分配奖金金额 + */ + private BigDecimal bonusAmount; + /** + * 备注 + */ + private String remark; + /** + * 删除标识 0正常 2删除 + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java b/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java new file mode 100644 index 00000000..aafd4b6c --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java @@ -0,0 +1,52 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 奖金池对象 wms_bonus_pool + * + * @author klp + * @date 2026-05-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_bonus_pool") +public class WmsBonusPool extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "pool_id") + private Long poolId; + /** + * 产线 + */ + private String productionLine; + /** + * 奖金时间/统计时间 + */ + private Date bonusTime; + /** + * 奖金池总金额 + */ + private BigDecimal totalBonus; + /** + * 备注 + */ + private String remark; + /** + * 删除标识 0正常 2删除 + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsPostCoeffConfig.java b/klp-wms/src/main/java/com/klp/domain/WmsPostCoeffConfig.java new file mode 100644 index 00000000..1f2556da --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsPostCoeffConfig.java @@ -0,0 +1,50 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 岗位系数配置对象 wms_post_coeff_config + * + * @author klp + * @date 2026-05-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_post_coeff_config") +public class WmsPostCoeffConfig extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "config_id") + private Long configId; + /** + * 岗位名称 + */ + private String postName; + /** + * 职务系数 + */ + private BigDecimal dutyCoeff; + /** + * 基本系数 + */ + private BigDecimal baseCoeff; + /** + * 备注 + */ + private String remark; + /** + * 删除标识 0正常 2删除 + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusConfigBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusConfigBo.java new file mode 100644 index 00000000..ea3eb73b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusConfigBo.java @@ -0,0 +1,77 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.math.BigDecimal; + +/** + * 奖金分配业务对象 wms_bonus_config + * + * @author klp + * @date 2026-05-07 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsBonusConfigBo extends BaseEntity { + + /** + * 主键ID + */ + private Long configId; + + /** + * 奖金池ID（关联bonus_pool.id） + */ + private Long poolId; + + /** + * 员工ID + */ + private Long empId; + + /** + * 员工姓名 + */ + private String empName; + + /** + * 岗位 + */ + private String postName; + + /** + * 职务系数 + */ + private BigDecimal dutyCoeff; + + /** + * 基本系数 + */ + private BigDecimal baseCoeff; + + /** + * 主任加减系数 + */ + private BigDecimal adjustCoeff; + + /** + * 分配基数(底薪/元) + */ + private BigDecimal allocBase; + + /** + * 分配奖金金额 + */ + private BigDecimal bonusAmount; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java new file mode 100644 index 00000000..e4fc398a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java @@ -0,0 +1,49 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 奖金池业务对象 wms_bonus_pool + * + * @author klp + * @date 2026-05-07 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsBonusPoolBo extends BaseEntity { + + /** + * 主键ID + */ + private Long poolId; + + /** + * 产线 + */ + private String productionLine; + + /** + * 奖金时间/统计时间 + */ + private Date bonusTime; + + /** + * 奖金池总金额 + */ + private BigDecimal totalBonus; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsPostCoeffConfigBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsPostCoeffConfigBo.java new file mode 100644 index 00000000..9237cc81 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsPostCoeffConfigBo.java @@ -0,0 +1,47 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.math.BigDecimal; + +/** + * 岗位系数配置业务对象 wms_post_coeff_config + * + * @author klp + * @date 2026-05-07 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsPostCoeffConfigBo extends BaseEntity { + + /** + * 主键ID + */ + private Long configId; + + /** + * 岗位名称 + */ + private String postName; + + /** + * 职务系数 + */ + private BigDecimal dutyCoeff; + + /** + * 基本系数 + */ + private BigDecimal baseCoeff; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusConfigVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusConfigVo.java new file mode 100644 index 00000000..88980d39 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusConfigVo.java @@ -0,0 +1,91 @@ +package com.klp.domain.vo; + +import java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 奖金分配视图对象 wms_bonus_config + * + * @author klp + * @date 2026-05-07 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsBonusConfigVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long configId; + + /** + * 奖金池ID（关联bonus_pool.id） + */ + @ExcelProperty(value = "奖金池ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联bonus_pool.id") + private Long poolId; + + /** + * 员工ID + */ + @ExcelProperty(value = "员工ID") + private Long empId; + + /** + * 员工姓名 + */ + @ExcelProperty(value = "员工姓名") + private String empName; + + /** + * 岗位 + */ + @ExcelProperty(value = "岗位") + private String postName; + + /** + * 职务系数 + */ + @ExcelProperty(value = "职务系数") + private BigDecimal dutyCoeff; + + /** + * 基本系数 + */ + @ExcelProperty(value = "基本系数") + private BigDecimal baseCoeff; + + /** + * 主任加减系数 + */ + @ExcelProperty(value = "主任加减系数") + private BigDecimal adjustCoeff; + + /** + * 分配基数(底薪/元) + */ + @ExcelProperty(value = "分配基数(底薪/元)") + private BigDecimal allocBase; + + /** + * 分配奖金金额 + */ + @ExcelProperty(value = "分配奖金金额") + private BigDecimal bonusAmount; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java new file mode 100644 index 00000000..935bec95 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsBonusPoolVo.java @@ -0,0 +1,56 @@ +package com.klp.domain.vo; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 奖金池视图对象 wms_bonus_pool + * + * @author klp + * @date 2026-05-07 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsBonusPoolVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long poolId; + + /** + * 产线 + */ + @ExcelProperty(value = "产线") + private String productionLine; + + /** + * 奖金时间/统计时间 + */ + @ExcelProperty(value = "奖金时间/统计时间") + private Date bonusTime; + + /** + * 奖金池总金额 + */ + @ExcelProperty(value = "奖金池总金额") + private BigDecimal totalBonus; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsPostCoeffConfigVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsPostCoeffConfigVo.java new file mode 100644 index 00000000..3b780a73 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsPostCoeffConfigVo.java @@ -0,0 +1,54 @@ +package com.klp.domain.vo; + +import java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 岗位系数配置视图对象 wms_post_coeff_config + * + * @author klp + * @date 2026-05-07 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsPostCoeffConfigVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long configId; + + /** + * 岗位名称 + */ + @ExcelProperty(value = "岗位名称") + private String postName; + + /** + * 职务系数 + */ + @ExcelProperty(value = "职务系数") + private BigDecimal dutyCoeff; + + /** + * 基本系数 + */ + @ExcelProperty(value = "基本系数") + private BigDecimal baseCoeff; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsBonusConfigMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsBonusConfigMapper.java new file mode 100644 index 00000000..7915aeb3 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsBonusConfigMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsBonusConfig; +import com.klp.domain.vo.WmsBonusConfigVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 奖金分配Mapper接口 + * + * @author klp + * @date 2026-05-07 + */ +public interface WmsBonusConfigMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsBonusPoolMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsBonusPoolMapper.java new file mode 100644 index 00000000..abff0037 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsBonusPoolMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsBonusPool; +import com.klp.domain.vo.WmsBonusPoolVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 奖金池Mapper接口 + * + * @author klp + * @date 2026-05-07 + */ +public interface WmsBonusPoolMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsPostCoeffConfigMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsPostCoeffConfigMapper.java new file mode 100644 index 00000000..93e92bbb --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsPostCoeffConfigMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsPostCoeffConfig; +import com.klp.domain.vo.WmsPostCoeffConfigVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 岗位系数配置Mapper接口 + * + * @author klp + * @date 2026-05-07 + */ +public interface WmsPostCoeffConfigMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsBonusConfigService.java b/klp-wms/src/main/java/com/klp/service/IWmsBonusConfigService.java new file mode 100644 index 00000000..9d456856 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsBonusConfigService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsBonusConfig; +import com.klp.domain.vo.WmsBonusConfigVo; +import com.klp.domain.bo.WmsBonusConfigBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 奖金分配Service接口 + * + * @author klp + * @date 2026-05-07 + */ +public interface IWmsBonusConfigService { + + /** + * 查询奖金分配 + */ + WmsBonusConfigVo queryById(Long configId); + + /** + * 查询奖金分配列表 + */ + TableDataInfo queryPageList(WmsBonusConfigBo bo, PageQuery pageQuery); + + /** + * 查询奖金分配列表 + */ + List queryList(WmsBonusConfigBo bo); + + /** + * 新增奖金分配 + */ + Boolean insertByBo(WmsBonusConfigBo bo); + + /** + * 修改奖金分配 + */ + Boolean updateByBo(WmsBonusConfigBo bo); + + /** + * 校验并批量删除奖金分配信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsBonusPoolService.java b/klp-wms/src/main/java/com/klp/service/IWmsBonusPoolService.java new file mode 100644 index 00000000..bb89243c --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsBonusPoolService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsBonusPool; +import com.klp.domain.vo.WmsBonusPoolVo; +import com.klp.domain.bo.WmsBonusPoolBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 奖金池Service接口 + * + * @author klp + * @date 2026-05-07 + */ +public interface IWmsBonusPoolService { + + /** + * 查询奖金池 + */ + WmsBonusPoolVo queryById(Long poolId); + + /** + * 查询奖金池列表 + */ + TableDataInfo queryPageList(WmsBonusPoolBo bo, PageQuery pageQuery); + + /** + * 查询奖金池列表 + */ + List queryList(WmsBonusPoolBo bo); + + /** + * 新增奖金池 + */ + Boolean insertByBo(WmsBonusPoolBo bo); + + /** + * 修改奖金池 + */ + Boolean updateByBo(WmsBonusPoolBo bo); + + /** + * 校验并批量删除奖金池信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsPostCoeffConfigService.java b/klp-wms/src/main/java/com/klp/service/IWmsPostCoeffConfigService.java new file mode 100644 index 00000000..23614d9e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsPostCoeffConfigService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsPostCoeffConfig; +import com.klp.domain.vo.WmsPostCoeffConfigVo; +import com.klp.domain.bo.WmsPostCoeffConfigBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 岗位系数配置Service接口 + * + * @author klp + * @date 2026-05-07 + */ +public interface IWmsPostCoeffConfigService { + + /** + * 查询岗位系数配置 + */ + WmsPostCoeffConfigVo queryById(Long configId); + + /** + * 查询岗位系数配置列表 + */ + TableDataInfo queryPageList(WmsPostCoeffConfigBo bo, PageQuery pageQuery); + + /** + * 查询岗位系数配置列表 + */ + List queryList(WmsPostCoeffConfigBo bo); + + /** + * 新增岗位系数配置 + */ + Boolean insertByBo(WmsPostCoeffConfigBo bo); + + /** + * 修改岗位系数配置 + */ + Boolean updateByBo(WmsPostCoeffConfigBo bo); + + /** + * 校验并批量删除岗位系数配置信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsBonusConfigServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsBonusConfigServiceImpl.java new file mode 100644 index 00000000..ec575242 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsBonusConfigServiceImpl.java @@ -0,0 +1,117 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsBonusConfigBo; +import com.klp.domain.vo.WmsBonusConfigVo; +import com.klp.domain.WmsBonusConfig; +import com.klp.mapper.WmsBonusConfigMapper; +import com.klp.service.IWmsBonusConfigService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 奖金分配Service业务层处理 + * + * @author klp + * @date 2026-05-07 + */ +@RequiredArgsConstructor +@Service +public class WmsBonusConfigServiceImpl implements IWmsBonusConfigService { + + private final WmsBonusConfigMapper baseMapper; + + /** + * 查询奖金分配 + */ + @Override + public WmsBonusConfigVo queryById(Long configId){ + return baseMapper.selectVoById(configId); + } + + /** + * 查询奖金分配列表 + */ + @Override + public TableDataInfo queryPageList(WmsBonusConfigBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询奖金分配列表 + */ + @Override + public List queryList(WmsBonusConfigBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsBonusConfigBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getPoolId() != null, WmsBonusConfig::getPoolId, bo.getPoolId()); + lqw.eq(bo.getEmpId() != null, WmsBonusConfig::getEmpId, bo.getEmpId()); + lqw.like(StringUtils.isNotBlank(bo.getEmpName()), WmsBonusConfig::getEmpName, bo.getEmpName()); + lqw.like(StringUtils.isNotBlank(bo.getPostName()), WmsBonusConfig::getPostName, bo.getPostName()); + lqw.eq(bo.getDutyCoeff() != null, WmsBonusConfig::getDutyCoeff, bo.getDutyCoeff()); + lqw.eq(bo.getBaseCoeff() != null, WmsBonusConfig::getBaseCoeff, bo.getBaseCoeff()); + lqw.eq(bo.getAdjustCoeff() != null, WmsBonusConfig::getAdjustCoeff, bo.getAdjustCoeff()); + lqw.eq(bo.getAllocBase() != null, WmsBonusConfig::getAllocBase, bo.getAllocBase()); + lqw.eq(bo.getBonusAmount() != null, WmsBonusConfig::getBonusAmount, bo.getBonusAmount()); + return lqw; + } + + /** + * 新增奖金分配 + */ + @Override + public Boolean insertByBo(WmsBonusConfigBo bo) { + WmsBonusConfig add = BeanUtil.toBean(bo, WmsBonusConfig.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setConfigId(add.getConfigId()); + } + return flag; + } + + /** + * 修改奖金分配 + */ + @Override + public Boolean updateByBo(WmsBonusConfigBo bo) { + WmsBonusConfig update = BeanUtil.toBean(bo, WmsBonusConfig.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsBonusConfig entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除奖金分配 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java new file mode 100644 index 00000000..3e45b800 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsBonusPoolServiceImpl.java @@ -0,0 +1,111 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.utils.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsBonusPoolBo; +import com.klp.domain.vo.WmsBonusPoolVo; +import com.klp.domain.WmsBonusPool; +import com.klp.mapper.WmsBonusPoolMapper; +import com.klp.service.IWmsBonusPoolService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 奖金池Service业务层处理 + * + * @author klp + * @date 2026-05-07 + */ +@RequiredArgsConstructor +@Service +public class WmsBonusPoolServiceImpl implements IWmsBonusPoolService { + + private final WmsBonusPoolMapper baseMapper; + + /** + * 查询奖金池 + */ + @Override + public WmsBonusPoolVo queryById(Long poolId){ + return baseMapper.selectVoById(poolId); + } + + /** + * 查询奖金池列表 + */ + @Override + public TableDataInfo queryPageList(WmsBonusPoolBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询奖金池列表 + */ + @Override + public List queryList(WmsBonusPoolBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsBonusPoolBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsBonusPool::getProductionLine, bo.getProductionLine()); + lqw.eq(bo.getBonusTime() != null, WmsBonusPool::getBonusTime, bo.getBonusTime()); + lqw.eq(bo.getTotalBonus() != null, WmsBonusPool::getTotalBonus, bo.getTotalBonus()); + return lqw; + } + + /** + * 新增奖金池 + */ + @Override + public Boolean insertByBo(WmsBonusPoolBo bo) { + WmsBonusPool add = BeanUtil.toBean(bo, WmsBonusPool.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPoolId(add.getPoolId()); + } + return flag; + } + + /** + * 修改奖金池 + */ + @Override + public Boolean updateByBo(WmsBonusPoolBo bo) { + WmsBonusPool update = BeanUtil.toBean(bo, WmsBonusPool.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsBonusPool entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除奖金池 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsPostCoeffConfigServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsPostCoeffConfigServiceImpl.java new file mode 100644 index 00000000..45c98bee --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsPostCoeffConfigServiceImpl.java @@ -0,0 +1,111 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsPostCoeffConfigBo; +import com.klp.domain.vo.WmsPostCoeffConfigVo; +import com.klp.domain.WmsPostCoeffConfig; +import com.klp.mapper.WmsPostCoeffConfigMapper; +import com.klp.service.IWmsPostCoeffConfigService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 岗位系数配置Service业务层处理 + * + * @author klp + * @date 2026-05-07 + */ +@RequiredArgsConstructor +@Service +public class WmsPostCoeffConfigServiceImpl implements IWmsPostCoeffConfigService { + + private final WmsPostCoeffConfigMapper baseMapper; + + /** + * 查询岗位系数配置 + */ + @Override + public WmsPostCoeffConfigVo queryById(Long configId){ + return baseMapper.selectVoById(configId); + } + + /** + * 查询岗位系数配置列表 + */ + @Override + public TableDataInfo queryPageList(WmsPostCoeffConfigBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询岗位系数配置列表 + */ + @Override + public List queryList(WmsPostCoeffConfigBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsPostCoeffConfigBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getPostName()), WmsPostCoeffConfig::getPostName, bo.getPostName()); + lqw.eq(bo.getDutyCoeff() != null, WmsPostCoeffConfig::getDutyCoeff, bo.getDutyCoeff()); + lqw.eq(bo.getBaseCoeff() != null, WmsPostCoeffConfig::getBaseCoeff, bo.getBaseCoeff()); + return lqw; + } + + /** + * 新增岗位系数配置 + */ + @Override + public Boolean insertByBo(WmsPostCoeffConfigBo bo) { + WmsPostCoeffConfig add = BeanUtil.toBean(bo, WmsPostCoeffConfig.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setConfigId(add.getConfigId()); + } + return flag; + } + + /** + * 修改岗位系数配置 + */ + @Override + public Boolean updateByBo(WmsPostCoeffConfigBo bo) { + WmsPostCoeffConfig update = BeanUtil.toBean(bo, WmsPostCoeffConfig.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsPostCoeffConfig entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除岗位系数配置 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsBonusConfigMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsBonusConfigMapper.xml new file mode 100644 index 00000000..b9767aeb --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsBonusConfigMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml new file mode 100644 index 00000000..eb709c3c --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsBonusPoolMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsPostCoeffConfigMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsPostCoeffConfigMapper.xml new file mode 100644 index 00000000..4ac4725e --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsPostCoeffConfigMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + +