diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCoilStatisticsSummaryController.java b/klp-wms/src/main/java/com/klp/controller/WmsCoilStatisticsSummaryController.java new file mode 100644 index 00000000..8bfc0714 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsCoilStatisticsSummaryController.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.WmsCoilStatisticsSummaryVo; +import com.klp.domain.bo.WmsCoilStatisticsSummaryBo; +import com.klp.service.IWmsCoilStatisticsSummaryService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 钢卷生产统计汇总（数据透视结果持久化） + * + * @author klp + * @date 2026-03-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/coilStatisticsSummary") +public class WmsCoilStatisticsSummaryController extends BaseController { + + private final IWmsCoilStatisticsSummaryService iWmsCoilStatisticsSummaryService; + + /** + * 查询钢卷生产统计汇总（数据透视结果持久化）列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsCoilStatisticsSummaryBo bo, PageQuery pageQuery) { + return iWmsCoilStatisticsSummaryService.queryPageList(bo, pageQuery); + } + + /** + * 导出钢卷生产统计汇总（数据透视结果持久化）列表 + */ + @Log(title = "钢卷生产统计汇总（数据透视结果持久化）", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCoilStatisticsSummaryBo bo, HttpServletResponse response) { + List list = iWmsCoilStatisticsSummaryService.queryList(bo); + ExcelUtil.exportExcel(list, "钢卷生产统计汇总（数据透视结果持久化）", WmsCoilStatisticsSummaryVo.class, response); + } + + /** + * 获取钢卷生产统计汇总（数据透视结果持久化）详细信息 + * + * @param summaryId 主键 + */ + @GetMapping("/{summaryId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long summaryId) { + return R.ok(iWmsCoilStatisticsSummaryService.queryById(summaryId)); + } + + /** + * 新增钢卷生产统计汇总（数据透视结果持久化） + */ + @Log(title = "钢卷生产统计汇总（数据透视结果持久化）", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCoilStatisticsSummaryBo bo) { + return toAjax(iWmsCoilStatisticsSummaryService.insertByBo(bo)); + } + + /** + * 修改钢卷生产统计汇总（数据透视结果持久化） + */ + @Log(title = "钢卷生产统计汇总（数据透视结果持久化）", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCoilStatisticsSummaryBo bo) { + return toAjax(iWmsCoilStatisticsSummaryService.updateByBo(bo)); + } + + /** + * 删除钢卷生产统计汇总（数据透视结果持久化） + * + * @param summaryIds 主键串 + */ + @Log(title = "钢卷生产统计汇总（数据透视结果持久化）", businessType = BusinessType.DELETE) + @DeleteMapping("/{summaryIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] summaryIds) { + return toAjax(iWmsCoilStatisticsSummaryService.deleteWithValidByIds(Arrays.asList(summaryIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilStatisticsSummary.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilStatisticsSummary.java new file mode 100644 index 00000000..017fa869 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilStatisticsSummary.java @@ -0,0 +1,49 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 钢卷生产统计汇总（数据透视结果持久化）对象 wms_coil_statistics_summary + * + * @author klp + * @date 2026-03-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_coil_statistics_summary") +public class WmsCoilStatisticsSummary extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "summary_id") + private Long summaryId; + /** + * 统计标题（如：2026年3月冷硬卷切边统计、2026年一季度钢卷产量统计） + */ + private String title; + /** + * 统计类型（枚举：COIL_TRIM-切边统计、COIL_PRODUCTION-产量统计、COIL_STOCK-库存统计、COIL_QUALITY-质量统计等） + */ + private String statType; + /** + * 统计结果JSON字符串（存储透视分析结果，支持大文本） + */ + private String statJson; + /** + * 备注 + */ + private String remark; + /** + * 删除标识 0正常 2删除 + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilStatisticsSummaryBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilStatisticsSummaryBo.java new file mode 100644 index 00000000..72dc4229 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilStatisticsSummaryBo.java @@ -0,0 +1,46 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 钢卷生产统计汇总（数据透视结果持久化）业务对象 wms_coil_statistics_summary + * + * @author klp + * @date 2026-03-07 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCoilStatisticsSummaryBo extends BaseEntity { + + /** + * 主键ID + */ + private Long summaryId; + + /** + * 统计标题（如：2026年3月冷硬卷切边统计、2026年一季度钢卷产量统计） + */ + private String title; + + /** + * 统计类型（枚举：COIL_TRIM-切边统计、COIL_PRODUCTION-产量统计、COIL_STOCK-库存统计、COIL_QUALITY-质量统计等） + */ + private String statType; + + /** + * 统计结果JSON字符串（存储透视分析结果，支持大文本） + */ + private String statJson; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilStatisticsSummaryVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilStatisticsSummaryVo.java new file mode 100644 index 00000000..67d59db9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilStatisticsSummaryVo.java @@ -0,0 +1,56 @@ +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_coil_statistics_summary + * + * @author klp + * @date 2026-03-07 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCoilStatisticsSummaryVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long summaryId; + + /** + * 统计标题（如：2026年3月冷硬卷切边统计、2026年一季度钢卷产量统计） + */ + @ExcelProperty(value = "统计标题", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=：2026年3月冷硬卷切边统计、2026年一季度钢卷产量统计") + private String title; + + /** + * 统计类型（枚举：COIL_TRIM-切边统计、COIL_PRODUCTION-产量统计、COIL_STOCK-库存统计、COIL_QUALITY-质量统计等） + */ + @ExcelProperty(value = "统计类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "枚=举：COIL_TRIM-切边统计、COIL_PRODUCTION-产量统计、COIL_STOCK-库存统计、COIL_QUALITY-质量统计等") + private String statType; + + /** + * 统计结果JSON字符串（存储透视分析结果，支持大文本） + */ + @ExcelProperty(value = "统计结果JSON字符串", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "存=储透视分析结果，支持大文本") + private String statJson; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCoilStatisticsSummaryMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCoilStatisticsSummaryMapper.java new file mode 100644 index 00000000..27f6e08b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCoilStatisticsSummaryMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsCoilStatisticsSummary; +import com.klp.domain.vo.WmsCoilStatisticsSummaryVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 钢卷生产统计汇总（数据透视结果持久化）Mapper接口 + * + * @author klp + * @date 2026-03-07 + */ +public interface WmsCoilStatisticsSummaryMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCoilStatisticsSummaryService.java b/klp-wms/src/main/java/com/klp/service/IWmsCoilStatisticsSummaryService.java new file mode 100644 index 00000000..b2b81a24 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsCoilStatisticsSummaryService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsCoilStatisticsSummary; +import com.klp.domain.vo.WmsCoilStatisticsSummaryVo; +import com.klp.domain.bo.WmsCoilStatisticsSummaryBo; +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-03-07 + */ +public interface IWmsCoilStatisticsSummaryService { + + /** + * 查询钢卷生产统计汇总（数据透视结果持久化） + */ + WmsCoilStatisticsSummaryVo queryById(Long summaryId); + + /** + * 查询钢卷生产统计汇总（数据透视结果持久化）列表 + */ + TableDataInfo queryPageList(WmsCoilStatisticsSummaryBo bo, PageQuery pageQuery); + + /** + * 查询钢卷生产统计汇总（数据透视结果持久化）列表 + */ + List queryList(WmsCoilStatisticsSummaryBo bo); + + /** + * 新增钢卷生产统计汇总（数据透视结果持久化） + */ + Boolean insertByBo(WmsCoilStatisticsSummaryBo bo); + + /** + * 修改钢卷生产统计汇总（数据透视结果持久化） + */ + Boolean updateByBo(WmsCoilStatisticsSummaryBo bo); + + /** + * 校验并批量删除钢卷生产统计汇总（数据透视结果持久化）信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilStatisticsSummaryServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilStatisticsSummaryServiceImpl.java new file mode 100644 index 00000000..36397bda --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilStatisticsSummaryServiceImpl.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.WmsCoilStatisticsSummaryBo; +import com.klp.domain.vo.WmsCoilStatisticsSummaryVo; +import com.klp.domain.WmsCoilStatisticsSummary; +import com.klp.mapper.WmsCoilStatisticsSummaryMapper; +import com.klp.service.IWmsCoilStatisticsSummaryService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 钢卷生产统计汇总（数据透视结果持久化）Service业务层处理 + * + * @author klp + * @date 2026-03-07 + */ +@RequiredArgsConstructor +@Service +public class WmsCoilStatisticsSummaryServiceImpl implements IWmsCoilStatisticsSummaryService { + + private final WmsCoilStatisticsSummaryMapper baseMapper; + + /** + * 查询钢卷生产统计汇总（数据透视结果持久化） + */ + @Override + public WmsCoilStatisticsSummaryVo queryById(Long summaryId){ + return baseMapper.selectVoById(summaryId); + } + + /** + * 查询钢卷生产统计汇总（数据透视结果持久化）列表 + */ + @Override + public TableDataInfo queryPageList(WmsCoilStatisticsSummaryBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询钢卷生产统计汇总（数据透视结果持久化）列表 + */ + @Override + public List queryList(WmsCoilStatisticsSummaryBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCoilStatisticsSummaryBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTitle()), WmsCoilStatisticsSummary::getTitle, bo.getTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getStatType()), WmsCoilStatisticsSummary::getStatType, bo.getStatType()); + lqw.eq(StringUtils.isNotBlank(bo.getStatJson()), WmsCoilStatisticsSummary::getStatJson, bo.getStatJson()); + return lqw; + } + + /** + * 新增钢卷生产统计汇总（数据透视结果持久化） + */ + @Override + public Boolean insertByBo(WmsCoilStatisticsSummaryBo bo) { + WmsCoilStatisticsSummary add = BeanUtil.toBean(bo, WmsCoilStatisticsSummary.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSummaryId(add.getSummaryId()); + } + return flag; + } + + /** + * 修改钢卷生产统计汇总（数据透视结果持久化） + */ + @Override + public Boolean updateByBo(WmsCoilStatisticsSummaryBo bo) { + WmsCoilStatisticsSummary update = BeanUtil.toBean(bo, WmsCoilStatisticsSummary.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCoilStatisticsSummary 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/WmsCoilStatisticsSummaryMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilStatisticsSummaryMapper.xml new file mode 100644 index 00000000..78bff2be --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilStatisticsSummaryMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + +