From 0e7048f0432ef267d90331866c9f5733ccae13bb Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 15 May 2026 11:39:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix(mes):=20=E8=B4=A8=E9=87=8F=E8=AF=81?= =?UTF-8?q?=E6=98=8E=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcCertificateController.java | 99 +++++++++++ .../QcCertificateItemController.java | 99 +++++++++++ .../com/klp/mes/qc/domain/QcCertificate.java | 71 ++++++++ .../klp/mes/qc/domain/QcCertificateItem.java | 122 +++++++++++++ .../klp/mes/qc/domain/bo/QcCertificateBo.java | 73 ++++++++ .../mes/qc/domain/bo/QcCertificateItemBo.java | 137 +++++++++++++++ .../mes/qc/domain/vo/QcCertificateItemVo.java | 162 ++++++++++++++++++ .../klp/mes/qc/domain/vo/QcCertificateVo.java | 86 ++++++++++ .../qc/mapper/QcCertificateItemMapper.java | 15 ++ .../mes/qc/mapper/QcCertificateMapper.java | 15 ++ .../qc/service/IQcCertificateItemService.java | 49 ++++++ .../mes/qc/service/IQcCertificateService.java | 49 ++++++ .../impl/QcCertificateItemServiceImpl.java | 129 ++++++++++++++ .../impl/QcCertificateServiceImpl.java | 116 +++++++++++++ .../mapper/qc/QcCertificateItemMapper.xml | 39 +++++ .../mapper/qc/QcCertificateMapper.xml | 26 +++ 16 files changed, 1287 insertions(+) create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/controller/QcCertificateController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/controller/QcCertificateItemController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/mapper/QcCertificateItemMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/mapper/QcCertificateMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/IQcCertificateItemService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/IQcCertificateService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java create mode 100644 klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/QcCertificateController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcCertificateController.java new file mode 100644 index 00000000..1913ab45 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcCertificateController.java @@ -0,0 +1,99 @@ +package com.klp.mes.qc.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.mes.qc.domain.vo.QcCertificateVo; +import com.klp.mes.qc.domain.bo.QcCertificateBo; +import com.klp.mes.qc.service.IQcCertificateService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 质量证明书主 + * + * @author klp + * @date 2026-05-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qc/certificate") +public class QcCertificateController extends BaseController { + + private final IQcCertificateService iQcCertificateService; + + /** + * 查询质量证明书主列表 + */ + @GetMapping("/list") + public TableDataInfo list(QcCertificateBo bo, PageQuery pageQuery) { + return iQcCertificateService.queryPageList(bo, pageQuery); + } + + /** + * 导出质量证明书主列表 + */ + @Log(title = "质量证明书主", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcCertificateBo bo, HttpServletResponse response) { + List list = iQcCertificateService.queryList(bo); + ExcelUtil.exportExcel(list, "质量证明书主", QcCertificateVo.class, response); + } + + /** + * 获取质量证明书主详细信息 + * + * @param certificateId 主键 + */ + @GetMapping("/{certificateId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long certificateId) { + return R.ok(iQcCertificateService.queryById(certificateId)); + } + + /** + * 新增质量证明书主 + */ + @Log(title = "质量证明书主", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcCertificateBo bo) { + return toAjax(iQcCertificateService.insertByBo(bo)); + } + + /** + * 修改质量证明书主 + */ + @Log(title = "质量证明书主", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcCertificateBo bo) { + return toAjax(iQcCertificateService.updateByBo(bo)); + } + + /** + * 删除质量证明书主 + * + * @param certificateIds 主键串 + */ + @Log(title = "质量证明书主", businessType = BusinessType.DELETE) + @DeleteMapping("/{certificateIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] certificateIds) { + return toAjax(iQcCertificateService.deleteWithValidByIds(Arrays.asList(certificateIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/QcCertificateItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcCertificateItemController.java new file mode 100644 index 00000000..1c1545a5 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcCertificateItemController.java @@ -0,0 +1,99 @@ +package com.klp.mes.qc.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.mes.qc.domain.vo.QcCertificateItemVo; +import com.klp.mes.qc.domain.bo.QcCertificateItemBo; +import com.klp.mes.qc.service.IQcCertificateItemService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 质量证明书明细 + * + * @author klp + * @date 2026-05-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qc/certificateItem") +public class QcCertificateItemController extends BaseController { + + private final IQcCertificateItemService iQcCertificateItemService; + + /** + * 查询质量证明书明细列表 + */ + @GetMapping("/list") + public TableDataInfo list(QcCertificateItemBo bo, PageQuery pageQuery) { + return iQcCertificateItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出质量证明书明细列表 + */ + @Log(title = "质量证明书明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcCertificateItemBo bo, HttpServletResponse response) { + List list = iQcCertificateItemService.queryList(bo); + ExcelUtil.exportExcel(list, "质量证明书明细", QcCertificateItemVo.class, response); + } + + /** + * 获取质量证明书明细详细信息 + * + * @param itemId 主键 + */ + @GetMapping("/{itemId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long itemId) { + return R.ok(iQcCertificateItemService.queryById(itemId)); + } + + /** + * 新增质量证明书明细 + */ + @Log(title = "质量证明书明细", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcCertificateItemBo bo) { + return toAjax(iQcCertificateItemService.insertByBo(bo)); + } + + /** + * 修改质量证明书明细 + */ + @Log(title = "质量证明书明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcCertificateItemBo bo) { + return toAjax(iQcCertificateItemService.updateByBo(bo)); + } + + /** + * 删除质量证明书明细 + * + * @param itemIds 主键串 + */ + @Log(title = "质量证明书明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{itemIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] itemIds) { + return toAjax(iQcCertificateItemService.deleteWithValidByIds(Arrays.asList(itemIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java new file mode 100644 index 00000000..bb8e353d --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java @@ -0,0 +1,71 @@ +package com.klp.mes.qc.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; + +/** + * 质量证明书主对象 qc_certificate + * + * @author klp + * @date 2026-05-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_certificate") +public class QcCertificate extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 证书ID + */ + @TableId(value = "certificate_id") + private Long certificateId; + /** + * 证明书号 + */ + private String certificateNo; + /** + * 合同号 + */ + private String contractNo; + /** + * 产品名称 + */ + private String productName; + /** + * 执行标准 + */ + private String standard; + /** + * 收货单位 + */ + private String consignee; + /** + * 生产厂家 + */ + private String manufacturer; + /** + * 签发日期 + */ + private Date issueDate; + /** + * 质保证明说明（注释） + */ + private String note; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java new file mode 100644 index 00000000..9c6b4bff --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java @@ -0,0 +1,122 @@ +package com.klp.mes.qc.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 质量证明书明细对象 qc_certificate_item + * + * @author klp + * @date 2026-05-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_certificate_item") +public class QcCertificateItem extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 明细ID + */ + @TableId(value = "item_id") + private Long itemId; + /** + * 证书ID + */ + private Long certificateId; + /** + * 钢卷号 + */ + private String coilNo; + /** + * 炉号 + */ + private String heatNo; + /** + * 材质 + */ + private String materialType; + /** + * 规格(mm) + */ + private String size; + /** + * 件数 + */ + private Long pieces; + /** + * 重量(t) + */ + private BigDecimal weight; + /** + * C + */ + private BigDecimal c; + /** + * Si + */ + private BigDecimal si; + /** + * Mn + */ + private BigDecimal mn; + /** + * P + */ + private BigDecimal p; + /** + * S + */ + private BigDecimal s; + /** + * Als + */ + private BigDecimal als; + /** + * 拉伸试验-屈服强度(MPa) + */ + private BigDecimal yieldStrength; + /** + * 拉伸试验-抗拉强度(MPa) + */ + private BigDecimal tensileStrength; + /** + * 拉伸试验-伸长率(%) + */ + private BigDecimal elongation; + /** + * 硬度实验(HRB) + */ + private BigDecimal hardness; + /** + * 弯曲试验 + */ + private String bendingTest; + /** + * 表面质量 + */ + private String surfaceQuality; + /** + * 表面结构 + */ + private String surfaceStructure; + /** + * 边缘状态 + */ + private String edgeStatus; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java new file mode 100644 index 00000000..7b5e953c --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java @@ -0,0 +1,73 @@ +package com.klp.mes.qc.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; + +/** + * 质量证明书主业务对象 qc_certificate + * + * @author klp + * @date 2026-05-15 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class QcCertificateBo extends BaseEntity { + + /** + * 证书ID + */ + private Long certificateId; + + /** + * 证明书号 + */ + private String certificateNo; + + /** + * 合同号 + */ + private String contractNo; + + /** + * 产品名称 + */ + private String productName; + + /** + * 执行标准 + */ + private String standard; + + /** + * 收货单位 + */ + private String consignee; + + /** + * 生产厂家 + */ + private String manufacturer; + + /** + * 签发日期 + */ + private Date issueDate; + + /** + * 质保证明说明（注释） + */ + private String note; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java new file mode 100644 index 00000000..ff0005d8 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java @@ -0,0 +1,137 @@ +package com.klp.mes.qc.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.math.BigDecimal; + +/** + * 质量证明书明细业务对象 qc_certificate_item + * + * @author klp + * @date 2026-05-15 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class QcCertificateItemBo extends BaseEntity { + + /** + * 明细ID + */ + private Long itemId; + + /** + * 证书ID + */ + private Long certificateId; + + /** + * 钢卷号 + */ + private String coilNo; + + /** + * 炉号 + */ + private String heatNo; + + /** + * 材质 + */ + private String materialType; + + /** + * 规格(mm) + */ + private String size; + + /** + * 件数 + */ + private Long pieces; + + /** + * 重量(t) + */ + private BigDecimal weight; + + /** + * C + */ + private BigDecimal c; + + /** + * Si + */ + private BigDecimal si; + + /** + * Mn + */ + private BigDecimal mn; + + /** + * P + */ + private BigDecimal p; + + /** + * S + */ + private BigDecimal s; + + /** + * Als + */ + private BigDecimal als; + + /** + * 拉伸试验-屈服强度(MPa) + */ + private BigDecimal yieldStrength; + + /** + * 拉伸试验-抗拉强度(MPa) + */ + private BigDecimal tensileStrength; + + /** + * 拉伸试验-伸长率(%) + */ + private BigDecimal elongation; + + /** + * 硬度实验(HRB) + */ + private BigDecimal hardness; + + /** + * 弯曲试验 + */ + private String bendingTest; + + /** + * 表面质量 + */ + private String surfaceQuality; + + /** + * 表面结构 + */ + private String surfaceStructure; + + /** + * 边缘状态 + */ + private String edgeStatus; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java new file mode 100644 index 00000000..a241bd99 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java @@ -0,0 +1,162 @@ +package com.klp.mes.qc.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; + + +/** + * 质量证明书明细视图对象 qc_certificate_item + * + * @author klp + * @date 2026-05-15 + */ +@Data +@ExcelIgnoreUnannotated +public class QcCertificateItemVo { + + private static final long serialVersionUID = 1L; + + /** + * 明细ID + */ + @ExcelProperty(value = "明细ID") + private Long itemId; + + /** + * 证书ID + */ + @ExcelProperty(value = "证书ID") + private Long certificateId; + + /** + * 钢卷号 + */ + @ExcelProperty(value = "钢卷号") + private String coilNo; + + /** + * 炉号 + */ + @ExcelProperty(value = "炉号") + private String heatNo; + + /** + * 材质 + */ + @ExcelProperty(value = "材质") + private String materialType; + + /** + * 规格(mm) + */ + @ExcelProperty(value = "规格(mm)") + private String size; + + /** + * 件数 + */ + @ExcelProperty(value = "件数") + private Long pieces; + + /** + * 重量(t) + */ + @ExcelProperty(value = "重量(t)") + private BigDecimal weight; + + /** + * C + */ + @ExcelProperty(value = "C") + private BigDecimal c; + + /** + * Si + */ + @ExcelProperty(value = "Si") + private BigDecimal si; + + /** + * Mn + */ + @ExcelProperty(value = "Mn") + private BigDecimal mn; + + /** + * P + */ + @ExcelProperty(value = "P") + private BigDecimal p; + + /** + * S + */ + @ExcelProperty(value = "S") + private BigDecimal s; + + /** + * Als + */ + @ExcelProperty(value = "Als") + private BigDecimal als; + + /** + * 拉伸试验-屈服强度(MPa) + */ + @ExcelProperty(value = "拉伸试验-屈服强度(MPa)") + private BigDecimal yieldStrength; + + /** + * 拉伸试验-抗拉强度(MPa) + */ + @ExcelProperty(value = "拉伸试验-抗拉强度(MPa)") + private BigDecimal tensileStrength; + + /** + * 拉伸试验-伸长率(%) + */ + @ExcelProperty(value = "拉伸试验-伸长率(%)") + private BigDecimal elongation; + + /** + * 硬度实验(HRB) + */ + @ExcelProperty(value = "硬度实验(HRB)") + private BigDecimal hardness; + + /** + * 弯曲试验 + */ + @ExcelProperty(value = "弯曲试验") + private String bendingTest; + + /** + * 表面质量 + */ + @ExcelProperty(value = "表面质量") + private String surfaceQuality; + + /** + * 表面结构 + */ + @ExcelProperty(value = "表面结构") + private String surfaceStructure; + + /** + * 边缘状态 + */ + @ExcelProperty(value = "边缘状态") + private String edgeStatus; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java new file mode 100644 index 00000000..ae701b0d --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java @@ -0,0 +1,86 @@ +package com.klp.mes.qc.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; + + +/** + * 质量证明书主视图对象 qc_certificate + * + * @author klp + * @date 2026-05-15 + */ +@Data +@ExcelIgnoreUnannotated +public class QcCertificateVo { + + private static final long serialVersionUID = 1L; + + /** + * 证书ID + */ + @ExcelProperty(value = "证书ID") + private Long certificateId; + + /** + * 证明书号 + */ + @ExcelProperty(value = "证明书号") + private String certificateNo; + + /** + * 合同号 + */ + @ExcelProperty(value = "合同号") + private String contractNo; + + /** + * 产品名称 + */ + @ExcelProperty(value = "产品名称") + private String productName; + + /** + * 执行标准 + */ + @ExcelProperty(value = "执行标准") + private String standard; + + /** + * 收货单位 + */ + @ExcelProperty(value = "收货单位") + private String consignee; + + /** + * 生产厂家 + */ + @ExcelProperty(value = "生产厂家") + private String manufacturer; + + /** + * 签发日期 + */ + @ExcelProperty(value = "签发日期") + private Date issueDate; + + /** + * 质保证明说明（注释） + */ + @ExcelProperty(value = "质保证明说明", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "注=释") + private String note; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcCertificateItemMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcCertificateItemMapper.java new file mode 100644 index 00000000..e10ce720 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcCertificateItemMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.qc.mapper; + +import com.klp.mes.qc.domain.QcCertificateItem; +import com.klp.mes.qc.domain.vo.QcCertificateItemVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 质量证明书明细Mapper接口 + * + * @author klp + * @date 2026-05-15 + */ +public interface QcCertificateItemMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcCertificateMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcCertificateMapper.java new file mode 100644 index 00000000..e3646940 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcCertificateMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.qc.mapper; + +import com.klp.mes.qc.domain.QcCertificate; +import com.klp.mes.qc.domain.vo.QcCertificateVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 质量证明书主Mapper接口 + * + * @author klp + * @date 2026-05-15 + */ +public interface QcCertificateMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IQcCertificateItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcCertificateItemService.java new file mode 100644 index 00000000..7e7e4206 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcCertificateItemService.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.service; + +import com.klp.mes.qc.domain.QcCertificateItem; +import com.klp.mes.qc.domain.vo.QcCertificateItemVo; +import com.klp.mes.qc.domain.bo.QcCertificateItemBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 质量证明书明细Service接口 + * + * @author klp + * @date 2026-05-15 + */ +public interface IQcCertificateItemService { + + /** + * 查询质量证明书明细 + */ + QcCertificateItemVo queryById(Long itemId); + + /** + * 查询质量证明书明细列表 + */ + TableDataInfo queryPageList(QcCertificateItemBo bo, PageQuery pageQuery); + + /** + * 查询质量证明书明细列表 + */ + List queryList(QcCertificateItemBo bo); + + /** + * 新增质量证明书明细 + */ + Boolean insertByBo(QcCertificateItemBo bo); + + /** + * 修改质量证明书明细 + */ + Boolean updateByBo(QcCertificateItemBo bo); + + /** + * 校验并批量删除质量证明书明细信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IQcCertificateService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcCertificateService.java new file mode 100644 index 00000000..7ab1002f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcCertificateService.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.service; + +import com.klp.mes.qc.domain.QcCertificate; +import com.klp.mes.qc.domain.vo.QcCertificateVo; +import com.klp.mes.qc.domain.bo.QcCertificateBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 质量证明书主Service接口 + * + * @author klp + * @date 2026-05-15 + */ +public interface IQcCertificateService { + + /** + * 查询质量证明书主 + */ + QcCertificateVo queryById(Long certificateId); + + /** + * 查询质量证明书主列表 + */ + TableDataInfo queryPageList(QcCertificateBo bo, PageQuery pageQuery); + + /** + * 查询质量证明书主列表 + */ + List queryList(QcCertificateBo bo); + + /** + * 新增质量证明书主 + */ + Boolean insertByBo(QcCertificateBo bo); + + /** + * 修改质量证明书主 + */ + Boolean updateByBo(QcCertificateBo bo); + + /** + * 校验并批量删除质量证明书主信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java new file mode 100644 index 00000000..44fcb150 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java @@ -0,0 +1,129 @@ +package com.klp.mes.qc.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.mes.qc.domain.bo.QcCertificateItemBo; +import com.klp.mes.qc.domain.vo.QcCertificateItemVo; +import com.klp.mes.qc.domain.QcCertificateItem; +import com.klp.mes.qc.mapper.QcCertificateItemMapper; +import com.klp.mes.qc.service.IQcCertificateItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 质量证明书明细Service业务层处理 + * + * @author klp + * @date 2026-05-15 + */ +@RequiredArgsConstructor +@Service +public class QcCertificateItemServiceImpl implements IQcCertificateItemService { + + private final QcCertificateItemMapper baseMapper; + + /** + * 查询质量证明书明细 + */ + @Override + public QcCertificateItemVo queryById(Long itemId){ + return baseMapper.selectVoById(itemId); + } + + /** + * 查询质量证明书明细列表 + */ + @Override + public TableDataInfo queryPageList(QcCertificateItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询质量证明书明细列表 + */ + @Override + public List queryList(QcCertificateItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(QcCertificateItemBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCertificateId() != null, QcCertificateItem::getCertificateId, bo.getCertificateId()); + lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcCertificateItem::getCoilNo, bo.getCoilNo()); + lqw.eq(StringUtils.isNotBlank(bo.getHeatNo()), QcCertificateItem::getHeatNo, bo.getHeatNo()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterialType()), QcCertificateItem::getMaterialType, bo.getMaterialType()); + lqw.eq(StringUtils.isNotBlank(bo.getSize()), QcCertificateItem::getSize, bo.getSize()); + lqw.eq(bo.getPieces() != null, QcCertificateItem::getPieces, bo.getPieces()); + lqw.eq(bo.getWeight() != null, QcCertificateItem::getWeight, bo.getWeight()); + lqw.eq(bo.getC() != null, QcCertificateItem::getC, bo.getC()); + lqw.eq(bo.getSi() != null, QcCertificateItem::getSi, bo.getSi()); + lqw.eq(bo.getMn() != null, QcCertificateItem::getMn, bo.getMn()); + lqw.eq(bo.getP() != null, QcCertificateItem::getP, bo.getP()); + lqw.eq(bo.getS() != null, QcCertificateItem::getS, bo.getS()); + lqw.eq(bo.getAls() != null, QcCertificateItem::getAls, bo.getAls()); + lqw.eq(bo.getYieldStrength() != null, QcCertificateItem::getYieldStrength, bo.getYieldStrength()); + lqw.eq(bo.getTensileStrength() != null, QcCertificateItem::getTensileStrength, bo.getTensileStrength()); + lqw.eq(bo.getElongation() != null, QcCertificateItem::getElongation, bo.getElongation()); + lqw.eq(bo.getHardness() != null, QcCertificateItem::getHardness, bo.getHardness()); + lqw.eq(StringUtils.isNotBlank(bo.getBendingTest()), QcCertificateItem::getBendingTest, bo.getBendingTest()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcCertificateItem::getSurfaceQuality, bo.getSurfaceQuality()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcCertificateItem::getSurfaceStructure, bo.getSurfaceStructure()); + lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcCertificateItem::getEdgeStatus, bo.getEdgeStatus()); + return lqw; + } + + /** + * 新增质量证明书明细 + */ + @Override + public Boolean insertByBo(QcCertificateItemBo bo) { + QcCertificateItem add = BeanUtil.toBean(bo, QcCertificateItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setItemId(add.getItemId()); + } + return flag; + } + + /** + * 修改质量证明书明细 + */ + @Override + public Boolean updateByBo(QcCertificateItemBo bo) { + QcCertificateItem update = BeanUtil.toBean(bo, QcCertificateItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcCertificateItem entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除质量证明书明细 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java new file mode 100644 index 00000000..2ba5c1ca --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java @@ -0,0 +1,116 @@ +package com.klp.mes.qc.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.mes.qc.domain.bo.QcCertificateBo; +import com.klp.mes.qc.domain.vo.QcCertificateVo; +import com.klp.mes.qc.domain.QcCertificate; +import com.klp.mes.qc.mapper.QcCertificateMapper; +import com.klp.mes.qc.service.IQcCertificateService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 质量证明书主Service业务层处理 + * + * @author klp + * @date 2026-05-15 + */ +@RequiredArgsConstructor +@Service +public class QcCertificateServiceImpl implements IQcCertificateService { + + private final QcCertificateMapper baseMapper; + + /** + * 查询质量证明书主 + */ + @Override + public QcCertificateVo queryById(Long certificateId){ + return baseMapper.selectVoById(certificateId); + } + + /** + * 查询质量证明书主列表 + */ + @Override + public TableDataInfo queryPageList(QcCertificateBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询质量证明书主列表 + */ + @Override + public List queryList(QcCertificateBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(QcCertificateBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getCertificateNo()), QcCertificate::getCertificateNo, bo.getCertificateNo()); + lqw.eq(StringUtils.isNotBlank(bo.getContractNo()), QcCertificate::getContractNo, bo.getContractNo()); + lqw.like(StringUtils.isNotBlank(bo.getProductName()), QcCertificate::getProductName, bo.getProductName()); + lqw.eq(StringUtils.isNotBlank(bo.getStandard()), QcCertificate::getStandard, bo.getStandard()); + lqw.eq(StringUtils.isNotBlank(bo.getConsignee()), QcCertificate::getConsignee, bo.getConsignee()); + lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), QcCertificate::getManufacturer, bo.getManufacturer()); + lqw.eq(bo.getIssueDate() != null, QcCertificate::getIssueDate, bo.getIssueDate()); + lqw.eq(StringUtils.isNotBlank(bo.getNote()), QcCertificate::getNote, bo.getNote()); + return lqw; + } + + /** + * 新增质量证明书主 + */ + @Override + public Boolean insertByBo(QcCertificateBo bo) { + QcCertificate add = BeanUtil.toBean(bo, QcCertificate.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setCertificateId(add.getCertificateId()); + } + return flag; + } + + /** + * 修改质量证明书主 + */ + @Override + public Boolean updateByBo(QcCertificateBo bo) { + QcCertificate update = BeanUtil.toBean(bo, QcCertificate.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcCertificate entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除质量证明书主 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml new file mode 100644 index 00000000..e32f6d58 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml new file mode 100644 index 00000000..0ba6d536 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + From c5c478b1e997cb23c356d3085c8112e61feabe0c Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 15 May 2026 13:13:34 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat(attendance):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=A3=80=E6=9F=A5=E6=95=B0=E6=8D=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IWmsAttendanceCheckService 中新增 updateByBo 方法 - 扩展 WmsAttendanceCheckBo 类继承 BaseEntity 并添加多个考勤字段 - 添加考勤状态、迟到早退分钟数、扣款金额等相关属性 - 在控制器中实现 PUT 请求的编辑接口 - 添加 EditGroup 验证组支持 - 实现服务层 updateByBo 方法进行数据库更新操作 --- .../WmsAttendanceCheckController.java | 8 +++++++ .../klp/domain/bo/WmsAttendanceCheckBo.java | 23 ++++++++++++++++++- .../service/IWmsAttendanceCheckService.java | 2 ++ .../impl/WmsAttendanceCheckServiceImpl.java | 8 +++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java index bce2b9b0..5548eddf 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceCheckController.java @@ -5,6 +5,7 @@ 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.page.TableDataInfo; +import com.klp.common.core.validate.EditGroup; import com.klp.common.enums.BusinessType; import com.klp.domain.bo.AttendanceCheckBo; import com.klp.domain.bo.WmsAttendanceCheckBo; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -55,4 +57,10 @@ public class WmsAttendanceCheckController extends BaseController { iWmsAttendanceCheckService.checkAttendance(bo); return R.ok(); } + + @Log(title = "考勤比对", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated(EditGroup.class) @RequestBody WmsAttendanceCheckBo bo) { + return toAjax(iWmsAttendanceCheckService.updateByBo(bo)); + } } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java index 94d75732..079fbfed 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceCheckBo.java @@ -1,14 +1,19 @@ package com.klp.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.klp.common.core.domain.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.util.Date; @Data -public class WmsAttendanceCheckBo { +@EqualsAndHashCode(callSuper = true) +public class WmsAttendanceCheckBo extends BaseEntity { + private Long checkId; private Long userId; private String employeeName; private Long shiftId; @@ -20,4 +25,20 @@ public class WmsAttendanceCheckBo { @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; + + private Integer p1LateMinutes; + private Integer p1EarlyMinutes; + private String p1Status; + private BigDecimal p1Deduct; + + private Integer p2LateMinutes; + private Integer p2EarlyMinutes; + private String p2Status; + private BigDecimal p2Deduct; + + private String absentType; + private Integer continuousAbsentDays; + private BigDecimal totalDeduct; + private String overallStatus; + private String remark; } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsAttendanceCheckService.java b/klp-wms/src/main/java/com/klp/service/IWmsAttendanceCheckService.java index f392c3f2..5a78ba07 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsAttendanceCheckService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsAttendanceCheckService.java @@ -20,4 +20,6 @@ public interface IWmsAttendanceCheckService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); void checkAttendance(AttendanceCheckBo bo); + + Boolean updateByBo(WmsAttendanceCheckBo bo); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java index 2f090a30..c69278a3 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java @@ -1,5 +1,6 @@ package com.klp.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -77,6 +78,13 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService return baseMapper.deleteBatchIds(ids) > 0; } + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(WmsAttendanceCheckBo bo) { + WmsAttendanceCheck update = BeanUtil.toBean(bo, WmsAttendanceCheck.class); + return baseMapper.updateById(update) > 0; + } + private LambdaQueryWrapper buildQueryWrapper(WmsAttendanceCheckBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getUserId() != null, WmsAttendanceCheck::getUserId, bo.getUserId()); From 2f974c4b6f854c690d7441dd96cddb51091439ef Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 15 May 2026 13:17:39 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=8F=8A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建检验任务主实体、业务对象和服务接口及实现类 - 创建检验任务项目实体、业务对象和服务接口及实现类 - 实现检验任务和项目的增删改查功能 - 添加检验任务和项目的数据访问层和映射配置 - 集成分页查询和导出功能 - 配置数据校验和权限控制 --- .../QcInspectionItemController.java | 99 +++++++++++++++ .../QcInspectionTaskController.java | 99 +++++++++++++++ .../klp/mes/qc/domain/QcInspectionItem.java | 88 +++++++++++++ .../klp/mes/qc/domain/QcInspectionTask.java | 87 +++++++++++++ .../mes/qc/domain/bo/QcInspectionItemBo.java | 94 ++++++++++++++ .../mes/qc/domain/bo/QcInspectionTaskBo.java | 93 ++++++++++++++ .../mes/qc/domain/vo/QcInspectionItemVo.java | 111 ++++++++++++++++ .../mes/qc/domain/vo/QcInspectionTaskVo.java | 114 +++++++++++++++++ .../mes/qc/mapper/QcInspectionItemMapper.java | 15 +++ .../mes/qc/mapper/QcInspectionTaskMapper.java | 15 +++ .../qc/service/IQcInspectionItemService.java | 49 +++++++ .../qc/service/IQcInspectionTaskService.java | 49 +++++++ .../impl/QcInspectionItemServiceImpl.java | 120 ++++++++++++++++++ .../impl/QcInspectionTaskServiceImpl.java | 120 ++++++++++++++++++ .../mapper/qc/QcInspectionItemMapper.xml | 30 +++++ .../mapper/qc/QcInspectionTaskMapper.xml | 30 +++++ 16 files changed, 1213 insertions(+) create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/controller/QcInspectionItemController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/controller/QcInspectionTaskController.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionItem.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionItemBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionItemVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/mapper/QcInspectionItemMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/mapper/QcInspectionTaskMapper.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/IQcInspectionItemService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/IQcInspectionTaskService.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionItemServiceImpl.java create mode 100644 klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java create mode 100644 klp-mes/src/main/resources/mapper/qc/QcInspectionItemMapper.xml create mode 100644 klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/QcInspectionItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcInspectionItemController.java new file mode 100644 index 00000000..44377e86 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcInspectionItemController.java @@ -0,0 +1,99 @@ +package com.klp.mes.qc.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.mes.qc.domain.vo.QcInspectionItemVo; +import com.klp.mes.qc.domain.bo.QcInspectionItemBo; +import com.klp.mes.qc.service.IQcInspectionItemService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检验任务项目+结果 + * + * @author klp + * @date 2026-05-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qc/inspectionItem") +public class QcInspectionItemController extends BaseController { + + private final IQcInspectionItemService iQcInspectionItemService; + + /** + * 查询检验任务项目+结果列表 + */ + @GetMapping("/list") + public TableDataInfo list(QcInspectionItemBo bo, PageQuery pageQuery) { + return iQcInspectionItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出检验任务项目+结果列表 + */ + @Log(title = "检验任务项目+结果", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcInspectionItemBo bo, HttpServletResponse response) { + List list = iQcInspectionItemService.queryList(bo); + ExcelUtil.exportExcel(list, "检验任务项目+结果", QcInspectionItemVo.class, response); + } + + /** + * 获取检验任务项目+结果详细信息 + * + * @param itemId 主键 + */ + @GetMapping("/{itemId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long itemId) { + return R.ok(iQcInspectionItemService.queryById(itemId)); + } + + /** + * 新增检验任务项目+结果 + */ + @Log(title = "检验任务项目+结果", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcInspectionItemBo bo) { + return toAjax(iQcInspectionItemService.insertByBo(bo)); + } + + /** + * 修改检验任务项目+结果 + */ + @Log(title = "检验任务项目+结果", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcInspectionItemBo bo) { + return toAjax(iQcInspectionItemService.updateByBo(bo)); + } + + /** + * 删除检验任务项目+结果 + * + * @param itemIds 主键串 + */ + @Log(title = "检验任务项目+结果", businessType = BusinessType.DELETE) + @DeleteMapping("/{itemIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] itemIds) { + return toAjax(iQcInspectionItemService.deleteWithValidByIds(Arrays.asList(itemIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/QcInspectionTaskController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcInspectionTaskController.java new file mode 100644 index 00000000..d62e9c02 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/QcInspectionTaskController.java @@ -0,0 +1,99 @@ +package com.klp.mes.qc.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.mes.qc.domain.vo.QcInspectionTaskVo; +import com.klp.mes.qc.domain.bo.QcInspectionTaskBo; +import com.klp.mes.qc.service.IQcInspectionTaskService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检验任务主 + * + * @author klp + * @date 2026-05-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qc/inspectionTask") +public class QcInspectionTaskController extends BaseController { + + private final IQcInspectionTaskService iQcInspectionTaskService; + + /** + * 查询检验任务主列表 + */ + @GetMapping("/list") + public TableDataInfo list(QcInspectionTaskBo bo, PageQuery pageQuery) { + return iQcInspectionTaskService.queryPageList(bo, pageQuery); + } + + /** + * 导出检验任务主列表 + */ + @Log(title = "检验任务主", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcInspectionTaskBo bo, HttpServletResponse response) { + List list = iQcInspectionTaskService.queryList(bo); + ExcelUtil.exportExcel(list, "检验任务主", QcInspectionTaskVo.class, response); + } + + /** + * 获取检验任务主详细信息 + * + * @param taskId 主键 + */ + @GetMapping("/{taskId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long taskId) { + return R.ok(iQcInspectionTaskService.queryById(taskId)); + } + + /** + * 新增检验任务主 + */ + @Log(title = "检验任务主", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcInspectionTaskBo bo) { + return toAjax(iQcInspectionTaskService.insertByBo(bo)); + } + + /** + * 修改检验任务主 + */ + @Log(title = "检验任务主", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcInspectionTaskBo bo) { + return toAjax(iQcInspectionTaskService.updateByBo(bo)); + } + + /** + * 删除检验任务主 + * + * @param taskIds 主键串 + */ + @Log(title = "检验任务主", businessType = BusinessType.DELETE) + @DeleteMapping("/{taskIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] taskIds) { + return toAjax(iQcInspectionTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionItem.java new file mode 100644 index 00000000..b8325d0b --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionItem.java @@ -0,0 +1,88 @@ +package com.klp.mes.qc.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; + +/** + * 检验任务项目+结果对象 qc_inspection_item + * + * @author klp + * @date 2026-05-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_inspection_item") +public class QcInspectionItem extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 明细ID + */ + @TableId(value = "item_id") + private Long itemId; + /** + * 任务ID + */ + private Long taskId; + /** + * 检验项目名称 + */ + private String itemName; + /** + * 标准值 + */ + private String standardValue; + /** + * 上限 + */ + private BigDecimal upperLimit; + /** + * 下限 + */ + private BigDecimal lowerLimit; + /** + * 单位 + */ + private String unit; + /** + * 定性/定量 + */ + private String itemType; + /** + * 检验值 + */ + private String inspectValue; + /** + * 是否合格（0不合格 1合格） + */ + private Integer isQualified; + /** + * 判定结果 + */ + private String judgeResult; + /** + * 检验人 + */ + private String inspectUser; + /** + * 检验时间 + */ + private Date inspectTime; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java new file mode 100644 index 00000000..25ebefd2 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java @@ -0,0 +1,87 @@ +package com.klp.mes.qc.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; + +/** + * 检验任务主对象 qc_inspection_task + * + * @author klp + * @date 2026-05-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_inspection_task") +public class QcInspectionTask extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 任务ID + */ + @TableId(value = "task_id") + private Long taskId; + /** + * 任务编号 + */ + private String taskCode; + /** + * 任务类型（内控/产品检验） + */ + private String taskType; + /** + * 来源类型（生产/采购/库存） + */ + private String sourceType; + /** + * 来源单据ID（工单/入库单等） + */ + private Long sourceId; + /** + * 检验方案ID + */ + private Long schemeId; + /** + * 检验方案名称 + */ + private String schemeName; + /** + * 状态（0待检验 1检验中 2待审核 3已完成 4已驳回） + */ + private Integer status; + /** + * 检验人 + */ + private String inspectUser; + /** + * 检验时间 + */ + private Date inspectTime; + /** + * 审核人 + */ + private String auditUser; + /** + * 审核时间 + */ + private Date auditTime; + /** + * 最终结果（合格/不合格） + */ + private String result; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionItemBo.java new file mode 100644 index 00000000..350a914c --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionItemBo.java @@ -0,0 +1,94 @@ +package com.klp.mes.qc.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; + +/** + * 检验任务项目+结果业务对象 qc_inspection_item + * + * @author klp + * @date 2026-05-15 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class QcInspectionItemBo extends BaseEntity { + + /** + * 明细ID + */ + private Long itemId; + + /** + * 任务ID + */ + private Long taskId; + + /** + * 检验项目名称 + */ + private String itemName; + + /** + * 标准值 + */ + private String standardValue; + + /** + * 上限 + */ + private BigDecimal upperLimit; + + /** + * 下限 + */ + private BigDecimal lowerLimit; + + /** + * 单位 + */ + private String unit; + + /** + * 定性/定量 + */ + private String itemType; + + /** + * 检验值 + */ + private String inspectValue; + + /** + * 是否合格（0不合格 1合格） + */ + private Integer isQualified; + + /** + * 判定结果 + */ + private String judgeResult; + + /** + * 检验人 + */ + private String inspectUser; + + /** + * 检验时间 + */ + private Date inspectTime; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java new file mode 100644 index 00000000..65920902 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java @@ -0,0 +1,93 @@ +package com.klp.mes.qc.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; + +/** + * 检验任务主业务对象 qc_inspection_task + * + * @author klp + * @date 2026-05-15 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class QcInspectionTaskBo extends BaseEntity { + + /** + * 任务ID + */ + private Long taskId; + + /** + * 任务编号 + */ + private String taskCode; + + /** + * 任务类型（内控/产品检验） + */ + private String taskType; + + /** + * 来源类型（生产/采购/库存） + */ + private String sourceType; + + /** + * 来源单据ID（工单/入库单等） + */ + private Long sourceId; + + /** + * 检验方案ID + */ + private Long schemeId; + + /** + * 检验方案名称 + */ + private String schemeName; + + /** + * 状态（0待检验 1检验中 2待审核 3已完成 4已驳回） + */ + private Integer status; + + /** + * 检验人 + */ + private String inspectUser; + + /** + * 检验时间 + */ + private Date inspectTime; + + /** + * 审核人 + */ + private String auditUser; + + /** + * 审核时间 + */ + private Date auditTime; + + /** + * 最终结果（合格/不合格） + */ + private String result; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionItemVo.java new file mode 100644 index 00000000..c35c52ee --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionItemVo.java @@ -0,0 +1,111 @@ +package com.klp.mes.qc.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; + + +/** + * 检验任务项目+结果视图对象 qc_inspection_item + * + * @author klp + * @date 2026-05-15 + */ +@Data +@ExcelIgnoreUnannotated +public class QcInspectionItemVo { + + private static final long serialVersionUID = 1L; + + /** + * 明细ID + */ + @ExcelProperty(value = "明细ID") + private Long itemId; + + /** + * 任务ID + */ + @ExcelProperty(value = "任务ID") + private Long taskId; + + /** + * 检验项目名称 + */ + @ExcelProperty(value = "检验项目名称") + private String itemName; + + /** + * 标准值 + */ + @ExcelProperty(value = "标准值") + private String standardValue; + + /** + * 上限 + */ + @ExcelProperty(value = "上限") + private BigDecimal upperLimit; + + /** + * 下限 + */ + @ExcelProperty(value = "下限") + private BigDecimal lowerLimit; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 定性/定量 + */ + @ExcelProperty(value = "定性/定量") + private String itemType; + + /** + * 检验值 + */ + @ExcelProperty(value = "检验值") + private String inspectValue; + + /** + * 是否合格（0不合格 1合格） + */ + @ExcelProperty(value = "是否合格", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=不合格,1=合格") + private Integer isQualified; + + /** + * 判定结果 + */ + @ExcelProperty(value = "判定结果") + private String judgeResult; + + /** + * 检验人 + */ + @ExcelProperty(value = "检验人") + private String inspectUser; + + /** + * 检验时间 + */ + @ExcelProperty(value = "检验时间") + private Date inspectTime; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java new file mode 100644 index 00000000..dd68d36f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java @@ -0,0 +1,114 @@ +package com.klp.mes.qc.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; + + +/** + * 检验任务主视图对象 qc_inspection_task + * + * @author klp + * @date 2026-05-15 + */ +@Data +@ExcelIgnoreUnannotated +public class QcInspectionTaskVo { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ExcelProperty(value = "任务ID") + private Long taskId; + + /** + * 任务编号 + */ + @ExcelProperty(value = "任务编号") + private String taskCode; + + /** + * 任务类型（内控/产品检验） + */ + @ExcelProperty(value = "任务类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "内=控/产品检验") + private String taskType; + + /** + * 来源类型（生产/采购/库存） + */ + @ExcelProperty(value = "来源类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "生=产/采购/库存") + private String sourceType; + + /** + * 来源单据ID（工单/入库单等） + */ + @ExcelProperty(value = "来源单据ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "工=单/入库单等") + private Long sourceId; + + /** + * 检验方案ID + */ + @ExcelProperty(value = "检验方案ID") + private Long schemeId; + + /** + * 检验方案名称 + */ + @ExcelProperty(value = "检验方案名称") + private String schemeName; + + /** + * 状态（0待检验 1检验中 2待审核 3已完成 4已驳回） + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=待检验,1=检验中,2=待审核,3=已完成,4=已驳回") + private Integer status; + + /** + * 检验人 + */ + @ExcelProperty(value = "检验人") + private String inspectUser; + + /** + * 检验时间 + */ + @ExcelProperty(value = "检验时间") + private Date inspectTime; + + /** + * 审核人 + */ + @ExcelProperty(value = "审核人") + private String auditUser; + + /** + * 审核时间 + */ + @ExcelProperty(value = "审核时间") + private Date auditTime; + + /** + * 最终结果（合格/不合格） + */ + @ExcelProperty(value = "最终结果", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "合=格/不合格") + private String result; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcInspectionItemMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcInspectionItemMapper.java new file mode 100644 index 00000000..6e8d66a6 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcInspectionItemMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.qc.mapper; + +import com.klp.mes.qc.domain.QcInspectionItem; +import com.klp.mes.qc.domain.vo.QcInspectionItemVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检验任务项目+结果Mapper接口 + * + * @author klp + * @date 2026-05-15 + */ +public interface QcInspectionItemMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcInspectionTaskMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcInspectionTaskMapper.java new file mode 100644 index 00000000..ae24a9d4 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/QcInspectionTaskMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.qc.mapper; + +import com.klp.mes.qc.domain.QcInspectionTask; +import com.klp.mes.qc.domain.vo.QcInspectionTaskVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检验任务主Mapper接口 + * + * @author klp + * @date 2026-05-15 + */ +public interface QcInspectionTaskMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IQcInspectionItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcInspectionItemService.java new file mode 100644 index 00000000..e927be5d --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcInspectionItemService.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.service; + +import com.klp.mes.qc.domain.QcInspectionItem; +import com.klp.mes.qc.domain.vo.QcInspectionItemVo; +import com.klp.mes.qc.domain.bo.QcInspectionItemBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检验任务项目+结果Service接口 + * + * @author klp + * @date 2026-05-15 + */ +public interface IQcInspectionItemService { + + /** + * 查询检验任务项目+结果 + */ + QcInspectionItemVo queryById(Long itemId); + + /** + * 查询检验任务项目+结果列表 + */ + TableDataInfo queryPageList(QcInspectionItemBo bo, PageQuery pageQuery); + + /** + * 查询检验任务项目+结果列表 + */ + List queryList(QcInspectionItemBo bo); + + /** + * 新增检验任务项目+结果 + */ + Boolean insertByBo(QcInspectionItemBo bo); + + /** + * 修改检验任务项目+结果 + */ + Boolean updateByBo(QcInspectionItemBo bo); + + /** + * 校验并批量删除检验任务项目+结果信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IQcInspectionTaskService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcInspectionTaskService.java new file mode 100644 index 00000000..9d517534 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IQcInspectionTaskService.java @@ -0,0 +1,49 @@ +package com.klp.mes.qc.service; + +import com.klp.mes.qc.domain.QcInspectionTask; +import com.klp.mes.qc.domain.vo.QcInspectionTaskVo; +import com.klp.mes.qc.domain.bo.QcInspectionTaskBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检验任务主Service接口 + * + * @author klp + * @date 2026-05-15 + */ +public interface IQcInspectionTaskService { + + /** + * 查询检验任务主 + */ + QcInspectionTaskVo queryById(Long taskId); + + /** + * 查询检验任务主列表 + */ + TableDataInfo queryPageList(QcInspectionTaskBo bo, PageQuery pageQuery); + + /** + * 查询检验任务主列表 + */ + List queryList(QcInspectionTaskBo bo); + + /** + * 新增检验任务主 + */ + Boolean insertByBo(QcInspectionTaskBo bo); + + /** + * 修改检验任务主 + */ + Boolean updateByBo(QcInspectionTaskBo bo); + + /** + * 校验并批量删除检验任务主信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionItemServiceImpl.java new file mode 100644 index 00000000..340c0114 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionItemServiceImpl.java @@ -0,0 +1,120 @@ +package com.klp.mes.qc.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.mes.qc.domain.bo.QcInspectionItemBo; +import com.klp.mes.qc.domain.vo.QcInspectionItemVo; +import com.klp.mes.qc.domain.QcInspectionItem; +import com.klp.mes.qc.mapper.QcInspectionItemMapper; +import com.klp.mes.qc.service.IQcInspectionItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检验任务项目+结果Service业务层处理 + * + * @author klp + * @date 2026-05-15 + */ +@RequiredArgsConstructor +@Service +public class QcInspectionItemServiceImpl implements IQcInspectionItemService { + + private final QcInspectionItemMapper baseMapper; + + /** + * 查询检验任务项目+结果 + */ + @Override + public QcInspectionItemVo queryById(Long itemId){ + return baseMapper.selectVoById(itemId); + } + + /** + * 查询检验任务项目+结果列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检验任务项目+结果列表 + */ + @Override + public List queryList(QcInspectionItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(QcInspectionItemBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTaskId() != null, QcInspectionItem::getTaskId, bo.getTaskId()); + lqw.like(StringUtils.isNotBlank(bo.getItemName()), QcInspectionItem::getItemName, bo.getItemName()); + lqw.eq(StringUtils.isNotBlank(bo.getStandardValue()), QcInspectionItem::getStandardValue, bo.getStandardValue()); + lqw.eq(bo.getUpperLimit() != null, QcInspectionItem::getUpperLimit, bo.getUpperLimit()); + lqw.eq(bo.getLowerLimit() != null, QcInspectionItem::getLowerLimit, bo.getLowerLimit()); + lqw.eq(StringUtils.isNotBlank(bo.getUnit()), QcInspectionItem::getUnit, bo.getUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getItemType()), QcInspectionItem::getItemType, bo.getItemType()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectValue()), QcInspectionItem::getInspectValue, bo.getInspectValue()); + lqw.eq(bo.getIsQualified() != null, QcInspectionItem::getIsQualified, bo.getIsQualified()); + lqw.eq(StringUtils.isNotBlank(bo.getJudgeResult()), QcInspectionItem::getJudgeResult, bo.getJudgeResult()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectUser()), QcInspectionItem::getInspectUser, bo.getInspectUser()); + lqw.eq(bo.getInspectTime() != null, QcInspectionItem::getInspectTime, bo.getInspectTime()); + return lqw; + } + + /** + * 新增检验任务项目+结果 + */ + @Override + public Boolean insertByBo(QcInspectionItemBo bo) { + QcInspectionItem add = BeanUtil.toBean(bo, QcInspectionItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setItemId(add.getItemId()); + } + return flag; + } + + /** + * 修改检验任务项目+结果 + */ + @Override + public Boolean updateByBo(QcInspectionItemBo bo) { + QcInspectionItem update = BeanUtil.toBean(bo, QcInspectionItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcInspectionItem entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除检验任务项目+结果 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java new file mode 100644 index 00000000..f2492075 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java @@ -0,0 +1,120 @@ +package com.klp.mes.qc.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.mes.qc.domain.bo.QcInspectionTaskBo; +import com.klp.mes.qc.domain.vo.QcInspectionTaskVo; +import com.klp.mes.qc.domain.QcInspectionTask; +import com.klp.mes.qc.mapper.QcInspectionTaskMapper; +import com.klp.mes.qc.service.IQcInspectionTaskService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检验任务主Service业务层处理 + * + * @author klp + * @date 2026-05-15 + */ +@RequiredArgsConstructor +@Service +public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { + + private final QcInspectionTaskMapper baseMapper; + + /** + * 查询检验任务主 + */ + @Override + public QcInspectionTaskVo queryById(Long taskId){ + return baseMapper.selectVoById(taskId); + } + + /** + * 查询检验任务主列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionTaskBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检验任务主列表 + */ + @Override + public List queryList(QcInspectionTaskBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(QcInspectionTaskBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTaskCode()), QcInspectionTask::getTaskCode, bo.getTaskCode()); + lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), QcInspectionTask::getTaskType, bo.getTaskType()); + lqw.eq(StringUtils.isNotBlank(bo.getSourceType()), QcInspectionTask::getSourceType, bo.getSourceType()); + lqw.eq(bo.getSourceId() != null, QcInspectionTask::getSourceId, bo.getSourceId()); + lqw.eq(bo.getSchemeId() != null, QcInspectionTask::getSchemeId, bo.getSchemeId()); + lqw.like(StringUtils.isNotBlank(bo.getSchemeName()), QcInspectionTask::getSchemeName, bo.getSchemeName()); + lqw.eq(bo.getStatus() != null, QcInspectionTask::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectUser()), QcInspectionTask::getInspectUser, bo.getInspectUser()); + lqw.eq(bo.getInspectTime() != null, QcInspectionTask::getInspectTime, bo.getInspectTime()); + lqw.eq(StringUtils.isNotBlank(bo.getAuditUser()), QcInspectionTask::getAuditUser, bo.getAuditUser()); + lqw.eq(bo.getAuditTime() != null, QcInspectionTask::getAuditTime, bo.getAuditTime()); + lqw.eq(StringUtils.isNotBlank(bo.getResult()), QcInspectionTask::getResult, bo.getResult()); + return lqw; + } + + /** + * 新增检验任务主 + */ + @Override + public Boolean insertByBo(QcInspectionTaskBo bo) { + QcInspectionTask add = BeanUtil.toBean(bo, QcInspectionTask.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTaskId(add.getTaskId()); + } + return flag; + } + + /** + * 修改检验任务主 + */ + @Override + public Boolean updateByBo(QcInspectionTaskBo bo) { + QcInspectionTask update = BeanUtil.toBean(bo, QcInspectionTask.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcInspectionTask entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除检验任务主 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-mes/src/main/resources/mapper/qc/QcInspectionItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcInspectionItemMapper.xml new file mode 100644 index 00000000..ba87d64f --- /dev/null +++ b/klp-mes/src/main/resources/mapper/qc/QcInspectionItemMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml new file mode 100644 index 00000000..c085cf22 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ffecaf9a5aa2f3917ef749ec56cfffe91a0be0c4 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 15 May 2026 13:38:54 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=AF=B7?= =?UTF-8?q?=E5=81=87=E5=92=8C=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E7=9A=84?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsLeaveRequestVo和WmsOutRequestVo中新增审批状态、审批类型和审批人姓名字段 - 在WmsLeaveRequestServiceImpl的查询方法中集成审批信息获取逻辑 - 在WmsOutRequestServiceImpl的查询方法中集成审批信息获取逻辑 - 通过审批服务查询并填充每条记录的审批相关信息 - 实现了统一的审批信息展示功能，提升用户体验 --- .../java/com/klp/domain/vo/WmsLeaveRequestVo.java | 14 ++++++++++++++ .../java/com/klp/domain/vo/WmsOutRequestVo.java | 14 ++++++++++++++ .../service/impl/WmsLeaveRequestServiceImpl.java | 14 ++++++++++++++ .../klp/service/impl/WmsOutRequestServiceImpl.java | 14 ++++++++++++++ 4 files changed, 56 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java index b84bfbc4..3381fdac 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java @@ -95,5 +95,19 @@ public class WmsLeaveRequestVo extends BaseEntity { private String createByName; + /** + * 审批状态（待审批/已同意/已驳回/已撤销） + */ + private String approvalStatus; + + /** + * 审批类型（single=单人审批，multi=多级审批） + */ + private String approvalType; + + /** + * 审批人姓名 + */ + private String approverName; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java index af5b8618..cf5366f4 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java @@ -94,5 +94,19 @@ public class WmsOutRequestVo extends BaseEntity { private String createByName; + /** + * 审批状态（待审批/已同意/已驳回/已撤销） + */ + private String approvalStatus; + + /** + * 审批类型（single=单人审批，multi=多级审批） + */ + private String approvalType; + + /** + * 审批人姓名 + */ + private String approverName; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java index 8064f080..dbec4e9d 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; import com.klp.domain.bo.WmsApprovalBo; +import com.klp.domain.vo.WmsApprovalVo; import com.klp.service.IWmsApprovalService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -51,6 +52,19 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { public TableDataInfo queryPageList(WmsLeaveRequestBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(row -> { + // 获取审批信息 + WmsApprovalBo approval = new WmsApprovalBo(); + approval.setApplyId(row.getLeaveId()); + approval.setApplyType("leave"); + List approvals = approvalService.queryList(approval); + if (!approvals.isEmpty()) { + WmsApprovalVo approvalVo = approvals.get(0); + row.setApprovalStatus(approvalVo.getApprovalStatus()); + row.setApprovalType(approvalVo.getApprovalType()); + row.setApproverName(approvalVo.getApproverName()); + } + }); return TableDataInfo.build(result); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java index b33c732e..88b668a3 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; import com.klp.domain.bo.WmsApprovalBo; +import com.klp.domain.vo.WmsApprovalVo; import com.klp.service.IWmsApprovalService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -52,6 +53,19 @@ public class WmsOutRequestServiceImpl implements IWmsOutRequestService { public TableDataInfo queryPageList(WmsOutRequestBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(row -> { + // 获取审批信息 + WmsApprovalBo approval = new WmsApprovalBo(); + approval.setApplyId(row.getOutId()); + approval.setApplyType("out"); + List approvals = approvalService.queryList(approval); + if (!approvals.isEmpty()) { + WmsApprovalVo approvalVo = approvals.get(0); + row.setApprovalStatus(approvalVo.getApprovalStatus()); + row.setApprovalType(approvalVo.getApprovalType()); + row.setApproverName(approvalVo.getApproverName()); + } + }); return TableDataInfo.build(result); } From edbad7e0df01e67dedd2bf4c13e9cf8a979c5f67 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 15 May 2026 13:57:42 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix(query):=20=E4=BF=AE=E5=A4=8D=E8=AF=B7?= =?UTF-8?q?=E5=81=87=E5=92=8C=E5=A4=96=E5=87=BA=E7=94=B3=E8=AF=B7=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除WmsLeaveRequestServiceImpl中重复的时间条件查询 - 为WmsOutRequestServiceImpl添加正确的日期范围交集查询逻辑 - 实现(start_time <= endTime AND end_time >= startTime)的时间范围匹配条件 - 添加单侧时间条件查询支持(仅开始时间或结束时间) - 导入WmsLeaveRequest类到WmsOutRequestServiceImpl中 --- .../service/impl/WmsLeaveRequestServiceImpl.java | 3 --- .../klp/service/impl/WmsOutRequestServiceImpl.java | 13 +++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java index dbec4e9d..73591802 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java @@ -114,9 +114,6 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService { } else if (bo.getEndTime() != null) { lqw.le(WmsLeaveRequest::getStartTime, bo.getEndTime()); } - - lqw.eq(bo.getStartTime() != null, WmsLeaveRequest::getStartTime, bo.getStartTime()); - lqw.eq(bo.getEndTime() != null, WmsLeaveRequest::getEndTime, bo.getEndTime()); lqw.eq(StringUtils.isNotBlank(bo.getLeaveShift()), WmsLeaveRequest::getLeaveShift, bo.getLeaveShift()); lqw.eq(bo.getLeaveDays() != null, WmsLeaveRequest::getLeaveDays, bo.getLeaveDays()); lqw.eq(StringUtils.isNotBlank(bo.getLeaveReason()), WmsLeaveRequest::getLeaveReason, bo.getLeaveReason()); diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java index 88b668a3..1e8f50aa 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java @@ -7,6 +7,7 @@ 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 com.klp.domain.WmsLeaveRequest; import com.klp.domain.bo.WmsApprovalBo; import com.klp.domain.vo.WmsApprovalVo; import com.klp.service.IWmsApprovalService; @@ -84,8 +85,16 @@ public class WmsOutRequestServiceImpl implements IWmsOutRequestService { lqw.eq(StringUtils.isNotBlank(bo.getOutType()), WmsOutRequest::getOutType, bo.getOutType()); lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), WmsOutRequest::getApplicantName, bo.getApplicantName()); lqw.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), WmsOutRequest::getApplicantDeptName, bo.getApplicantDeptName()); - lqw.eq(bo.getStartTime() != null, WmsOutRequest::getStartTime, bo.getStartTime()); - lqw.eq(bo.getEndTime() != null, WmsOutRequest::getEndTime, bo.getEndTime()); + // 请假时间范围筛选：筛选出请假时间与查询时间范围有交集的记录 + // 条件：(start_time <= endTime AND end_time >= startTime) + if (bo.getStartTime() != null && bo.getEndTime() != null) { + lqw.le(WmsOutRequest::getStartTime, bo.getEndTime()) + .ge(WmsOutRequest::getEndTime, bo.getStartTime()); + } else if (bo.getStartTime() != null) { + lqw.ge(WmsOutRequest::getEndTime, bo.getStartTime()); + } else if (bo.getEndTime() != null) { + lqw.le(WmsOutRequest::getStartTime, bo.getEndTime()); + } lqw.eq(bo.getOutHours() != null, WmsOutRequest::getOutHours, bo.getOutHours()); lqw.eq(StringUtils.isNotBlank(bo.getOutPlace()), WmsOutRequest::getOutPlace, bo.getOutPlace()); lqw.eq(StringUtils.isNotBlank(bo.getOutReason()), WmsOutRequest::getOutReason, bo.getOutReason()); From 1af19ce959bb57ad88d346af456ee95e4d2b4000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Fri, 15 May 2026 14:02:14 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增考勤班次、考勤规则、倒班规则、考勤排班、考勤比对等API接口 2. 新增考勤管理相关页面，包括班次管理、考勤规则管理、倒班规则管理、排班管理等 3. 完善日期时间格式化注解，修复参数绑定问题 4. 优化时间选择组件，支持日期/时间模式切换 --- klp-ui/src/api/wms/attendanceCheck.js | 53 + klp-ui/src/api/wms/attendanceRule.js | 44 + klp-ui/src/api/wms/attendanceSchedule.js | 62 + klp-ui/src/api/wms/attendanceShift.js | 44 + klp-ui/src/api/wms/attendanceShiftRule.js | 44 + .../wms/hrm/attendance/attendanceCheck.vue | 1009 +++++++++++++++++ .../wms/hrm/attendance/attendanceRule.vue | 308 +++++ klp-ui/src/views/wms/hrm/attendance/drag.vue | 719 ++++++++++++ klp-ui/src/views/wms/hrm/attendance/shift.vue | 519 +++++++++ .../views/wms/hrm/attendance/shiftRule.vue | 399 +++++++ .../hrm/attendance/{index.vue => sync.vue} | 0 .../wms/report/components/timeRangePicker.vue | 26 +- .../domain/bo/WmsAttendanceScheduleBo.java | 2 + .../com/klp/domain/bo/WmsOutRequestBo.java | 5 + 14 files changed, 3228 insertions(+), 6 deletions(-) create mode 100644 klp-ui/src/api/wms/attendanceCheck.js create mode 100644 klp-ui/src/api/wms/attendanceRule.js create mode 100644 klp-ui/src/api/wms/attendanceSchedule.js create mode 100644 klp-ui/src/api/wms/attendanceShift.js create mode 100644 klp-ui/src/api/wms/attendanceShiftRule.js create mode 100644 klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue create mode 100644 klp-ui/src/views/wms/hrm/attendance/attendanceRule.vue create mode 100644 klp-ui/src/views/wms/hrm/attendance/drag.vue create mode 100644 klp-ui/src/views/wms/hrm/attendance/shift.vue create mode 100644 klp-ui/src/views/wms/hrm/attendance/shiftRule.vue rename klp-ui/src/views/wms/hrm/attendance/{index.vue => sync.vue} (100%) diff --git a/klp-ui/src/api/wms/attendanceCheck.js b/klp-ui/src/api/wms/attendanceCheck.js new file mode 100644 index 00000000..8917437d --- /dev/null +++ b/klp-ui/src/api/wms/attendanceCheck.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询考勤比对结果（排班与打卡比对）列表 +export function listAttendanceCheck(query) { + return request({ + url: '/wms/attendanceCheck/list', + method: 'get', + params: query + }) +} + +// 查询考勤比对结果（排班与打卡比对）详细 +export function getAttendanceCheck(checkId) { + return request({ + url: '/wms/attendanceCheck/' + checkId, + method: 'get' + }) +} + +// 新增考勤比对结果（排班与打卡比对） +export function addAttendanceCheck(data) { + return request({ + url: '/wms/attendanceCheck', + method: 'post', + data: data + }) +} + +// 修改考勤比对结果（排班与打卡比对） +export function updateAttendanceCheck(data) { + return request({ + url: '/wms/attendanceCheck', + method: 'put', + data: data + }) +} + +// 删除考勤比对结果（排班与打卡比对） +export function delAttendanceCheck(checkId) { + return request({ + url: '/wms/attendanceCheck/' + checkId, + method: 'delete' + }) +} + +// 一键生成考勤对比结果 +export function generateAttendanceCheck(data) { + return request({ + url: '/wms/attendanceCheck/check', + method: 'post', + data: data + }) +} diff --git a/klp-ui/src/api/wms/attendanceRule.js b/klp-ui/src/api/wms/attendanceRule.js new file mode 100644 index 00000000..43e34c8a --- /dev/null +++ b/klp-ui/src/api/wms/attendanceRule.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询考勤规则列表 +export function listAttendanceRule(query) { + return request({ + url: '/wms/attendanceRule/list', + method: 'get', + params: query + }) +} + +// 查询考勤规则详细 +export function getAttendanceRule(ruleId) { + return request({ + url: '/wms/attendanceRule/' + ruleId, + method: 'get' + }) +} + +// 新增考勤规则 +export function addAttendanceRule(data) { + return request({ + url: '/wms/attendanceRule', + method: 'post', + data: data + }) +} + +// 修改考勤规则 +export function updateAttendanceRule(data) { + return request({ + url: '/wms/attendanceRule', + method: 'put', + data: data + }) +} + +// 删除考勤规则 +export function delAttendanceRule(ruleId) { + return request({ + url: '/wms/attendanceRule/' + ruleId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/attendanceSchedule.js b/klp-ui/src/api/wms/attendanceSchedule.js new file mode 100644 index 00000000..cd286284 --- /dev/null +++ b/klp-ui/src/api/wms/attendanceSchedule.js @@ -0,0 +1,62 @@ +import request from '@/utils/request' + +// 查询排班记录列表 +export function listAttendanceSchedule(query) { + return request({ + url: '/wms/attendanceSchedule/list', + method: 'get', + params: query + }) +} + +// 查询排班记录详细 +export function getAttendanceSchedule(id) { + return request({ + url: '/wms/attendanceSchedule/' + id, + method: 'get' + }) +} + +// 新增排班记录 +export function addAttendanceSchedule(data) { + return request({ + url: '/wms/attendanceSchedule', + method: 'post', + data: data + }) +} + +// 修改排班记录 +export function updateAttendanceSchedule(data) { + return request({ + url: '/wms/attendanceSchedule', + method: 'put', + data: data + }) +} + +// 删除排班记录(支持批量删除，传递csv格式字符串如：1,2,3) +export function delAttendanceSchedule(ids) { + return request({ + url: '/wms/attendanceSchedule/' + ids, + method: 'delete' + }) +} + +// 生成单个人的排班记录(批量) +export function generateenerateSchedule(data) { + return request({ + url: '/wms/attendanceSchedule/generate', + method: 'post', + data: data + }) +} + +// 批量生成排班记录 +export function batchGenerateSchedule(data) { + return request({ + url: '/wms/attendanceSchedule/batchGenerate', + method: 'post', + data: data + }) +} diff --git a/klp-ui/src/api/wms/attendanceShift.js b/klp-ui/src/api/wms/attendanceShift.js new file mode 100644 index 00000000..f0f54041 --- /dev/null +++ b/klp-ui/src/api/wms/attendanceShift.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询班次列表 +export function listShift(query) { + return request({ + url: '/wms/attendanceShift/list', + method: 'get', + params: query + }) +} + +// 查询班次详细 +export function getShift(id) { + return request({ + url: '/wms/attendanceShift/' + id, + method: 'get' + }) +} + +// 新增班次 +export function addShift(data) { + return request({ + url: '/wms/attendanceShift', + method: 'post', + data: data + }) +} + +// 修改班次 +export function updateShift(data) { + return request({ + url: '/wms/attendanceShift', + method: 'put', + data: data + }) +} + +// 删除班次 +export function delShift(id) { + return request({ + url: '/wms/attendanceShift/' + id, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/attendanceShiftRule.js b/klp-ui/src/api/wms/attendanceShiftRule.js new file mode 100644 index 00000000..05aff356 --- /dev/null +++ b/klp-ui/src/api/wms/attendanceShiftRule.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询倒班规则列表 +export function listAttendanceShiftRule(query) { + return request({ + url: '/wms/attendanceShiftRule/list', + method: 'get', + params: query + }) +} + +// 查询倒班规则详细 +export function getAttendanceShiftRule(ruleId) { + return request({ + url: '/wms/attendanceShiftRule/' + ruleId, + method: 'get' + }) +} + +// 新增倒班规则 +export function addAttendanceShiftRule(data) { + return request({ + url: '/wms/attendanceShiftRule', + method: 'post', + data: data + }) +} + +// 修改倒班规则 +export function updateAttendanceShiftRule(data) { + return request({ + url: '/wms/attendanceShiftRule', + method: 'put', + data: data + }) +} + +// 删除倒班规则 +export function delAttendanceShiftRule(ruleId) { + return request({ + url: '/wms/attendanceShiftRule/' + ruleId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue new file mode 100644 index 00000000..7873e805 --- /dev/null +++ b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue @@ -0,0 +1,1009 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/attendance/attendanceRule.vue b/klp-ui/src/views/wms/hrm/attendance/attendanceRule.vue new file mode 100644 index 00000000..5e2af293 --- /dev/null +++ b/klp-ui/src/views/wms/hrm/attendance/attendanceRule.vue @@ -0,0 +1,308 @@ + + + diff --git a/klp-ui/src/views/wms/hrm/attendance/drag.vue b/klp-ui/src/views/wms/hrm/attendance/drag.vue new file mode 100644 index 00000000..01d5ceaf --- /dev/null +++ b/klp-ui/src/views/wms/hrm/attendance/drag.vue @@ -0,0 +1,719 @@ + + + + + diff --git a/klp-ui/src/views/wms/hrm/attendance/shift.vue b/klp-ui/src/views/wms/hrm/attendance/shift.vue new file mode 100644 index 00000000..bf603f94 --- /dev/null +++ b/klp-ui/src/views/wms/hrm/attendance/shift.vue @@ -0,0 +1,519 @@ + + + diff --git a/klp-ui/src/views/wms/hrm/attendance/shiftRule.vue b/klp-ui/src/views/wms/hrm/attendance/shiftRule.vue new file mode 100644 index 00000000..ad167176 --- /dev/null +++ b/klp-ui/src/views/wms/hrm/attendance/shiftRule.vue @@ -0,0 +1,399 @@ + + + diff --git a/klp-ui/src/views/wms/hrm/attendance/index.vue b/klp-ui/src/views/wms/hrm/attendance/sync.vue similarity index 100% rename from klp-ui/src/views/wms/hrm/attendance/index.vue rename to klp-ui/src/views/wms/hrm/attendance/sync.vue diff --git a/klp-ui/src/views/wms/report/components/timeRangePicker.vue b/klp-ui/src/views/wms/report/components/timeRangePicker.vue index 64bc4097..476d6c1e 100644 --- a/klp-ui/src/views/wms/report/components/timeRangePicker.vue +++ b/klp-ui/src/views/wms/report/components/timeRangePicker.vue @@ -4,18 +4,18 @@ 至 @@ -55,6 +55,18 @@ export default { defaultEndTime: { type: String, default: '' + }, + format: { + type: String, + default: 'yyyy-MM-dd HH:mm:ss' + } + }, + computed: { + pickerType() { + return this.isDateType ? 'date' : 'datetime' + }, + isDateType() { + return this.format === 'yyyy-MM-dd' } }, data() { @@ -94,12 +106,14 @@ export default { }, // 从时间字符串中提取时分秒部分 getTimePart(timeStr) { + if (this.isDateType) return '' if (!timeStr) return '07:00:00' const parts = timeStr.split(' ') return parts.length > 1 ? parts[1] : '07:00:00' }, // 将日期和时间组合 combineDateTime(dateStr, timeStr) { + if (this.isDateType) return dateStr return `${dateStr} ${timeStr}` }, handleTimeChange() { diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceScheduleBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceScheduleBo.java index f8422a64..19329b95 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceScheduleBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAttendanceScheduleBo.java @@ -33,6 +33,8 @@ public class WmsAttendanceScheduleBo extends BaseEntity { /** * 日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date workDate; /** diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsOutRequestBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsOutRequestBo.java index b6d5c8e8..15efe20b 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsOutRequestBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsOutRequestBo.java @@ -8,6 +8,7 @@ import javax.validation.constraints.*; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 员工外出申请业务对象 wms_out_request @@ -43,11 +44,15 @@ public class WmsOutRequestBo extends BaseEntity { /** * 外出开始时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date startTime; /** * 外出结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date endTime; /** From e938515efb15dc25206929d743a6e74ece92a871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Fri, 15 May 2026 15:16:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix(wms/coil):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=88=86=E7=A7=92=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整日期选择器格式为仅年月日，并手动拼接完整时分秒到查询参数，确保时间筛选范围正确覆盖全天 --- klp-ui/src/views/wms/coil/panels/base.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index b52ece0f..4d6d52c2 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -85,7 +85,7 @@ - @@ -1747,8 +1747,8 @@ export default { ...this.queryParams, exportTimeBy: true, selectType: this.querys.materialType === '原料' ? 'raw_material' : 'product', - startTime: this.queryParams.shipmentTime?.[0], - endTime: this.queryParams.shipmentTime?.[1], + startTime: this.queryParams.shipmentTime?.[0] + ' 00:00:00', + endTime: this.queryParams.shipmentTime?.[1] + ' 23:59:59', } listBoundCoil(query).then(res => { this.materialCoilList = res.rows || []; From 78b2e21da7739c87185b4b8d6dcc5baf36b32dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Fri, 15 May 2026 16:36:27 +0800 Subject: [PATCH 8/8] refactor(wms): add component names and fix export time query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 为多个wms页面组件添加name属性统一命名规范 2. 修复运单页面导出时间参数为空时的拼接报错问题 --- klp-ui/src/views/wms/coil/panels/base.vue | 4 ++-- klp-ui/src/views/wms/coil/ship.vue | 1 + klp-ui/src/views/wms/coil/waybill.vue | 1 + klp-ui/src/views/wms/delivery/bills/index.vue | 1 + klp-ui/src/views/wms/delivery/canuse/index.vue | 1 + klp-ui/src/views/wms/delivery/waybill/index.vue | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 4d6d52c2..192afa3e 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -1747,8 +1747,8 @@ export default { ...this.queryParams, exportTimeBy: true, selectType: this.querys.materialType === '原料' ? 'raw_material' : 'product', - startTime: this.queryParams.shipmentTime?.[0] + ' 00:00:00', - endTime: this.queryParams.shipmentTime?.[1] + ' 23:59:59', + startTime: this.queryParams.shipmentTime?.[0] && this.queryParams.shipmentTime?.[0] + ' 00:00:00', + endTime: this.queryParams.shipmentTime?.[1] && this.queryParams.shipmentTime?.[1] + ' 23:59:59', } listBoundCoil(query).then(res => { this.materialCoilList = res.rows || []; diff --git a/klp-ui/src/views/wms/coil/ship.vue b/klp-ui/src/views/wms/coil/ship.vue index 94f28ba7..9efb8c00 100644 --- a/klp-ui/src/views/wms/coil/ship.vue +++ b/klp-ui/src/views/wms/coil/ship.vue @@ -6,6 +6,7 @@ import BasePage from './panels/base.vue'; export default { + name: "Exp-Coil", components: { BasePage }, diff --git a/klp-ui/src/views/wms/coil/waybill.vue b/klp-ui/src/views/wms/coil/waybill.vue index 21b3223f..a1c1cfb0 100644 --- a/klp-ui/src/views/wms/coil/waybill.vue +++ b/klp-ui/src/views/wms/coil/waybill.vue @@ -10,6 +10,7 @@ import BasePage from './panels/base.vue'; export default { + name: 'Exp-Bind', components: { BasePage }, diff --git a/klp-ui/src/views/wms/delivery/bills/index.vue b/klp-ui/src/views/wms/delivery/bills/index.vue index 033a4740..e4ab482e 100644 --- a/klp-ui/src/views/wms/delivery/bills/index.vue +++ b/klp-ui/src/views/wms/delivery/bills/index.vue @@ -70,6 +70,7 @@ import { listCoilByIds } from "@/api/wms/coil"; import WayBill from "../components/wayBill.vue"; export default { + name: "Exp-Bills", data() { return { deliveryWaybillList: [], diff --git a/klp-ui/src/views/wms/delivery/canuse/index.vue b/klp-ui/src/views/wms/delivery/canuse/index.vue index 85fad0e0..aa51d105 100644 --- a/klp-ui/src/views/wms/delivery/canuse/index.vue +++ b/klp-ui/src/views/wms/delivery/canuse/index.vue @@ -15,6 +15,7 @@ import BasePage from '@/views/wms/coil/panels/base.vue'; export default { + name: "Exp-Canuse", components: { BasePage }, diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue index 3859f3e3..22acffa5 100644 --- a/klp-ui/src/views/wms/delivery/waybill/index.vue +++ b/klp-ui/src/views/wms/delivery/waybill/index.vue @@ -248,7 +248,7 @@ import PlanSelector from "../components/planSelector.vue"; import DragResizePanel from "@/components/DragResizePanel"; export default { - name: "DeliveryWaybill", + name: "Exp-Waybill", components: { MemoInput, DeliveryWaybillDetail,