From 99cebf6e1c26fcd9a9a1117a622795a6de3680c9 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Mon, 25 Aug 2025 15:26:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=88=B6?= =?UTF-8?q?=E9=80=A0=E8=A7=84=E8=8C=83=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增制造规范相关的数据模型、接口、控制器、服务实现和映射文件 - 实现了制造规范的查询、新增、修改和删除功能 - 添加了制造规范的导出功能- 优化了制造规范的查询条件和结果展示 --- .../WmsManufacturingSpecController.java | 99 +++++++++++++ .../com/klp/domain/WmsManufacturingSpec.java | 108 ++++++++++++++ .../klp/domain/bo/WmsManufacturingSpecBo.java | 116 +++++++++++++++ .../klp/domain/vo/WmsManufacturingSpecVo.java | 137 ++++++++++++++++++ .../mapper/WmsManufacturingSpecMapper.java | 15 ++ .../service/IWmsManufacturingSpecService.java | 49 +++++++ .../impl/WmsManufacturingSpecServiceImpl.java | 124 ++++++++++++++++ .../mapper/klp/WmsManufacturingSpecMapper.xml | 35 +++++ 8 files changed, 683 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsManufacturingSpecController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsManufacturingSpec.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsManufacturingSpecBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsManufacturingSpecVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsManufacturingSpecMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsManufacturingSpecService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsManufacturingSpecServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsManufacturingSpecMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsManufacturingSpecController.java b/klp-wms/src/main/java/com/klp/controller/WmsManufacturingSpecController.java new file mode 100644 index 00000000..b265000e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsManufacturingSpecController.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.WmsManufacturingSpecVo; +import com.klp.domain.bo.WmsManufacturingSpecBo; +import com.klp.service.IWmsManufacturingSpecService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 制造规范 + * + * @author klp + * @date 2025-08-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/klp/manufacturingSpec") +public class WmsManufacturingSpecController extends BaseController { + + private final IWmsManufacturingSpecService iWmsManufacturingSpecService; + + /** + * 查询制造规范列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsManufacturingSpecBo bo, PageQuery pageQuery) { + return iWmsManufacturingSpecService.queryPageList(bo, pageQuery); + } + + /** + * 导出制造规范列表 + */ + @Log(title = "制造规范", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsManufacturingSpecBo bo, HttpServletResponse response) { + List list = iWmsManufacturingSpecService.queryList(bo); + ExcelUtil.exportExcel(list, "制造规范", WmsManufacturingSpecVo.class, response); + } + + /** + * 获取制造规范详细信息 + * + * @param specId 主键 + */ + @GetMapping("/{specId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long specId) { + return R.ok(iWmsManufacturingSpecService.queryById(specId)); + } + + /** + * 新增制造规范 + */ + @Log(title = "制造规范", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsManufacturingSpecBo bo) { + return toAjax(iWmsManufacturingSpecService.insertByBo(bo)); + } + + /** + * 修改制造规范 + */ + @Log(title = "制造规范", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsManufacturingSpecBo bo) { + return toAjax(iWmsManufacturingSpecService.updateByBo(bo)); + } + + /** + * 删除制造规范 + * + * @param specIds 主键串 + */ + @Log(title = "制造规范", businessType = BusinessType.DELETE) + @DeleteMapping("/{specIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] specIds) { + return toAjax(iWmsManufacturingSpecService.deleteWithValidByIds(Arrays.asList(specIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsManufacturingSpec.java b/klp-wms/src/main/java/com/klp/domain/WmsManufacturingSpec.java new file mode 100644 index 00000000..ce1d82de --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsManufacturingSpec.java @@ -0,0 +1,108 @@ +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; + +/** + * 制造规范对象 wms_manufacturing_spec + * + * @author klp + * @date 2025-08-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_manufacturing_spec") +public class WmsManufacturingSpec extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键 + */ + @TableId(value = "spec_id") + private Long specId; + /** + * 制造规范编码 + */ + private String specCode; + /** + * 制造规范名称 + */ + private String specName; + /** + * 所属事业部 + */ + private String businessUnit; + /** + * 所属项目组 + */ + private String projectTeam; + /** + * 产品型号/模组 + */ + private String productModule; + /** + * 标识 + */ + private String identifier; + /** + * 材质 + */ + private String material; + /** + * 规格/尺寸 + */ + private String specification; + /** + * 工艺路线 + */ + private String processRoute; + /** + * 工艺参数 + */ + private String processParams; + /** + * 适用范围 + */ + private String scope; + /** + * 检验标准 + */ + private String inspectionStandard; + /** + * 状态（字典：1=启用，2=未启用，3=作废） + */ + private Long status; + /** + * 规范类型（字典：1=普通规范，2=新试规范，3=临时规范） + */ + private Long specType; + /** + * 版本号 + */ + @Version + private BigDecimal version; + /** + * 版本日期 + */ + private Date versionDate; + /** + * 理论工时(h) + */ + private BigDecimal standardHours; + /** + * 删除标志（0=正常，1=删除） + */ + @TableLogic + private Long delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsManufacturingSpecBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsManufacturingSpecBo.java new file mode 100644 index 00000000..5ea09cf4 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsManufacturingSpecBo.java @@ -0,0 +1,116 @@ +package com.klp.domain.bo; + +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; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 制造规范业务对象 wms_manufacturing_spec + * + * @author klp + * @date 2025-08-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsManufacturingSpecBo extends BaseEntity { + + /** + * 主键 + */ + private Long specId; + + /** + * 制造规范编码 + */ + private String specCode; + + /** + * 制造规范名称 + */ + private String specName; + + /** + * 所属事业部 + */ + private String businessUnit; + + /** + * 所属项目组 + */ + private String projectTeam; + + /** + * 产品型号/模组 + */ + private String productModule; + + /** + * 标识 + */ + private String identifier; + + /** + * 材质 + */ + private String material; + + /** + * 规格/尺寸 + */ + private String specification; + + /** + * 工艺路线 + */ + private String processRoute; + + /** + * 工艺参数 + */ + private String processParams; + + /** + * 适用范围 + */ + private String scope; + + /** + * 检验标准 + */ + private String inspectionStandard; + + /** + * 状态（字典：1=启用，2=未启用，3=作废） + */ + private Long status; + + /** + * 规范类型（字典：1=普通规范，2=新试规范，3=临时规范） + */ + private Long specType; + + /** + * 版本日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date versionDate; + + /** + * 理论工时(h) + */ + private BigDecimal standardHours; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsManufacturingSpecVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsManufacturingSpecVo.java new file mode 100644 index 00000000..3578015d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsManufacturingSpecVo.java @@ -0,0 +1,137 @@ +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_manufacturing_spec + * + * @author klp + * @date 2025-08-25 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsManufacturingSpecVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long specId; + + /** + * 制造规范编码 + */ + @ExcelProperty(value = "制造规范编码") + private String specCode; + + /** + * 制造规范名称 + */ + @ExcelProperty(value = "制造规范名称") + private String specName; + + /** + * 所属事业部 + */ + @ExcelProperty(value = "所属事业部") + private String businessUnit; + + /** + * 所属项目组 + */ + @ExcelProperty(value = "所属项目组") + private String projectTeam; + + /** + * 产品型号/模组 + */ + @ExcelProperty(value = "产品型号/模组") + private String productModule; + + /** + * 标识 + */ + @ExcelProperty(value = "标识") + private String identifier; + + /** + * 材质 + */ + @ExcelProperty(value = "材质") + private String material; + + /** + * 规格/尺寸 + */ + @ExcelProperty(value = "规格/尺寸") + private String specification; + + /** + * 工艺路线 + */ + @ExcelProperty(value = "工艺路线") + private String processRoute; + + /** + * 工艺参数 + */ + @ExcelProperty(value = "工艺参数") + private String processParams; + + /** + * 适用范围 + */ + @ExcelProperty(value = "适用范围") + private String scope; + + /** + * 检验标准 + */ + @ExcelProperty(value = "检验标准") + private String inspectionStandard; + + /** + * 状态（字典：1=启用，2=未启用，3=作废） + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "字=典：1=启用，2=未启用，3=作废") + private Long status; + + /** + * 规范类型（字典：1=普通规范，2=新试规范，3=临时规范） + */ + @ExcelProperty(value = "规范类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "字=典：1=普通规范，2=新试规范，3=临时规范") + private Long specType; + + /** + * 版本日期 + */ + @ExcelProperty(value = "版本日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date versionDate; + + /** + * 理论工时(h) + */ + @ExcelProperty(value = "理论工时(h)") + private BigDecimal standardHours; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsManufacturingSpecMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsManufacturingSpecMapper.java new file mode 100644 index 00000000..dbb49bc9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsManufacturingSpecMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsManufacturingSpec; +import com.klp.domain.vo.WmsManufacturingSpecVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 制造规范Mapper接口 + * + * @author klp + * @date 2025-08-25 + */ +public interface WmsManufacturingSpecMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsManufacturingSpecService.java b/klp-wms/src/main/java/com/klp/service/IWmsManufacturingSpecService.java new file mode 100644 index 00000000..eb179b4d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsManufacturingSpecService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsManufacturingSpec; +import com.klp.domain.vo.WmsManufacturingSpecVo; +import com.klp.domain.bo.WmsManufacturingSpecBo; +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 2025-08-25 + */ +public interface IWmsManufacturingSpecService { + + /** + * 查询制造规范 + */ + WmsManufacturingSpecVo queryById(Long specId); + + /** + * 查询制造规范列表 + */ + TableDataInfo queryPageList(WmsManufacturingSpecBo bo, PageQuery pageQuery); + + /** + * 查询制造规范列表 + */ + List queryList(WmsManufacturingSpecBo bo); + + /** + * 新增制造规范 + */ + Boolean insertByBo(WmsManufacturingSpecBo bo); + + /** + * 修改制造规范 + */ + Boolean updateByBo(WmsManufacturingSpecBo bo); + + /** + * 校验并批量删除制造规范信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsManufacturingSpecServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsManufacturingSpecServiceImpl.java new file mode 100644 index 00000000..5c26f905 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsManufacturingSpecServiceImpl.java @@ -0,0 +1,124 @@ +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.WmsManufacturingSpecBo; +import com.klp.domain.vo.WmsManufacturingSpecVo; +import com.klp.domain.WmsManufacturingSpec; +import com.klp.mapper.WmsManufacturingSpecMapper; +import com.klp.service.IWmsManufacturingSpecService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 制造规范Service业务层处理 + * + * @author klp + * @date 2025-08-25 + */ +@RequiredArgsConstructor +@Service +public class WmsManufacturingSpecServiceImpl implements IWmsManufacturingSpecService { + + private final WmsManufacturingSpecMapper baseMapper; + + /** + * 查询制造规范 + */ + @Override + public WmsManufacturingSpecVo queryById(Long specId){ + return baseMapper.selectVoById(specId); + } + + /** + * 查询制造规范列表 + */ + @Override + public TableDataInfo queryPageList(WmsManufacturingSpecBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询制造规范列表 + */ + @Override + public List queryList(WmsManufacturingSpecBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsManufacturingSpecBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getSpecCode()), WmsManufacturingSpec::getSpecCode, bo.getSpecCode()); + lqw.like(StringUtils.isNotBlank(bo.getSpecName()), WmsManufacturingSpec::getSpecName, bo.getSpecName()); + lqw.eq(StringUtils.isNotBlank(bo.getBusinessUnit()), WmsManufacturingSpec::getBusinessUnit, bo.getBusinessUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getProjectTeam()), WmsManufacturingSpec::getProjectTeam, bo.getProjectTeam()); + lqw.eq(StringUtils.isNotBlank(bo.getProductModule()), WmsManufacturingSpec::getProductModule, bo.getProductModule()); + lqw.eq(StringUtils.isNotBlank(bo.getIdentifier()), WmsManufacturingSpec::getIdentifier, bo.getIdentifier()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), WmsManufacturingSpec::getMaterial, bo.getMaterial()); + lqw.eq(StringUtils.isNotBlank(bo.getSpecification()), WmsManufacturingSpec::getSpecification, bo.getSpecification()); + lqw.eq(StringUtils.isNotBlank(bo.getProcessRoute()), WmsManufacturingSpec::getProcessRoute, bo.getProcessRoute()); + lqw.eq(StringUtils.isNotBlank(bo.getProcessParams()), WmsManufacturingSpec::getProcessParams, bo.getProcessParams()); + lqw.eq(StringUtils.isNotBlank(bo.getScope()), WmsManufacturingSpec::getScope, bo.getScope()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectionStandard()), WmsManufacturingSpec::getInspectionStandard, bo.getInspectionStandard()); + lqw.eq(bo.getStatus() != null, WmsManufacturingSpec::getStatus, bo.getStatus()); + lqw.eq(bo.getSpecType() != null, WmsManufacturingSpec::getSpecType, bo.getSpecType()); + lqw.eq(bo.getVersionDate() != null, WmsManufacturingSpec::getVersionDate, bo.getVersionDate()); + lqw.eq(bo.getStandardHours() != null, WmsManufacturingSpec::getStandardHours, bo.getStandardHours()); + return lqw; + } + + /** + * 新增制造规范 + */ + @Override + public Boolean insertByBo(WmsManufacturingSpecBo bo) { + WmsManufacturingSpec add = BeanUtil.toBean(bo, WmsManufacturingSpec.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSpecId(add.getSpecId()); + } + return flag; + } + + /** + * 修改制造规范 + */ + @Override + public Boolean updateByBo(WmsManufacturingSpecBo bo) { + WmsManufacturingSpec update = BeanUtil.toBean(bo, WmsManufacturingSpec.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsManufacturingSpec 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/WmsManufacturingSpecMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsManufacturingSpecMapper.xml new file mode 100644 index 00000000..0738c04c --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsManufacturingSpecMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +