diff --git a/klp-wms/src/main/java/com/klp/controller/WmsInspectionDetailController.java b/klp-wms/src/main/java/com/klp/controller/WmsInspectionDetailController.java new file mode 100644 index 00000000..207b77c6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsInspectionDetailController.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.WmsInspectionDetailVo; +import com.klp.domain.bo.WmsInspectionDetailBo; +import com.klp.service.IWmsInspectionDetailService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检验项目明细 + * + * @author klp + * @date 2026-06-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/inspectionDetail") +public class WmsInspectionDetailController extends BaseController { + + private final IWmsInspectionDetailService iWmsInspectionDetailService; + + /** + * 查询检验项目明细列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsInspectionDetailBo bo, PageQuery pageQuery) { + return iWmsInspectionDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出检验项目明细列表 + */ + @Log(title = "检验项目明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsInspectionDetailBo bo, HttpServletResponse response) { + List list = iWmsInspectionDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "检验项目明细", WmsInspectionDetailVo.class, response); + } + + /** + * 获取检验项目明细详细信息 + * + * @param detailId 主键 + */ + @GetMapping("/{detailId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long detailId) { + return R.ok(iWmsInspectionDetailService.queryById(detailId)); + } + + /** + * 新增检验项目明细 + */ + @Log(title = "检验项目明细", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsInspectionDetailBo bo) { + return toAjax(iWmsInspectionDetailService.insertByBo(bo)); + } + + /** + * 修改检验项目明细 + */ + @Log(title = "检验项目明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsInspectionDetailBo bo) { + return toAjax(iWmsInspectionDetailService.updateByBo(bo)); + } + + /** + * 删除检验项目明细 + * + * @param detailIds 主键串 + */ + @Log(title = "检验项目明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{detailIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] detailIds) { + return toAjax(iWmsInspectionDetailService.deleteWithValidByIds(Arrays.asList(detailIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsInspectionMainController.java b/klp-wms/src/main/java/com/klp/controller/WmsInspectionMainController.java new file mode 100644 index 00000000..1c190b35 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsInspectionMainController.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.WmsInspectionMainVo; +import com.klp.domain.bo.WmsInspectionMainBo; +import com.klp.service.IWmsInspectionMainService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检验主 + * + * @author klp + * @date 2026-06-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/inspectionMain") +public class WmsInspectionMainController extends BaseController { + + private final IWmsInspectionMainService iWmsInspectionMainService; + + /** + * 查询检验主列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsInspectionMainBo bo, PageQuery pageQuery) { + return iWmsInspectionMainService.queryPageList(bo, pageQuery); + } + + /** + * 导出检验主列表 + */ + @Log(title = "检验主", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsInspectionMainBo bo, HttpServletResponse response) { + List list = iWmsInspectionMainService.queryList(bo); + ExcelUtil.exportExcel(list, "检验主", WmsInspectionMainVo.class, response); + } + + /** + * 获取检验主详细信息 + * + * @param mainId 主键 + */ + @GetMapping("/{mainId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long mainId) { + return R.ok(iWmsInspectionMainService.queryById(mainId)); + } + + /** + * 新增检验主 + */ + @Log(title = "检验主", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsInspectionMainBo bo) { + return toAjax(iWmsInspectionMainService.insertByBo(bo)); + } + + /** + * 修改检验主 + */ + @Log(title = "检验主", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsInspectionMainBo bo) { + return toAjax(iWmsInspectionMainService.updateByBo(bo)); + } + + /** + * 删除检验主 + * + * @param mainIds 主键串 + */ + @Log(title = "检验主", businessType = BusinessType.DELETE) + @DeleteMapping("/{mainIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] mainIds) { + return toAjax(iWmsInspectionMainService.deleteWithValidByIds(Arrays.asList(mainIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsInspectionTensileController.java b/klp-wms/src/main/java/com/klp/controller/WmsInspectionTensileController.java new file mode 100644 index 00000000..d194f553 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsInspectionTensileController.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.WmsInspectionTensileVo; +import com.klp.domain.bo.WmsInspectionTensileBo; +import com.klp.service.IWmsInspectionTensileService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 金属材料室温拉伸试验主记录 + * + * @author klp + * @date 2026-06-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/inspectionTensile") +public class WmsInspectionTensileController extends BaseController { + + private final IWmsInspectionTensileService iWmsInspectionTensileService; + + /** + * 查询金属材料室温拉伸试验主记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsInspectionTensileBo bo, PageQuery pageQuery) { + return iWmsInspectionTensileService.queryPageList(bo, pageQuery); + } + + /** + * 导出金属材料室温拉伸试验主记录列表 + */ + @Log(title = "金属材料室温拉伸试验主记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsInspectionTensileBo bo, HttpServletResponse response) { + List list = iWmsInspectionTensileService.queryList(bo); + ExcelUtil.exportExcel(list, "金属材料室温拉伸试验主记录", WmsInspectionTensileVo.class, response); + } + + /** + * 获取金属材料室温拉伸试验主记录详细信息 + * + * @param testId 主键 + */ + @GetMapping("/{testId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String testId) { + return R.ok(iWmsInspectionTensileService.queryById(testId)); + } + + /** + * 新增金属材料室温拉伸试验主记录 + */ + @Log(title = "金属材料室温拉伸试验主记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsInspectionTensileBo bo) { + return toAjax(iWmsInspectionTensileService.insertByBo(bo)); + } + + /** + * 修改金属材料室温拉伸试验主记录 + */ + @Log(title = "金属材料室温拉伸试验主记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsInspectionTensileBo bo) { + return toAjax(iWmsInspectionTensileService.updateByBo(bo)); + } + + /** + * 删除金属材料室温拉伸试验主记录 + * + * @param testIds 主键串 + */ + @Log(title = "金属材料室温拉伸试验主记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{testIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] testIds) { + return toAjax(iWmsInspectionTensileService.deleteWithValidByIds(Arrays.asList(testIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsInspectionTensileDetailController.java b/klp-wms/src/main/java/com/klp/controller/WmsInspectionTensileDetailController.java new file mode 100644 index 00000000..79acd62f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsInspectionTensileDetailController.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.WmsInspectionTensileDetailVo; +import com.klp.domain.bo.WmsInspectionTensileDetailBo; +import com.klp.service.IWmsInspectionTensileDetailService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 金属材料室温拉伸试验样品明细 + * + * @author klp + * @date 2026-06-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/inspectionTensileDetail") +public class WmsInspectionTensileDetailController extends BaseController { + + private final IWmsInspectionTensileDetailService iWmsInspectionTensileDetailService; + + /** + * 查询金属材料室温拉伸试验样品明细列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsInspectionTensileDetailBo bo, PageQuery pageQuery) { + return iWmsInspectionTensileDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出金属材料室温拉伸试验样品明细列表 + */ + @Log(title = "金属材料室温拉伸试验样品明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsInspectionTensileDetailBo bo, HttpServletResponse response) { + List list = iWmsInspectionTensileDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "金属材料室温拉伸试验样品明细", WmsInspectionTensileDetailVo.class, response); + } + + /** + * 获取金属材料室温拉伸试验样品明细详细信息 + * + * @param detailId 主键 + */ + @GetMapping("/{detailId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String detailId) { + return R.ok(iWmsInspectionTensileDetailService.queryById(detailId)); + } + + /** + * 新增金属材料室温拉伸试验样品明细 + */ + @Log(title = "金属材料室温拉伸试验样品明细", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsInspectionTensileDetailBo bo) { + return toAjax(iWmsInspectionTensileDetailService.insertByBo(bo)); + } + + /** + * 修改金属材料室温拉伸试验样品明细 + */ + @Log(title = "金属材料室温拉伸试验样品明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsInspectionTensileDetailBo bo) { + return toAjax(iWmsInspectionTensileDetailService.updateByBo(bo)); + } + + /** + * 删除金属材料室温拉伸试验样品明细 + * + * @param detailIds 主键串 + */ + @Log(title = "金属材料室温拉伸试验样品明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{detailIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] detailIds) { + return toAjax(iWmsInspectionTensileDetailService.deleteWithValidByIds(Arrays.asList(detailIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsInspectionDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsInspectionDetail.java new file mode 100644 index 00000000..316ca856 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsInspectionDetail.java @@ -0,0 +1,66 @@ +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_inspection_detail + * + * @author klp + * @date 2026-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_inspection_detail") +public class WmsInspectionDetail extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "detail_id") + private Long detailId; + /** + * 关联主表ID（wms_inspection_main.main_id） + */ + private Long mainId; + /** + * 分析项目名称（如浓度、PH、电导率等） + */ + private String itemName; + /** + * 检验结果值 + */ + private BigDecimal itemValue; + /** + * 单位（如%、mgKOH/g、us/cm等） + */ + private String itemUnit; + /** + * 上限值 + */ + private BigDecimal upperLimit; + /** + * 下限值 + */ + private BigDecimal lowerLimit; + /** + * 范围描述（如160，方便展示） + */ + private String rangeDesc; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsInspectionMain.java b/klp-wms/src/main/java/com/klp/domain/WmsInspectionMain.java new file mode 100644 index 00000000..eabd3207 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsInspectionMain.java @@ -0,0 +1,63 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 检验主对象 wms_inspection_main + * + * @author klp + * @date 2026-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_inspection_main") +public class WmsInspectionMain extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "main_id") + private Long mainId; + /** + * 检验日期（对应日期列） + */ + private Date inspectionDate; + /** + * 样品名称（对应样品名称列） + */ + private String sampleName; + /** + * 样品编号（对应样品编号列） + */ + private String sampleNo; + /** + * 来样编号（对应来样编号列，如A箱/B箱） + */ + private String batchNo; + /** + * 检验方案ID，关联wms_inspection_item_template + */ + private Long templateId; + /** + * 检验任务配置JSON，存储任务级配置 + */ + private String taskConfigJson; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensile.java b/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensile.java new file mode 100644 index 00000000..a25dede6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensile.java @@ -0,0 +1,65 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 金属材料室温拉伸试验主记录对象 wms_inspection_tensile + * + * @author klp + * @date 2026-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_inspection_tensile") +public class WmsInspectionTensile extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 试验记录主键ID，自增 + */ + @TableId(value = "test_id") + private String testId; + /** + * 试验记录标题 + */ + private String testTitle; + /** + * 执行标准 + */ + private String executeStandard; + /** + * 设备名称 + */ + private String equipmentName; + /** + * 设备型号 + */ + private String equipmentModel; + /** + * 检测环境温度 + */ + private String testTemp; + /** + * 检测环境湿度 + */ + private String testHumidity; + /** + * 生产工序（酸连轧/拉矫/镀锌/镀铬/双机架等） + */ + private String productionProcess; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java new file mode 100644 index 00000000..6c25a282 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java @@ -0,0 +1,208 @@ +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_inspection_tensile_detail + * + * @author klp + * @date 2026-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_inspection_tensile_detail") +public class WmsInspectionTensileDetail extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 样品明细主键ID，自增 + */ + @TableId(value = "detail_id") + private String detailId; + /** + * 关联主表试验记录ID + */ + private String testMainId; + /** + * 样品编号 + */ + private String sampleNo; + /** + * 钢卷号 + */ + private String steelCoilNo; + /** + * 原料号 + */ + private String rawMaterialNo; + /** + * 规格（宽*厚） + */ + private String specification; + /** + * 材质/钢种 + */ + private String material; + /** + * 原料厂家 + */ + private String rawMaterialFactory; + /** + * 生产班组 + */ + private String productionTeam; + /** + * 表面状态 + */ + private String surfaceStatus; + /** + * 生产日期 + */ + private Date productionDate; + /** + * 试验日期 + */ + private Date testDate; + /** + * 试样方向（纵/横） + */ + private String sampleDirection; + /** + * 试样尺寸（宽*厚）mm + */ + private String sampleSize; + /** + * 原始标距 mm + */ + private BigDecimal originalGaugeLength; + /** + * 断后标距 mm + */ + private BigDecimal fractureGaugeLength; + /** + * 最大力 KN + */ + private BigDecimal maxForce; + /** + * 下屈服强度 ReL Mpa + */ + private BigDecimal lowerYieldStrength; + /** + * 抗拉强度 Rm Mpa + */ + private BigDecimal tensileStrength; + /** + * 伸长率 A % + */ + private BigDecimal elongation; + /** + * 硬度 HR/HRB/HR30T + */ + private BigDecimal hardnessHr; + /** + * 硬度 HV + */ + private BigDecimal hardnessHv; + /** + * 镀层重量 上表面3点均值 g/m2 + */ + private BigDecimal coatingWeightTop; + /** + * 镀层重量 下表面3点均值 g/m2 + */ + private BigDecimal coatingWeightBottom; + /** + * 镀层重量 双面3点平均 g/m2 + */ + private BigDecimal coatingWeightAvg; + /** + * 粗糙度 um + */ + private BigDecimal roughness; + /** + * 弯曲试验 90° 结果 + */ + private String bendTest90; + /** + * 弯曲试验 180° 结果 + */ + private String bendTest180; + /** + * 弯曲试验 方向（横向/纵向） + */ + private String bendTestDirection; + /** + * 杯突值 mm + */ + private BigDecimal cuppingValue; + /** + * 表面结构 + */ + private String surfaceStructure; + /** + * 边缘状态 + */ + private String edgeStatus; + /** + * 表面质量 + */ + private String surfaceQuality; + /** + * 镀层表面盐雾试验结果 + */ + private String saltSprayTest; + /** + * 表面处理 + */ + private String surfaceTreatment; + /** + * 后处理 + */ + private String postTreatment; + /** + * 下道工序 + */ + private String nextProcess; + /** + * 化学成分 C % + */ + private BigDecimal cContent; + /** + * 化学成分 Si % + */ + private BigDecimal siContent; + /** + * 化学成分 Mn % + */ + private BigDecimal mnContent; + /** + * 化学成分 P % + */ + private BigDecimal pContent; + /** + * 化学成分 S % + */ + private BigDecimal sContent; + /** + * 化学成分 Al % + */ + private BigDecimal alContent; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionDetailBo.java new file mode 100644 index 00000000..bf759f99 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionDetailBo.java @@ -0,0 +1,67 @@ +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_inspection_detail + * + * @author klp + * @date 2026-06-13 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsInspectionDetailBo extends BaseEntity { + + /** + * 主键ID + */ + private Long detailId; + + /** + * 关联主表ID（wms_inspection_main.main_id） + */ + private Long mainId; + + /** + * 分析项目名称（如浓度、PH、电导率等） + */ + private String itemName; + + /** + * 检验结果值 + */ + private BigDecimal itemValue; + + /** + * 单位（如%、mgKOH/g、us/cm等） + */ + private String itemUnit; + + /** + * 上限值 + */ + private BigDecimal upperLimit; + + /** + * 下限值 + */ + private BigDecimal lowerLimit; + + /** + * 范围描述（如160，方便展示） + */ + private String rangeDesc; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionMainBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionMainBo.java new file mode 100644 index 00000000..c33b5548 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionMainBo.java @@ -0,0 +1,63 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 检验主业务对象 wms_inspection_main + * + * @author klp + * @date 2026-06-13 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsInspectionMainBo extends BaseEntity { + + /** + * 主键ID + */ + private Long mainId; + + /** + * 检验日期（对应日期列） + */ + private Date inspectionDate; + + /** + * 样品名称（对应样品名称列） + */ + private String sampleName; + + /** + * 样品编号（对应样品编号列） + */ + private String sampleNo; + + /** + * 来样编号（对应来样编号列，如A箱/B箱） + */ + private String batchNo; + + /** + * 检验方案ID，关联wms_inspection_item_template + */ + private Long templateId; + + /** + * 检验任务配置JSON，存储任务级配置 + */ + private String taskConfigJson; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileBo.java new file mode 100644 index 00000000..534934b9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileBo.java @@ -0,0 +1,66 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 金属材料室温拉伸试验主记录业务对象 wms_inspection_tensile + * + * @author klp + * @date 2026-06-13 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsInspectionTensileBo extends BaseEntity { + + /** + * 试验记录主键ID，自增 + */ + private String testId; + + /** + * 试验记录标题 + */ + private String testTitle; + + /** + * 执行标准 + */ + private String executeStandard; + + /** + * 设备名称 + */ + private String equipmentName; + + /** + * 设备型号 + */ + private String equipmentModel; + + /** + * 检测环境温度 + */ + private String testTemp; + + /** + * 检测环境湿度 + */ + private String testHumidity; + + /** + * 生产工序（酸连轧/拉矫/镀锌/镀铬/双机架等） + */ + private String productionProcess; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java new file mode 100644 index 00000000..b0e0ac23 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java @@ -0,0 +1,244 @@ +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_inspection_tensile_detail + * + * @author klp + * @date 2026-06-13 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsInspectionTensileDetailBo extends BaseEntity { + + /** + * 样品明细主键ID，自增 + */ + private String detailId; + + /** + * 关联主表试验记录ID + */ + private String testMainId; + + /** + * 样品编号 + */ + private String sampleNo; + + /** + * 钢卷号 + */ + private String steelCoilNo; + + /** + * 原料号 + */ + private String rawMaterialNo; + + /** + * 规格（宽*厚） + */ + private String specification; + + /** + * 材质/钢种 + */ + private String material; + + /** + * 原料厂家 + */ + private String rawMaterialFactory; + + /** + * 生产班组 + */ + private String productionTeam; + + /** + * 表面状态 + */ + private String surfaceStatus; + + /** + * 生产日期 + */ + private Date productionDate; + + /** + * 试验日期 + */ + private Date testDate; + + /** + * 试样方向（纵/横） + */ + private String sampleDirection; + + /** + * 试样尺寸（宽*厚）mm + */ + private String sampleSize; + + /** + * 原始标距 mm + */ + private BigDecimal originalGaugeLength; + + /** + * 断后标距 mm + */ + private BigDecimal fractureGaugeLength; + + /** + * 最大力 KN + */ + private BigDecimal maxForce; + + /** + * 下屈服强度 ReL Mpa + */ + private BigDecimal lowerYieldStrength; + + /** + * 抗拉强度 Rm Mpa + */ + private BigDecimal tensileStrength; + + /** + * 伸长率 A % + */ + private BigDecimal elongation; + + /** + * 硬度 HR/HRB/HR30T + */ + private BigDecimal hardnessHr; + + /** + * 硬度 HV + */ + private BigDecimal hardnessHv; + + /** + * 镀层重量 上表面3点均值 g/m2 + */ + private BigDecimal coatingWeightTop; + + /** + * 镀层重量 下表面3点均值 g/m2 + */ + private BigDecimal coatingWeightBottom; + + /** + * 镀层重量 双面3点平均 g/m2 + */ + private BigDecimal coatingWeightAvg; + + /** + * 粗糙度 um + */ + private BigDecimal roughness; + + /** + * 弯曲试验 90° 结果 + */ + private String bendTest90; + + /** + * 弯曲试验 180° 结果 + */ + private String bendTest180; + + /** + * 弯曲试验 方向（横向/纵向） + */ + private String bendTestDirection; + + /** + * 杯突值 mm + */ + private BigDecimal cuppingValue; + + /** + * 表面结构 + */ + private String surfaceStructure; + + /** + * 边缘状态 + */ + private String edgeStatus; + + /** + * 表面质量 + */ + private String surfaceQuality; + + /** + * 镀层表面盐雾试验结果 + */ + private String saltSprayTest; + + /** + * 表面处理 + */ + private String surfaceTreatment; + + /** + * 后处理 + */ + private String postTreatment; + + /** + * 下道工序 + */ + private String nextProcess; + + /** + * 化学成分 C % + */ + private BigDecimal cContent; + + /** + * 化学成分 Si % + */ + private BigDecimal siContent; + + /** + * 化学成分 Mn % + */ + private BigDecimal mnContent; + + /** + * 化学成分 P % + */ + private BigDecimal pContent; + + /** + * 化学成分 S % + */ + private BigDecimal sContent; + + /** + * 化学成分 Al % + */ + private BigDecimal alContent; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionDetailVo.java new file mode 100644 index 00000000..47332664 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionDetailVo.java @@ -0,0 +1,82 @@ +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_inspection_detail + * + * @author klp + * @date 2026-06-13 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsInspectionDetailVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long detailId; + + /** + * 关联主表ID（wms_inspection_main.main_id） + */ + @ExcelProperty(value = "关联主表ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "w=ms_inspection_main.main_id") + private Long mainId; + + /** + * 分析项目名称（如浓度、PH、电导率等） + */ + @ExcelProperty(value = "分析项目名称", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=浓度、PH、电导率等") + private String itemName; + + /** + * 检验结果值 + */ + @ExcelProperty(value = "检验结果值") + private BigDecimal itemValue; + + /** + * 单位（如%、mgKOH/g、us/cm等） + */ + @ExcelProperty(value = "单位", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=%、mgKOH/g、us/cm等") + private String itemUnit; + + /** + * 上限值 + */ + @ExcelProperty(value = "上限值") + private BigDecimal upperLimit; + + /** + * 下限值 + */ + @ExcelProperty(value = "下限值") + private BigDecimal lowerLimit; + + /** + * 范围描述（如160，方便展示） + */ + @ExcelProperty(value = "范围描述", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=160，方便展示") + private String rangeDesc; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionMainVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionMainVo.java new file mode 100644 index 00000000..aaa8d781 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionMainVo.java @@ -0,0 +1,77 @@ +package com.klp.domain.vo; + +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_inspection_main + * + * @author klp + * @date 2026-06-13 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsInspectionMainVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long mainId; + + /** + * 检验日期（对应日期列） + */ + @ExcelProperty(value = "检验日期", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "对=应日期列") + private Date inspectionDate; + + /** + * 样品名称（对应样品名称列） + */ + @ExcelProperty(value = "样品名称", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "对=应样品名称列") + private String sampleName; + + /** + * 样品编号（对应样品编号列） + */ + @ExcelProperty(value = "样品编号", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "对=应样品编号列") + private String sampleNo; + + /** + * 来样编号（对应来样编号列，如A箱/B箱） + */ + @ExcelProperty(value = "来样编号", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "对=应来样编号列，如A箱/B箱") + private String batchNo; + + /** + * 检验方案ID，关联wms_inspection_item_template + */ + @ExcelProperty(value = "检验方案ID，关联wms_inspection_item_template") + private Long templateId; + + /** + * 检验任务配置JSON，存储任务级配置 + */ + @ExcelProperty(value = "检验任务配置JSON，存储任务级配置") + private String taskConfigJson; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java new file mode 100644 index 00000000..01217839 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java @@ -0,0 +1,294 @@ +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_inspection_tensile_detail + * + * @author klp + * @date 2026-06-13 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsInspectionTensileDetailVo { + + private static final long serialVersionUID = 1L; + + /** + * 样品明细主键ID，自增 + */ + @ExcelProperty(value = "样品明细主键ID，自增") + private String detailId; + + /** + * 关联主表试验记录ID + */ + @ExcelProperty(value = "关联主表试验记录ID") + private String testMainId; + + /** + * 样品编号 + */ + @ExcelProperty(value = "样品编号") + private String sampleNo; + + /** + * 钢卷号 + */ + @ExcelProperty(value = "钢卷号") + private String steelCoilNo; + + /** + * 原料号 + */ + @ExcelProperty(value = "原料号") + private String rawMaterialNo; + + /** + * 规格（宽*厚） + */ + @ExcelProperty(value = "规格", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "宽=*厚") + private String specification; + + /** + * 材质/钢种 + */ + @ExcelProperty(value = "材质/钢种") + private String material; + + /** + * 原料厂家 + */ + @ExcelProperty(value = "原料厂家") + private String rawMaterialFactory; + + /** + * 生产班组 + */ + @ExcelProperty(value = "生产班组") + private String productionTeam; + + /** + * 表面状态 + */ + @ExcelProperty(value = "表面状态") + private String surfaceStatus; + + /** + * 生产日期 + */ + @ExcelProperty(value = "生产日期") + private Date productionDate; + + /** + * 试验日期 + */ + @ExcelProperty(value = "试验日期") + private Date testDate; + + /** + * 试样方向（纵/横） + */ + @ExcelProperty(value = "试样方向", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "纵=/横") + private String sampleDirection; + + /** + * 试样尺寸（宽*厚）mm + */ + @ExcelProperty(value = "试样尺寸", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "宽=*厚") + private String sampleSize; + + /** + * 原始标距 mm + */ + @ExcelProperty(value = "原始标距 mm") + private BigDecimal originalGaugeLength; + + /** + * 断后标距 mm + */ + @ExcelProperty(value = "断后标距 mm") + private BigDecimal fractureGaugeLength; + + /** + * 最大力 KN + */ + @ExcelProperty(value = "最大力 KN") + private BigDecimal maxForce; + + /** + * 下屈服强度 ReL Mpa + */ + @ExcelProperty(value = "下屈服强度 ReL Mpa") + private BigDecimal lowerYieldStrength; + + /** + * 抗拉强度 Rm Mpa + */ + @ExcelProperty(value = "抗拉强度 Rm Mpa") + private BigDecimal tensileStrength; + + /** + * 伸长率 A % + */ + @ExcelProperty(value = "伸长率 A %") + private BigDecimal elongation; + + /** + * 硬度 HR/HRB/HR30T + */ + @ExcelProperty(value = "硬度 HR/HRB/HR30T") + private BigDecimal hardnessHr; + + /** + * 硬度 HV + */ + @ExcelProperty(value = "硬度 HV") + private BigDecimal hardnessHv; + + /** + * 镀层重量 上表面3点均值 g/m2 + */ + @ExcelProperty(value = "镀层重量 上表面3点均值 g/m2") + private BigDecimal coatingWeightTop; + + /** + * 镀层重量 下表面3点均值 g/m2 + */ + @ExcelProperty(value = "镀层重量 下表面3点均值 g/m2") + private BigDecimal coatingWeightBottom; + + /** + * 镀层重量 双面3点平均 g/m2 + */ + @ExcelProperty(value = "镀层重量 双面3点平均 g/m2") + private BigDecimal coatingWeightAvg; + + /** + * 粗糙度 um + */ + @ExcelProperty(value = "粗糙度 um") + private BigDecimal roughness; + + /** + * 弯曲试验 90° 结果 + */ + @ExcelProperty(value = "弯曲试验 90° 结果") + private String bendTest90; + + /** + * 弯曲试验 180° 结果 + */ + @ExcelProperty(value = "弯曲试验 180° 结果") + private String bendTest180; + + /** + * 弯曲试验 方向（横向/纵向） + */ + @ExcelProperty(value = "弯曲试验 方向", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "横=向/纵向") + private String bendTestDirection; + + /** + * 杯突值 mm + */ + @ExcelProperty(value = "杯突值 mm") + private BigDecimal cuppingValue; + + /** + * 表面结构 + */ + @ExcelProperty(value = "表面结构") + private String surfaceStructure; + + /** + * 边缘状态 + */ + @ExcelProperty(value = "边缘状态") + private String edgeStatus; + + /** + * 表面质量 + */ + @ExcelProperty(value = "表面质量") + private String surfaceQuality; + + /** + * 镀层表面盐雾试验结果 + */ + @ExcelProperty(value = "镀层表面盐雾试验结果") + private String saltSprayTest; + + /** + * 表面处理 + */ + @ExcelProperty(value = "表面处理") + private String surfaceTreatment; + + /** + * 后处理 + */ + @ExcelProperty(value = "后处理") + private String postTreatment; + + /** + * 下道工序 + */ + @ExcelProperty(value = "下道工序") + private String nextProcess; + + /** + * 化学成分 C % + */ + @ExcelProperty(value = "化学成分 C %") + private BigDecimal cContent; + + /** + * 化学成分 Si % + */ + @ExcelProperty(value = "化学成分 Si %") + private BigDecimal siContent; + + /** + * 化学成分 Mn % + */ + @ExcelProperty(value = "化学成分 Mn %") + private BigDecimal mnContent; + + /** + * 化学成分 P % + */ + @ExcelProperty(value = "化学成分 P %") + private BigDecimal pContent; + + /** + * 化学成分 S % + */ + @ExcelProperty(value = "化学成分 S %") + private BigDecimal sContent; + + /** + * 化学成分 Al % + */ + @ExcelProperty(value = "化学成分 Al %") + private BigDecimal alContent; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileVo.java new file mode 100644 index 00000000..f143f36e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileVo.java @@ -0,0 +1,78 @@ +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_inspection_tensile + * + * @author klp + * @date 2026-06-13 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsInspectionTensileVo { + + private static final long serialVersionUID = 1L; + + /** + * 试验记录主键ID，自增 + */ + @ExcelProperty(value = "试验记录主键ID，自增") + private String testId; + + /** + * 试验记录标题 + */ + @ExcelProperty(value = "试验记录标题") + private String testTitle; + + /** + * 执行标准 + */ + @ExcelProperty(value = "执行标准") + private String executeStandard; + + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String equipmentName; + + /** + * 设备型号 + */ + @ExcelProperty(value = "设备型号") + private String equipmentModel; + + /** + * 检测环境温度 + */ + @ExcelProperty(value = "检测环境温度") + private String testTemp; + + /** + * 检测环境湿度 + */ + @ExcelProperty(value = "检测环境湿度") + private String testHumidity; + + /** + * 生产工序（酸连轧/拉矫/镀锌/镀铬/双机架等） + */ + @ExcelProperty(value = "生产工序", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "酸=连轧/拉矫/镀锌/镀铬/双机架等") + private String productionProcess; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsInspectionDetailMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsInspectionDetailMapper.java new file mode 100644 index 00000000..84f8dd93 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsInspectionDetailMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsInspectionDetail; +import com.klp.domain.vo.WmsInspectionDetailVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检验项目明细Mapper接口 + * + * @author klp + * @date 2026-06-13 + */ +public interface WmsInspectionDetailMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsInspectionMainMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsInspectionMainMapper.java new file mode 100644 index 00000000..a594711b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsInspectionMainMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsInspectionMain; +import com.klp.domain.vo.WmsInspectionMainVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检验主Mapper接口 + * + * @author klp + * @date 2026-06-13 + */ +public interface WmsInspectionMainMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsInspectionTensileDetailMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsInspectionTensileDetailMapper.java new file mode 100644 index 00000000..11f7fa1e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsInspectionTensileDetailMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsInspectionTensileDetail; +import com.klp.domain.vo.WmsInspectionTensileDetailVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 金属材料室温拉伸试验样品明细Mapper接口 + * + * @author klp + * @date 2026-06-13 + */ +public interface WmsInspectionTensileDetailMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsInspectionTensileMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsInspectionTensileMapper.java new file mode 100644 index 00000000..2b9d211e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsInspectionTensileMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsInspectionTensile; +import com.klp.domain.vo.WmsInspectionTensileVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 金属材料室温拉伸试验主记录Mapper接口 + * + * @author klp + * @date 2026-06-13 + */ +public interface WmsInspectionTensileMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsInspectionDetailService.java b/klp-wms/src/main/java/com/klp/service/IWmsInspectionDetailService.java new file mode 100644 index 00000000..14c905f7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsInspectionDetailService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsInspectionDetail; +import com.klp.domain.vo.WmsInspectionDetailVo; +import com.klp.domain.bo.WmsInspectionDetailBo; +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-06-13 + */ +public interface IWmsInspectionDetailService { + + /** + * 查询检验项目明细 + */ + WmsInspectionDetailVo queryById(Long detailId); + + /** + * 查询检验项目明细列表 + */ + TableDataInfo queryPageList(WmsInspectionDetailBo bo, PageQuery pageQuery); + + /** + * 查询检验项目明细列表 + */ + List queryList(WmsInspectionDetailBo bo); + + /** + * 新增检验项目明细 + */ + Boolean insertByBo(WmsInspectionDetailBo bo); + + /** + * 修改检验项目明细 + */ + Boolean updateByBo(WmsInspectionDetailBo bo); + + /** + * 校验并批量删除检验项目明细信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsInspectionMainService.java b/klp-wms/src/main/java/com/klp/service/IWmsInspectionMainService.java new file mode 100644 index 00000000..9436e4af --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsInspectionMainService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsInspectionMain; +import com.klp.domain.vo.WmsInspectionMainVo; +import com.klp.domain.bo.WmsInspectionMainBo; +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-06-13 + */ +public interface IWmsInspectionMainService { + + /** + * 查询检验主 + */ + WmsInspectionMainVo queryById(Long mainId); + + /** + * 查询检验主列表 + */ + TableDataInfo queryPageList(WmsInspectionMainBo bo, PageQuery pageQuery); + + /** + * 查询检验主列表 + */ + List queryList(WmsInspectionMainBo bo); + + /** + * 新增检验主 + */ + Boolean insertByBo(WmsInspectionMainBo bo); + + /** + * 修改检验主 + */ + Boolean updateByBo(WmsInspectionMainBo bo); + + /** + * 校验并批量删除检验主信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsInspectionTensileDetailService.java b/klp-wms/src/main/java/com/klp/service/IWmsInspectionTensileDetailService.java new file mode 100644 index 00000000..79aa0f98 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsInspectionTensileDetailService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsInspectionTensileDetail; +import com.klp.domain.vo.WmsInspectionTensileDetailVo; +import com.klp.domain.bo.WmsInspectionTensileDetailBo; +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-06-13 + */ +public interface IWmsInspectionTensileDetailService { + + /** + * 查询金属材料室温拉伸试验样品明细 + */ + WmsInspectionTensileDetailVo queryById(String detailId); + + /** + * 查询金属材料室温拉伸试验样品明细列表 + */ + TableDataInfo queryPageList(WmsInspectionTensileDetailBo bo, PageQuery pageQuery); + + /** + * 查询金属材料室温拉伸试验样品明细列表 + */ + List queryList(WmsInspectionTensileDetailBo bo); + + /** + * 新增金属材料室温拉伸试验样品明细 + */ + Boolean insertByBo(WmsInspectionTensileDetailBo bo); + + /** + * 修改金属材料室温拉伸试验样品明细 + */ + Boolean updateByBo(WmsInspectionTensileDetailBo bo); + + /** + * 校验并批量删除金属材料室温拉伸试验样品明细信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsInspectionTensileService.java b/klp-wms/src/main/java/com/klp/service/IWmsInspectionTensileService.java new file mode 100644 index 00000000..33eae24f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsInspectionTensileService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsInspectionTensile; +import com.klp.domain.vo.WmsInspectionTensileVo; +import com.klp.domain.bo.WmsInspectionTensileBo; +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-06-13 + */ +public interface IWmsInspectionTensileService { + + /** + * 查询金属材料室温拉伸试验主记录 + */ + WmsInspectionTensileVo queryById(String testId); + + /** + * 查询金属材料室温拉伸试验主记录列表 + */ + TableDataInfo queryPageList(WmsInspectionTensileBo bo, PageQuery pageQuery); + + /** + * 查询金属材料室温拉伸试验主记录列表 + */ + List queryList(WmsInspectionTensileBo bo); + + /** + * 新增金属材料室温拉伸试验主记录 + */ + Boolean insertByBo(WmsInspectionTensileBo bo); + + /** + * 修改金属材料室温拉伸试验主记录 + */ + Boolean updateByBo(WmsInspectionTensileBo bo); + + /** + * 校验并批量删除金属材料室温拉伸试验主记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionDetailServiceImpl.java new file mode 100644 index 00000000..51218312 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionDetailServiceImpl.java @@ -0,0 +1,115 @@ +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 lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsInspectionDetailBo; +import com.klp.domain.vo.WmsInspectionDetailVo; +import com.klp.domain.WmsInspectionDetail; +import com.klp.mapper.WmsInspectionDetailMapper; +import com.klp.service.IWmsInspectionDetailService; +import com.klp.common.utils.StringUtils; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检验项目明细Service业务层处理 + * + * @author klp + * @date 2026-06-13 + */ +@RequiredArgsConstructor +@Service +public class WmsInspectionDetailServiceImpl implements IWmsInspectionDetailService { + + private final WmsInspectionDetailMapper baseMapper; + + /** + * 查询检验项目明细 + */ + @Override + public WmsInspectionDetailVo queryById(Long detailId){ + return baseMapper.selectVoById(detailId); + } + + /** + * 查询检验项目明细列表 + */ + @Override + public TableDataInfo queryPageList(WmsInspectionDetailBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检验项目明细列表 + */ + @Override + public List queryList(WmsInspectionDetailBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsInspectionDetailBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getMainId() != null, WmsInspectionDetail::getMainId, bo.getMainId()); + lqw.like(StringUtils.isNotBlank(bo.getItemName()), WmsInspectionDetail::getItemName, bo.getItemName()); + lqw.eq(bo.getItemValue() != null, WmsInspectionDetail::getItemValue, bo.getItemValue()); + lqw.eq(StringUtils.isNotBlank(bo.getItemUnit()), WmsInspectionDetail::getItemUnit, bo.getItemUnit()); + lqw.eq(bo.getUpperLimit() != null, WmsInspectionDetail::getUpperLimit, bo.getUpperLimit()); + lqw.eq(bo.getLowerLimit() != null, WmsInspectionDetail::getLowerLimit, bo.getLowerLimit()); + lqw.eq(StringUtils.isNotBlank(bo.getRangeDesc()), WmsInspectionDetail::getRangeDesc, bo.getRangeDesc()); + return lqw; + } + + /** + * 新增检验项目明细 + */ + @Override + public Boolean insertByBo(WmsInspectionDetailBo bo) { + WmsInspectionDetail add = BeanUtil.toBean(bo, WmsInspectionDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDetailId(add.getDetailId()); + } + return flag; + } + + /** + * 修改检验项目明细 + */ + @Override + public Boolean updateByBo(WmsInspectionDetailBo bo) { + WmsInspectionDetail update = BeanUtil.toBean(bo, WmsInspectionDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsInspectionDetail 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/WmsInspectionMainServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionMainServiceImpl.java new file mode 100644 index 00000000..c4e80ac7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionMainServiceImpl.java @@ -0,0 +1,114 @@ +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.WmsInspectionMainBo; +import com.klp.domain.vo.WmsInspectionMainVo; +import com.klp.domain.WmsInspectionMain; +import com.klp.mapper.WmsInspectionMainMapper; +import com.klp.service.IWmsInspectionMainService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检验主Service业务层处理 + * + * @author klp + * @date 2026-06-13 + */ +@RequiredArgsConstructor +@Service +public class WmsInspectionMainServiceImpl implements IWmsInspectionMainService { + + private final WmsInspectionMainMapper baseMapper; + + /** + * 查询检验主 + */ + @Override + public WmsInspectionMainVo queryById(Long mainId){ + return baseMapper.selectVoById(mainId); + } + + /** + * 查询检验主列表 + */ + @Override + public TableDataInfo queryPageList(WmsInspectionMainBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检验主列表 + */ + @Override + public List queryList(WmsInspectionMainBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsInspectionMainBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getInspectionDate() != null, WmsInspectionMain::getInspectionDate, bo.getInspectionDate()); + lqw.like(StringUtils.isNotBlank(bo.getSampleName()), WmsInspectionMain::getSampleName, bo.getSampleName()); + lqw.eq(StringUtils.isNotBlank(bo.getSampleNo()), WmsInspectionMain::getSampleNo, bo.getSampleNo()); + lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsInspectionMain::getBatchNo, bo.getBatchNo()); + lqw.eq(bo.getTemplateId() != null, WmsInspectionMain::getTemplateId, bo.getTemplateId()); + lqw.eq(StringUtils.isNotBlank(bo.getTaskConfigJson()), WmsInspectionMain::getTaskConfigJson, bo.getTaskConfigJson()); + return lqw; + } + + /** + * 新增检验主 + */ + @Override + public Boolean insertByBo(WmsInspectionMainBo bo) { + WmsInspectionMain add = BeanUtil.toBean(bo, WmsInspectionMain.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMainId(add.getMainId()); + } + return flag; + } + + /** + * 修改检验主 + */ + @Override + public Boolean updateByBo(WmsInspectionMainBo bo) { + WmsInspectionMain update = BeanUtil.toBean(bo, WmsInspectionMain.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsInspectionMain 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/WmsInspectionTensileDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java new file mode 100644 index 00000000..c36e2695 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java @@ -0,0 +1,150 @@ +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.WmsInspectionTensileDetailBo; +import com.klp.domain.vo.WmsInspectionTensileDetailVo; +import com.klp.domain.WmsInspectionTensileDetail; +import com.klp.mapper.WmsInspectionTensileDetailMapper; +import com.klp.service.IWmsInspectionTensileDetailService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 金属材料室温拉伸试验样品明细Service业务层处理 + * + * @author klp + * @date 2026-06-13 + */ +@RequiredArgsConstructor +@Service +public class WmsInspectionTensileDetailServiceImpl implements IWmsInspectionTensileDetailService { + + private final WmsInspectionTensileDetailMapper baseMapper; + + /** + * 查询金属材料室温拉伸试验样品明细 + */ + @Override + public WmsInspectionTensileDetailVo queryById(String detailId){ + return baseMapper.selectVoById(detailId); + } + + /** + * 查询金属材料室温拉伸试验样品明细列表 + */ + @Override + public TableDataInfo queryPageList(WmsInspectionTensileDetailBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询金属材料室温拉伸试验样品明细列表 + */ + @Override + public List queryList(WmsInspectionTensileDetailBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsInspectionTensileDetailBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTestMainId()), WmsInspectionTensileDetail::getTestMainId, bo.getTestMainId()); + lqw.eq(StringUtils.isNotBlank(bo.getSampleNo()), WmsInspectionTensileDetail::getSampleNo, bo.getSampleNo()); + lqw.eq(StringUtils.isNotBlank(bo.getSteelCoilNo()), WmsInspectionTensileDetail::getSteelCoilNo, bo.getSteelCoilNo()); + lqw.eq(StringUtils.isNotBlank(bo.getRawMaterialNo()), WmsInspectionTensileDetail::getRawMaterialNo, bo.getRawMaterialNo()); + lqw.eq(StringUtils.isNotBlank(bo.getSpecification()), WmsInspectionTensileDetail::getSpecification, bo.getSpecification()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), WmsInspectionTensileDetail::getMaterial, bo.getMaterial()); + lqw.eq(StringUtils.isNotBlank(bo.getRawMaterialFactory()), WmsInspectionTensileDetail::getRawMaterialFactory, bo.getRawMaterialFactory()); + lqw.eq(StringUtils.isNotBlank(bo.getProductionTeam()), WmsInspectionTensileDetail::getProductionTeam, bo.getProductionTeam()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStatus()), WmsInspectionTensileDetail::getSurfaceStatus, bo.getSurfaceStatus()); + lqw.eq(bo.getProductionDate() != null, WmsInspectionTensileDetail::getProductionDate, bo.getProductionDate()); + lqw.eq(bo.getTestDate() != null, WmsInspectionTensileDetail::getTestDate, bo.getTestDate()); + lqw.eq(StringUtils.isNotBlank(bo.getSampleDirection()), WmsInspectionTensileDetail::getSampleDirection, bo.getSampleDirection()); + lqw.eq(StringUtils.isNotBlank(bo.getSampleSize()), WmsInspectionTensileDetail::getSampleSize, bo.getSampleSize()); + lqw.eq(bo.getOriginalGaugeLength() != null, WmsInspectionTensileDetail::getOriginalGaugeLength, bo.getOriginalGaugeLength()); + lqw.eq(bo.getFractureGaugeLength() != null, WmsInspectionTensileDetail::getFractureGaugeLength, bo.getFractureGaugeLength()); + lqw.eq(bo.getMaxForce() != null, WmsInspectionTensileDetail::getMaxForce, bo.getMaxForce()); + lqw.eq(bo.getLowerYieldStrength() != null, WmsInspectionTensileDetail::getLowerYieldStrength, bo.getLowerYieldStrength()); + lqw.eq(bo.getTensileStrength() != null, WmsInspectionTensileDetail::getTensileStrength, bo.getTensileStrength()); + lqw.eq(bo.getElongation() != null, WmsInspectionTensileDetail::getElongation, bo.getElongation()); + lqw.eq(bo.getHardnessHr() != null, WmsInspectionTensileDetail::getHardnessHr, bo.getHardnessHr()); + lqw.eq(bo.getHardnessHv() != null, WmsInspectionTensileDetail::getHardnessHv, bo.getHardnessHv()); + lqw.eq(bo.getCoatingWeightTop() != null, WmsInspectionTensileDetail::getCoatingWeightTop, bo.getCoatingWeightTop()); + lqw.eq(bo.getCoatingWeightBottom() != null, WmsInspectionTensileDetail::getCoatingWeightBottom, bo.getCoatingWeightBottom()); + lqw.eq(bo.getCoatingWeightAvg() != null, WmsInspectionTensileDetail::getCoatingWeightAvg, bo.getCoatingWeightAvg()); + lqw.eq(bo.getRoughness() != null, WmsInspectionTensileDetail::getRoughness, bo.getRoughness()); + lqw.eq(StringUtils.isNotBlank(bo.getBendTest90()), WmsInspectionTensileDetail::getBendTest90, bo.getBendTest90()); + lqw.eq(StringUtils.isNotBlank(bo.getBendTest180()), WmsInspectionTensileDetail::getBendTest180, bo.getBendTest180()); + lqw.eq(StringUtils.isNotBlank(bo.getBendTestDirection()), WmsInspectionTensileDetail::getBendTestDirection, bo.getBendTestDirection()); + lqw.eq(bo.getCuppingValue() != null, WmsInspectionTensileDetail::getCuppingValue, bo.getCuppingValue()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), WmsInspectionTensileDetail::getSurfaceStructure, bo.getSurfaceStructure()); + lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), WmsInspectionTensileDetail::getEdgeStatus, bo.getEdgeStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), WmsInspectionTensileDetail::getSurfaceQuality, bo.getSurfaceQuality()); + lqw.eq(StringUtils.isNotBlank(bo.getSaltSprayTest()), WmsInspectionTensileDetail::getSaltSprayTest, bo.getSaltSprayTest()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatment()), WmsInspectionTensileDetail::getSurfaceTreatment, bo.getSurfaceTreatment()); + lqw.eq(StringUtils.isNotBlank(bo.getPostTreatment()), WmsInspectionTensileDetail::getPostTreatment, bo.getPostTreatment()); + lqw.eq(StringUtils.isNotBlank(bo.getNextProcess()), WmsInspectionTensileDetail::getNextProcess, bo.getNextProcess()); + lqw.eq(bo.getCContent() != null, WmsInspectionTensileDetail::getCContent, bo.getCContent()); + lqw.eq(bo.getSiContent() != null, WmsInspectionTensileDetail::getSiContent, bo.getSiContent()); + lqw.eq(bo.getMnContent() != null, WmsInspectionTensileDetail::getMnContent, bo.getMnContent()); + lqw.eq(bo.getPContent() != null, WmsInspectionTensileDetail::getPContent, bo.getPContent()); + lqw.eq(bo.getSContent() != null, WmsInspectionTensileDetail::getSContent, bo.getSContent()); + lqw.eq(bo.getAlContent() != null, WmsInspectionTensileDetail::getAlContent, bo.getAlContent()); + return lqw; + } + + /** + * 新增金属材料室温拉伸试验样品明细 + */ + @Override + public Boolean insertByBo(WmsInspectionTensileDetailBo bo) { + WmsInspectionTensileDetail add = BeanUtil.toBean(bo, WmsInspectionTensileDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setDetailId(add.getDetailId()); + } + return flag; + } + + /** + * 修改金属材料室温拉伸试验样品明细 + */ + @Override + public Boolean updateByBo(WmsInspectionTensileDetailBo bo) { + WmsInspectionTensileDetail update = BeanUtil.toBean(bo, WmsInspectionTensileDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsInspectionTensileDetail 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/WmsInspectionTensileServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileServiceImpl.java new file mode 100644 index 00000000..ac98798a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileServiceImpl.java @@ -0,0 +1,115 @@ +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.WmsInspectionTensileBo; +import com.klp.domain.vo.WmsInspectionTensileVo; +import com.klp.domain.WmsInspectionTensile; +import com.klp.mapper.WmsInspectionTensileMapper; +import com.klp.service.IWmsInspectionTensileService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 金属材料室温拉伸试验主记录Service业务层处理 + * + * @author klp + * @date 2026-06-13 + */ +@RequiredArgsConstructor +@Service +public class WmsInspectionTensileServiceImpl implements IWmsInspectionTensileService { + + private final WmsInspectionTensileMapper baseMapper; + + /** + * 查询金属材料室温拉伸试验主记录 + */ + @Override + public WmsInspectionTensileVo queryById(String testId){ + return baseMapper.selectVoById(testId); + } + + /** + * 查询金属材料室温拉伸试验主记录列表 + */ + @Override + public TableDataInfo queryPageList(WmsInspectionTensileBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询金属材料室温拉伸试验主记录列表 + */ + @Override + public List queryList(WmsInspectionTensileBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsInspectionTensileBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTestTitle()), WmsInspectionTensile::getTestTitle, bo.getTestTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getExecuteStandard()), WmsInspectionTensile::getExecuteStandard, bo.getExecuteStandard()); + lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), WmsInspectionTensile::getEquipmentName, bo.getEquipmentName()); + lqw.eq(StringUtils.isNotBlank(bo.getEquipmentModel()), WmsInspectionTensile::getEquipmentModel, bo.getEquipmentModel()); + lqw.eq(StringUtils.isNotBlank(bo.getTestTemp()), WmsInspectionTensile::getTestTemp, bo.getTestTemp()); + lqw.eq(StringUtils.isNotBlank(bo.getTestHumidity()), WmsInspectionTensile::getTestHumidity, bo.getTestHumidity()); + lqw.eq(StringUtils.isNotBlank(bo.getProductionProcess()), WmsInspectionTensile::getProductionProcess, bo.getProductionProcess()); + return lqw; + } + + /** + * 新增金属材料室温拉伸试验主记录 + */ + @Override + public Boolean insertByBo(WmsInspectionTensileBo bo) { + WmsInspectionTensile add = BeanUtil.toBean(bo, WmsInspectionTensile.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTestId(add.getTestId()); + } + return flag; + } + + /** + * 修改金属材料室温拉伸试验主记录 + */ + @Override + public Boolean updateByBo(WmsInspectionTensileBo bo) { + WmsInspectionTensile update = BeanUtil.toBean(bo, WmsInspectionTensile.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsInspectionTensile 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/WmsInspectionDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsInspectionDetailMapper.xml new file mode 100644 index 00000000..bea48a9f --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsInspectionDetailMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsInspectionMainMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsInspectionMainMapper.xml new file mode 100644 index 00000000..d9b8bd2d --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsInspectionMainMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml new file mode 100644 index 00000000..5c6b2807 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileMapper.xml new file mode 100644 index 00000000..451096d6 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + +