diff --git a/klp-wms/src/main/java/com/klp/controller/WmsContractController.java b/klp-wms/src/main/java/com/klp/controller/WmsContractController.java new file mode 100644 index 00000000..0099580f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsContractController.java @@ -0,0 +1,106 @@ +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 cn.dev33.satoken.annotation.SaCheckPermission; +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.WmsContractVo; +import com.klp.domain.bo.WmsContractBo; +import com.klp.service.IWmsContractService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 合同信息 + * + * @author Joshi + * @date 2025-08-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/contract") +public class WmsContractController extends BaseController { + + private final IWmsContractService iWmsContractService; + + /** + * 查询合同信息列表 + */ + @SaCheckPermission("wms:contract:list") + @GetMapping("/list") + public TableDataInfo list(WmsContractBo bo, PageQuery pageQuery) { + return iWmsContractService.queryPageList(bo, pageQuery); + } + + /** + * 导出合同信息列表 + */ + @SaCheckPermission("wms:contract:export") + @Log(title = "合同信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsContractBo bo, HttpServletResponse response) { + List list = iWmsContractService.queryList(bo); + ExcelUtil.exportExcel(list, "合同信息", WmsContractVo.class, response); + } + + /** + * 获取合同信息详细信息 + * + * @param contractId 主键 + */ + @SaCheckPermission("wms:contract:query") + @GetMapping("/{contractId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long contractId) { + return R.ok(iWmsContractService.queryById(contractId)); + } + + /** + * 新增合同信息 + */ + @SaCheckPermission("wms:contract:add") + @Log(title = "合同信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsContractBo bo) { + return toAjax(iWmsContractService.insertByBo(bo)); + } + + /** + * 修改合同信息 + */ + @SaCheckPermission("wms:contract:edit") + @Log(title = "合同信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsContractBo bo) { + return toAjax(iWmsContractService.updateByBo(bo)); + } + + /** + * 删除合同信息 + * + * @param contractIds 主键串 + */ + @SaCheckPermission("wms:contract:remove") + @Log(title = "合同信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{contractIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] contractIds) { + return toAjax(iWmsContractService.deleteWithValidByIds(Arrays.asList(contractIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsSupplierController.java b/klp-wms/src/main/java/com/klp/controller/WmsSupplierController.java new file mode 100644 index 00000000..ec751a42 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsSupplierController.java @@ -0,0 +1,106 @@ +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 cn.dev33.satoken.annotation.SaCheckPermission; +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.WmsSupplierVo; +import com.klp.domain.bo.WmsSupplierBo; +import com.klp.service.IWmsSupplierService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 供应商信息 + * + * @author Joshi + * @date 2025-08-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/supplier") +public class WmsSupplierController extends BaseController { + + private final IWmsSupplierService iWmsSupplierService; + + /** + * 查询供应商信息列表 + */ + @SaCheckPermission("wms:supplier:list") + @GetMapping("/list") + public TableDataInfo list(WmsSupplierBo bo, PageQuery pageQuery) { + return iWmsSupplierService.queryPageList(bo, pageQuery); + } + + /** + * 导出供应商信息列表 + */ + @SaCheckPermission("wms:supplier:export") + @Log(title = "供应商信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsSupplierBo bo, HttpServletResponse response) { + List list = iWmsSupplierService.queryList(bo); + ExcelUtil.exportExcel(list, "供应商信息", WmsSupplierVo.class, response); + } + + /** + * 获取供应商信息详细信息 + * + * @param supplierId 主键 + */ + @SaCheckPermission("wms:supplier:query") + @GetMapping("/{supplierId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long supplierId) { + return R.ok(iWmsSupplierService.queryById(supplierId)); + } + + /** + * 新增供应商信息 + */ + @SaCheckPermission("wms:supplier:add") + @Log(title = "供应商信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsSupplierBo bo) { + return toAjax(iWmsSupplierService.insertByBo(bo)); + } + + /** + * 修改供应商信息 + */ + @SaCheckPermission("wms:supplier:edit") + @Log(title = "供应商信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsSupplierBo bo) { + return toAjax(iWmsSupplierService.updateByBo(bo)); + } + + /** + * 删除供应商信息 + * + * @param supplierIds 主键串 + */ + @SaCheckPermission("wms:supplier:remove") + @Log(title = "供应商信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{supplierIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] supplierIds) { + return toAjax(iWmsSupplierService.deleteWithValidByIds(Arrays.asList(supplierIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsContract.java b/klp-wms/src/main/java/com/klp/domain/WmsContract.java new file mode 100644 index 00000000..7bab56d2 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsContract.java @@ -0,0 +1,68 @@ +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_contract + * + * @author Joshi + * @date 2025-08-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_contract") +public class WmsContract extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 合同ID（主键） + */ + @TableId(value = "contract_id") + private Long contractId; + /** + * 合同编号（唯一） + */ + private String contractNo; + /** + * 合同金额 + */ + private BigDecimal amount; + /** + * 合同类型（采购合同/销售合同/技术附件...） + */ + private String type; + /** + * 附件 + */ + private String accessory; + /** + * 甲方 + */ + private String partyA; + /** + * 乙方 + */ + private String partyB; + /** + * 签约日期 + */ + private Date signDate; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsSupplier.java b/klp-wms/src/main/java/com/klp/domain/WmsSupplier.java new file mode 100644 index 00000000..064584ca --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsSupplier.java @@ -0,0 +1,53 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 供应商信息对象 wms_supplier + * + * @author Joshi + * @date 2025-08-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_supplier") +public class WmsSupplier extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 供应商ID（主键） + */ + @TableId(value = "supplier_id") + private Long supplierId; + /** + * 供应商名称 + */ + private String name; + /** + * 联系人 + */ + private String contactPerson; + /** + * 联系电话 + */ + private String phone; + /** + * 地址 + */ + private String address; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsContractBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsContractBo.java new file mode 100644 index 00000000..34f77d82 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsContractBo.java @@ -0,0 +1,65 @@ +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_contract + * + * @author Joshi + * @date 2025-08-12 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsContractBo extends BaseEntity { + + private Long contractId; + /** + * 合同编号（唯一） + */ + private String contractNo; + + /** + * 合同金额 + */ + private BigDecimal amount; + + /** + * 合同类型（采购合同/销售合同/技术附件...） + */ + private String type; + + /** + * 附件 + */ + private String accessory; + + /** + * 甲方 + */ + private String partyA; + + /** + * 乙方 + */ + private String partyB; + + /** + * 签约日期 + */ + private Date signDate; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsSupplierBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsSupplierBo.java new file mode 100644 index 00000000..4a3a99b0 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsSupplierBo.java @@ -0,0 +1,51 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 供应商信息业务对象 wms_supplier + * + * @author Joshi + * @date 2025-08-12 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsSupplierBo extends BaseEntity { + + /** + * 供应商ID（主键） + */ + private Long supplierId; + + /** + * 供应商名称 + */ + private String name; + + /** + * 联系人 + */ + private String contactPerson; + + /** + * 联系电话 + */ + private String phone; + + /** + * 地址 + */ + private String address; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsContractVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsContractVo.java new file mode 100644 index 00000000..fa9e3649 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsContractVo.java @@ -0,0 +1,64 @@ +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_contract + * + * @author Joshi + * @date 2025-08-12 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsContractVo { + + private static final long serialVersionUID = 1L; + + /** + * 合同编号（唯一） + */ + @ExcelProperty(value = "合同编号", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "唯=一") + private String contractNo; + + /** + * 合同金额 + */ + @ExcelProperty(value = "合同金额") + private BigDecimal amount; + + /** + * 合同类型（采购合同/销售合同/技术附件...） + */ + @ExcelProperty(value = "合同类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "采=购合同/销售合同/技术附件...") + private String type; + + /** + * 甲方 + */ + @ExcelProperty(value = "甲方") + private String partyA; + + /** + * 乙方 + */ + @ExcelProperty(value = "乙方") + private String partyB; + + /** + * 签约日期 + */ + @ExcelProperty(value = "签约日期") + private Date signDate; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsSupplierVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsSupplierVo.java new file mode 100644 index 00000000..9d22450f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsSupplierVo.java @@ -0,0 +1,60 @@ +package com.klp.domain.vo; + +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_supplier + * + * @author Joshi + * @date 2025-08-12 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsSupplierVo { + + private static final long serialVersionUID = 1L; + + /** + * 供应商ID（主键） + */ + @ExcelProperty(value = "供应商ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "主=键") + private Long supplierId; + + /** + * 供应商名称 + */ + @ExcelProperty(value = "供应商名称") + private String name; + + /** + * 联系人 + */ + @ExcelProperty(value = "联系人") + private String contactPerson; + + /** + * 联系电话 + */ + @ExcelProperty(value = "联系电话") + private String phone; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String address; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsContractMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsContractMapper.java new file mode 100644 index 00000000..be05c864 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsContractMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsContract; +import com.klp.domain.vo.WmsContractVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 合同信息Mapper接口 + * + * @author Joshi + * @date 2025-08-12 + */ +public interface WmsContractMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsSupplierMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsSupplierMapper.java new file mode 100644 index 00000000..bcd988c7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsSupplierMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsSupplier; +import com.klp.domain.vo.WmsSupplierVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 供应商信息Mapper接口 + * + * @author Joshi + * @date 2025-08-12 + */ +public interface WmsSupplierMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsContractService.java b/klp-wms/src/main/java/com/klp/service/IWmsContractService.java new file mode 100644 index 00000000..0692a79d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsContractService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsContract; +import com.klp.domain.vo.WmsContractVo; +import com.klp.domain.bo.WmsContractBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 合同信息Service接口 + * + * @author Joshi + * @date 2025-08-12 + */ +public interface IWmsContractService { + + /** + * 查询合同信息 + */ + WmsContractVo queryById(Long contractId); + + /** + * 查询合同信息列表 + */ + TableDataInfo queryPageList(WmsContractBo bo, PageQuery pageQuery); + + /** + * 查询合同信息列表 + */ + List queryList(WmsContractBo bo); + + /** + * 新增合同信息 + */ + Boolean insertByBo(WmsContractBo bo); + + /** + * 修改合同信息 + */ + Boolean updateByBo(WmsContractBo bo); + + /** + * 校验并批量删除合同信息信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsSupplierService.java b/klp-wms/src/main/java/com/klp/service/IWmsSupplierService.java new file mode 100644 index 00000000..1947123d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsSupplierService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsSupplier; +import com.klp.domain.vo.WmsSupplierVo; +import com.klp.domain.bo.WmsSupplierBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 供应商信息Service接口 + * + * @author Joshi + * @date 2025-08-12 + */ +public interface IWmsSupplierService { + + /** + * 查询供应商信息 + */ + WmsSupplierVo queryById(Long supplierId); + + /** + * 查询供应商信息列表 + */ + TableDataInfo queryPageList(WmsSupplierBo bo, PageQuery pageQuery); + + /** + * 查询供应商信息列表 + */ + List queryList(WmsSupplierBo bo); + + /** + * 新增供应商信息 + */ + Boolean insertByBo(WmsSupplierBo bo); + + /** + * 修改供应商信息 + */ + Boolean updateByBo(WmsSupplierBo bo); + + /** + * 校验并批量删除供应商信息信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsContractServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsContractServiceImpl.java new file mode 100644 index 00000000..d522d6a6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsContractServiceImpl.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.WmsContractBo; +import com.klp.domain.vo.WmsContractVo; +import com.klp.domain.WmsContract; +import com.klp.mapper.WmsContractMapper; +import com.klp.service.IWmsContractService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 合同信息Service业务层处理 + * + * @author Joshi + * @date 2025-08-12 + */ +@RequiredArgsConstructor +@Service +public class WmsContractServiceImpl implements IWmsContractService { + + private final WmsContractMapper baseMapper; + + /** + * 查询合同信息 + */ + @Override + public WmsContractVo queryById(Long contractId){ + return baseMapper.selectVoById(contractId); + } + + /** + * 查询合同信息列表 + */ + @Override + public TableDataInfo queryPageList(WmsContractBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询合同信息列表 + */ + @Override + public List queryList(WmsContractBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsContractBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getContractNo()), WmsContract::getContractNo, bo.getContractNo()); + lqw.eq(StringUtils.isNotBlank(bo.getPartyA()), WmsContract::getPartyA, bo.getPartyA()); + lqw.eq(StringUtils.isNotBlank(bo.getPartyB()), WmsContract::getPartyB, bo.getPartyB()); + return lqw; + } + + /** + * 新增合同信息 + */ + @Override + public Boolean insertByBo(WmsContractBo bo) { + WmsContract add = BeanUtil.toBean(bo, WmsContract.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setContractId(add.getContractId()); + } + return flag; + } + + /** + * 修改合同信息 + */ + @Override + public Boolean updateByBo(WmsContractBo bo) { + WmsContract update = BeanUtil.toBean(bo, WmsContract.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsContract 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/WmsSupplierServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsSupplierServiceImpl.java new file mode 100644 index 00000000..f485f990 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsSupplierServiceImpl.java @@ -0,0 +1,112 @@ +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.WmsSupplierBo; +import com.klp.domain.vo.WmsSupplierVo; +import com.klp.domain.WmsSupplier; +import com.klp.mapper.WmsSupplierMapper; +import com.klp.service.IWmsSupplierService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 供应商信息Service业务层处理 + * + * @author Joshi + * @date 2025-08-12 + */ +@RequiredArgsConstructor +@Service +public class WmsSupplierServiceImpl implements IWmsSupplierService { + + private final WmsSupplierMapper baseMapper; + + /** + * 查询供应商信息 + */ + @Override + public WmsSupplierVo queryById(Long supplierId){ + return baseMapper.selectVoById(supplierId); + } + + /** + * 查询供应商信息列表 + */ + @Override + public TableDataInfo queryPageList(WmsSupplierBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询供应商信息列表 + */ + @Override + public List queryList(WmsSupplierBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsSupplierBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getName()), WmsSupplier::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getContactPerson()), WmsSupplier::getContactPerson, bo.getContactPerson()); + lqw.eq(StringUtils.isNotBlank(bo.getPhone()), WmsSupplier::getPhone, bo.getPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getAddress()), WmsSupplier::getAddress, bo.getAddress()); + return lqw; + } + + /** + * 新增供应商信息 + */ + @Override + public Boolean insertByBo(WmsSupplierBo bo) { + WmsSupplier add = BeanUtil.toBean(bo, WmsSupplier.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSupplierId(add.getSupplierId()); + } + return flag; + } + + /** + * 修改供应商信息 + */ + @Override + public Boolean updateByBo(WmsSupplierBo bo) { + WmsSupplier update = BeanUtil.toBean(bo, WmsSupplier.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsSupplier 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/WmsContractMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsContractMapper.xml new file mode 100644 index 00000000..bb434b20 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsContractMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsSupplierMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsSupplierMapper.xml new file mode 100644 index 00000000..66595be3 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsSupplierMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + +