diff --git a/klp-mes/src/main/java/com/klp/mes/is/controller/IsInspectionCommissionController.java b/klp-mes/src/main/java/com/klp/mes/is/controller/IsInspectionCommissionController.java new file mode 100644 index 00000000..f30441b7 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/controller/IsInspectionCommissionController.java @@ -0,0 +1,99 @@ +package com.klp.mes.is.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.is.domain.vo.IsInspectionCommissionVo; +import com.klp.mes.is.domain.bo.IsInspectionCommissionBo; +import com.klp.mes.is.service.IIsInspectionCommissionService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检验委托单表 + * + * @author Joshi + * @date 2025-08-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/is/inspectionCommission") +public class IsInspectionCommissionController extends BaseController { + + private final IIsInspectionCommissionService iIsInspectionCommissionService; + + /** + * 查询检验委托单表列表 + */ + @GetMapping("/list") + public TableDataInfo list(IsInspectionCommissionBo bo, PageQuery pageQuery) { + return iIsInspectionCommissionService.queryPageList(bo, pageQuery); + } + + /** + * 导出检验委托单表列表 + */ + @Log(title = "检验委托单表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(IsInspectionCommissionBo bo, HttpServletResponse response) { + List list = iIsInspectionCommissionService.queryList(bo); + ExcelUtil.exportExcel(list, "检验委托单表", IsInspectionCommissionVo.class, response); + } + + /** + * 获取检验委托单表详细信息 + * + * @param commissionId 主键 + */ + @GetMapping("/{commissionId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long commissionId) { + return R.ok(iIsInspectionCommissionService.queryById(commissionId)); + } + + /** + * 新增检验委托单表 + */ + @Log(title = "检验委托单表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody IsInspectionCommissionBo bo) { + return toAjax(iIsInspectionCommissionService.insertByBo(bo)); + } + + /** + * 修改检验委托单表 + */ + @Log(title = "检验委托单表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody IsInspectionCommissionBo bo) { + return toAjax(iIsInspectionCommissionService.updateByBo(bo)); + } + + /** + * 删除检验委托单表 + * + * @param commissionIds 主键串 + */ + @Log(title = "检验委托单表", businessType = BusinessType.DELETE) + @DeleteMapping("/{commissionIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] commissionIds) { + return toAjax(iIsInspectionCommissionService.deleteWithValidByIds(Arrays.asList(commissionIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/controller/IsInspectionTaskController.java b/klp-mes/src/main/java/com/klp/mes/is/controller/IsInspectionTaskController.java new file mode 100644 index 00000000..8c138bff --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/controller/IsInspectionTaskController.java @@ -0,0 +1,99 @@ +package com.klp.mes.is.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.is.domain.vo.IsInspectionTaskVo; +import com.klp.mes.is.domain.bo.IsInspectionTaskBo; +import com.klp.mes.is.service.IIsInspectionTaskService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检验任务表 + * + * @author Joshi + * @date 2025-08-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/is/inspectionTask") +public class IsInspectionTaskController extends BaseController { + + private final IIsInspectionTaskService iIsInspectionTaskService; + + /** + * 查询检验任务表列表 + */ + @GetMapping("/list") + public TableDataInfo list(IsInspectionTaskBo bo, PageQuery pageQuery) { + return iIsInspectionTaskService.queryPageList(bo, pageQuery); + } + + /** + * 导出检验任务表列表 + */ + @Log(title = "检验任务表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(IsInspectionTaskBo bo, HttpServletResponse response) { + List list = iIsInspectionTaskService.queryList(bo); + ExcelUtil.exportExcel(list, "检验任务表", IsInspectionTaskVo.class, response); + } + + /** + * 获取检验任务表详细信息 + * + * @param taskId 主键 + */ + @GetMapping("/{taskId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long taskId) { + return R.ok(iIsInspectionTaskService.queryById(taskId)); + } + + /** + * 新增检验任务表 + */ + @Log(title = "检验任务表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody IsInspectionTaskBo bo) { + return toAjax(iIsInspectionTaskService.insertByBo(bo)); + } + + /** + * 修改检验任务表 + */ + @Log(title = "检验任务表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody IsInspectionTaskBo bo) { + return toAjax(iIsInspectionTaskService.updateByBo(bo)); + } + + /** + * 删除检验任务表 + * + * @param taskIds 主键串 + */ + @Log(title = "检验任务表", businessType = BusinessType.DELETE) + @DeleteMapping("/{taskIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] taskIds) { + return toAjax(iIsInspectionTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/controller/IsSampleInventoryController.java b/klp-mes/src/main/java/com/klp/mes/is/controller/IsSampleInventoryController.java new file mode 100644 index 00000000..71dda05a --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/controller/IsSampleInventoryController.java @@ -0,0 +1,99 @@ +package com.klp.mes.is.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.is.domain.vo.IsSampleInventoryVo; +import com.klp.mes.is.domain.bo.IsSampleInventoryBo; +import com.klp.mes.is.service.IIsSampleInventoryService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 样品库存表 + * + * @author Joshi + * @date 2025-08-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/is/sampleInventory") +public class IsSampleInventoryController extends BaseController { + + private final IIsSampleInventoryService iIsSampleInventoryService; + + /** + * 查询样品库存表列表 + */ + @GetMapping("/list") + public TableDataInfo list(IsSampleInventoryBo bo, PageQuery pageQuery) { + return iIsSampleInventoryService.queryPageList(bo, pageQuery); + } + + /** + * 导出样品库存表列表 + */ + @Log(title = "样品库存表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(IsSampleInventoryBo bo, HttpServletResponse response) { + List list = iIsSampleInventoryService.queryList(bo); + ExcelUtil.exportExcel(list, "样品库存表", IsSampleInventoryVo.class, response); + } + + /** + * 获取样品库存表详细信息 + * + * @param sampleId 主键 + */ + @GetMapping("/{sampleId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long sampleId) { + return R.ok(iIsSampleInventoryService.queryById(sampleId)); + } + + /** + * 新增样品库存表 + */ + @Log(title = "样品库存表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody IsSampleInventoryBo bo) { + return toAjax(iIsSampleInventoryService.insertByBo(bo)); + } + + /** + * 修改样品库存表 + */ + @Log(title = "样品库存表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody IsSampleInventoryBo bo) { + return toAjax(iIsSampleInventoryService.updateByBo(bo)); + } + + /** + * 删除样品库存表 + * + * @param sampleIds 主键串 + */ + @Log(title = "样品库存表", businessType = BusinessType.DELETE) + @DeleteMapping("/{sampleIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] sampleIds) { + return toAjax(iIsSampleInventoryService.deleteWithValidByIds(Arrays.asList(sampleIds), true)); + } +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/IsInspectionCommission.java b/klp-mes/src/main/java/com/klp/mes/is/domain/IsInspectionCommission.java new file mode 100644 index 00000000..d8bdb1ba --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/IsInspectionCommission.java @@ -0,0 +1,75 @@ +package com.klp.mes.is.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; + +/** + * 检验委托单表对象 is_inspection_commission + * + * @author Joshi + * @date 2025-08-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("is_inspection_commission") +public class IsInspectionCommission extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 委托单ID + */ + @TableId(value = "commission_id") + private Long commissionId; + /** + * 委托单号 + */ + private String commissionNo; + /** + * 委托单位ID（外键关联客户表） + */ + private Long clientId; + /** + * 样品名称 + */ + private String sampleName; + /** + * 样品类型 + */ + private String sampleType; + /** + * 样品数量 + */ + private Long quantity; + /** + * 检验项目（JSON数组） + */ + private String inspectionItems; + /** + * 委托日期 + */ + private Date commissionDate; + /** + * 要求完成日期 + */ + private Date deadline; + /** + * 状态 + */ + private String status; + /** + * 删除标志（0=正常，1=删除） + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/IsInspectionTask.java b/klp-mes/src/main/java/com/klp/mes/is/domain/IsInspectionTask.java new file mode 100644 index 00000000..1101a194 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/IsInspectionTask.java @@ -0,0 +1,75 @@ +package com.klp.mes.is.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; + +/** + * 检验任务表对象 is_inspection_task + * + * @author Joshi + * @date 2025-08-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("is_inspection_task") +public class IsInspectionTask extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 任务ID + */ + @TableId(value = "task_id") + private Long taskId; + /** + * 任务单号 + */ + private String taskNo; + /** + * 关联委托单ID + */ + private Long commissionId; + /** + * 负责人（用户ID） + */ + private Long assignedTo; + /** + * 任务开始时间 + */ + private Date startTime; + /** + * 任务完成时间 + */ + private Date endTime; + /** + * 检验结果 + */ + private String result; + /** + * 检验结论 + */ + private String conclusion; + /** + * 状态 + */ + private String status; + /** + * 优先级（1-普通, 2-紧急） + */ + private Long priority; + /** + * 删除标志（0=正常，1=删除） + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/IsSampleInventory.java b/klp-mes/src/main/java/com/klp/mes/is/domain/IsSampleInventory.java new file mode 100644 index 00000000..abf535bc --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/IsSampleInventory.java @@ -0,0 +1,71 @@ +package com.klp.mes.is.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; + +/** + * 样品库存表对象 is_sample_inventory + * + * @author Joshi + * @date 2025-08-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("is_sample_inventory") +public class IsSampleInventory extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 样品ID + */ + @TableId(value = "sample_id") + private Long sampleId; + /** + * 关联委托单ID + */ + private Long commissionId; + /** + * 存放位置（如：A区-3排-2架） + */ + private String location; + /** + * 当前库存量 + */ + private Long currentQuantity; + /** + * 入库时间 + */ + private Date storageTime; + /** + * 有效期至 + */ + private Date expirationDate; + /** + * 状态 + */ + private String status; + /** + * 操作人（用户ID） + */ + private Long operatorId; + /** + * 最后更新时间 + */ + private Date lastUpdate; + /** + * 删除标志（0=正常，1=删除） + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java new file mode 100644 index 00000000..002daa2b --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionCommissionBo.java @@ -0,0 +1,78 @@ +package com.klp.mes.is.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; + +/** + * 检验委托单表业务对象 is_inspection_commission + * + * @author Joshi + * @date 2025-08-15 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class IsInspectionCommissionBo extends BaseEntity { + + /** + * 委托单ID + */ + private Long commissionId; + + /** + * 委托单号 + */ + private String commissionNo; + + /** + * 委托单位ID（外键关联客户表） + */ + private Long clientId; + + /** + * 样品名称 + */ + private String sampleName; + + /** + * 样品类型 + */ + private String sampleType; + + /** + * 样品数量 + */ + private Long quantity; + + /** + * 检验项目（JSON数组） + */ + private String inspectionItems; + + /** + * 委托日期 + */ + private Date commissionDate; + + /** + * 要求完成日期 + */ + private Date deadline; + + /** + * 状态 + */ + private String status; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionTaskBo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionTaskBo.java new file mode 100644 index 00000000..857c64f9 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsInspectionTaskBo.java @@ -0,0 +1,78 @@ +package com.klp.mes.is.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; + +/** + * 检验任务表业务对象 is_inspection_task + * + * @author Joshi + * @date 2025-08-15 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class IsInspectionTaskBo extends BaseEntity { + + /** + * 任务ID + */ + private Long taskId; + + /** + * 任务单号 + */ + private String taskNo; + + /** + * 关联委托单ID + */ + private Long commissionId; + + /** + * 负责人（用户ID） + */ + private Long assignedTo; + + /** + * 任务开始时间 + */ + private Date startTime; + + /** + * 任务完成时间 + */ + private Date endTime; + + /** + * 检验结果 + */ + private String result; + + /** + * 检验结论 + */ + private String conclusion; + + /** + * 状态 + */ + private String status; + + /** + * 优先级（1-普通, 2-紧急） + */ + private Long priority; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java new file mode 100644 index 00000000..33a019f4 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/bo/IsSampleInventoryBo.java @@ -0,0 +1,73 @@ +package com.klp.mes.is.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; + +/** + * 样品库存表业务对象 is_sample_inventory + * + * @author Joshi + * @date 2025-08-15 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class IsSampleInventoryBo extends BaseEntity { + + /** + * 样品ID + */ + private Long sampleId; + + /** + * 关联委托单ID + */ + private Long commissionId; + + /** + * 存放位置（如：A区-3排-2架） + */ + private String location; + + /** + * 当前库存量 + */ + private Long currentQuantity; + + /** + * 入库时间 + */ + private Date storageTime; + + /** + * 有效期至 + */ + private Date expirationDate; + + /** + * 状态 + */ + private String status; + + /** + * 操作人（用户ID） + */ + private Long operatorId; + + /** + * 最后更新时间 + */ + private Date lastUpdate; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java new file mode 100644 index 00000000..cf2d3577 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionCommissionVo.java @@ -0,0 +1,93 @@ +package com.klp.mes.is.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; + + +/** + * 检验委托单表视图对象 is_inspection_commission + * + * @author Joshi + * @date 2025-08-15 + */ +@Data +@ExcelIgnoreUnannotated +public class IsInspectionCommissionVo { + + private static final long serialVersionUID = 1L; + + /** + * 委托单ID + */ + @ExcelProperty(value = "委托单ID") + private Long commissionId; + + /** + * 委托单号 + */ + @ExcelProperty(value = "委托单号") + private String commissionNo; + + /** + * 委托单位ID（外键关联客户表） + */ + @ExcelProperty(value = "委托单位ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "外=键关联客户表") + private Long clientId; + + /** + * 样品名称 + */ + @ExcelProperty(value = "样品名称") + private String sampleName; + + /** + * 样品类型 + */ + @ExcelProperty(value = "样品类型") + private String sampleType; + + /** + * 样品数量 + */ + @ExcelProperty(value = "样品数量") + private Long quantity; + + /** + * 检验项目（JSON数组） + */ + @ExcelProperty(value = "检验项目", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "J=SON数组") + private String inspectionItems; + + /** + * 委托日期 + */ + @ExcelProperty(value = "委托日期") + private Date commissionDate; + + /** + * 要求完成日期 + */ + @ExcelProperty(value = "要求完成日期") + private Date deadline; + + /** + * 状态 + */ + @ExcelProperty(value = "状态") + private String status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java new file mode 100644 index 00000000..caae7b49 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsInspectionTaskVo.java @@ -0,0 +1,93 @@ +package com.klp.mes.is.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; + + +/** + * 检验任务表视图对象 is_inspection_task + * + * @author Joshi + * @date 2025-08-15 + */ +@Data +@ExcelIgnoreUnannotated +public class IsInspectionTaskVo { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ExcelProperty(value = "任务ID") + private Long taskId; + + /** + * 任务单号 + */ + @ExcelProperty(value = "任务单号") + private String taskNo; + + /** + * 关联委托单ID + */ + @ExcelProperty(value = "关联委托单ID") + private Long commissionId; + + /** + * 负责人（用户ID） + */ + @ExcelProperty(value = "负责人", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "用=户ID") + private Long assignedTo; + + /** + * 任务开始时间 + */ + @ExcelProperty(value = "任务开始时间") + private Date startTime; + + /** + * 任务完成时间 + */ + @ExcelProperty(value = "任务完成时间") + private Date endTime; + + /** + * 检验结果 + */ + @ExcelProperty(value = "检验结果") + private String result; + + /** + * 检验结论 + */ + @ExcelProperty(value = "检验结论") + private String conclusion; + + /** + * 状态 + */ + @ExcelProperty(value = "状态") + private String status; + + /** + * 优先级（1-普通, 2-紧急） + */ + @ExcelProperty(value = "优先级", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=-普通,,2=-紧急") + private Long priority; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java new file mode 100644 index 00000000..2c0233bd --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/domain/vo/IsSampleInventoryVo.java @@ -0,0 +1,87 @@ +package com.klp.mes.is.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; + + +/** + * 样品库存表视图对象 is_sample_inventory + * + * @author Joshi + * @date 2025-08-15 + */ +@Data +@ExcelIgnoreUnannotated +public class IsSampleInventoryVo { + + private static final long serialVersionUID = 1L; + + /** + * 样品ID + */ + @ExcelProperty(value = "样品ID") + private Long sampleId; + + /** + * 关联委托单ID + */ + @ExcelProperty(value = "关联委托单ID") + private Long commissionId; + + /** + * 存放位置（如：A区-3排-2架） + */ + @ExcelProperty(value = "存放位置", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=：A区-3排-2架") + private String location; + + /** + * 当前库存量 + */ + @ExcelProperty(value = "当前库存量") + private Long currentQuantity; + + /** + * 入库时间 + */ + @ExcelProperty(value = "入库时间") + private Date storageTime; + + /** + * 有效期至 + */ + @ExcelProperty(value = "有效期至") + private Date expirationDate; + + /** + * 状态 + */ + @ExcelProperty(value = "状态") + private String status; + + /** + * 操作人（用户ID） + */ + @ExcelProperty(value = "操作人", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "用=户ID") + private Long operatorId; + + /** + * 最后更新时间 + */ + @ExcelProperty(value = "最后更新时间") + private Date lastUpdate; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/mapper/IsInspectionCommissionMapper.java b/klp-mes/src/main/java/com/klp/mes/is/mapper/IsInspectionCommissionMapper.java new file mode 100644 index 00000000..8edb735f --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/mapper/IsInspectionCommissionMapper.java @@ -0,0 +1,15 @@ +package com.klp.mes.is.mapper; + +import com.klp.mes.is.domain.IsInspectionCommission; +import com.klp.mes.is.domain.vo.IsInspectionCommissionVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检验委托单表Mapper接口 + * + * @author Joshi + * @date 2025-08-15 + */ +public interface IsInspectionCommissionMapper extends BaseMapperPlus { + +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/mapper/IsInspectionTaskMapper.java b/klp-mes/src/main/java/com/klp/mes/is/mapper/IsInspectionTaskMapper.java new file mode 100644 index 00000000..2bfb14e9 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/mapper/IsInspectionTaskMapper.java @@ -0,0 +1,18 @@ +package com.klp.mes.is.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.klp.mes.is.domain.IsInspectionTask; +import com.klp.mes.is.domain.bo.IsInspectionTaskBo; +import com.klp.mes.is.domain.vo.IsInspectionTaskVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检验任务表Mapper接口 + * + * @author Joshi + * @date 2025-08-15 + */ +public interface IsInspectionTaskMapper extends BaseMapperPlus { + + Page selectVoPagePlus(Page build, IsInspectionTaskBo bo); +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/mapper/IsSampleInventoryMapper.java b/klp-mes/src/main/java/com/klp/mes/is/mapper/IsSampleInventoryMapper.java new file mode 100644 index 00000000..8d0f9ff5 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/mapper/IsSampleInventoryMapper.java @@ -0,0 +1,18 @@ +package com.klp.mes.is.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.klp.mes.is.domain.IsSampleInventory; +import com.klp.mes.is.domain.bo.IsSampleInventoryBo; +import com.klp.mes.is.domain.vo.IsSampleInventoryVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 样品库存表Mapper接口 + * + * @author Joshi + * @date 2025-08-15 + */ +public interface IsSampleInventoryMapper extends BaseMapperPlus { + + Page selectVoPagePlus(Page build, IsSampleInventoryBo bo); +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/service/IIsInspectionCommissionService.java b/klp-mes/src/main/java/com/klp/mes/is/service/IIsInspectionCommissionService.java new file mode 100644 index 00000000..1754af48 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/service/IIsInspectionCommissionService.java @@ -0,0 +1,49 @@ +package com.klp.mes.is.service; + +import com.klp.mes.is.domain.IsInspectionCommission; +import com.klp.mes.is.domain.vo.IsInspectionCommissionVo; +import com.klp.mes.is.domain.bo.IsInspectionCommissionBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检验委托单表Service接口 + * + * @author Joshi + * @date 2025-08-15 + */ +public interface IIsInspectionCommissionService { + + /** + * 查询检验委托单表 + */ + IsInspectionCommissionVo queryById(Long commissionId); + + /** + * 查询检验委托单表列表 + */ + TableDataInfo queryPageList(IsInspectionCommissionBo bo, PageQuery pageQuery); + + /** + * 查询检验委托单表列表 + */ + List queryList(IsInspectionCommissionBo bo); + + /** + * 新增检验委托单表 + */ + Boolean insertByBo(IsInspectionCommissionBo bo); + + /** + * 修改检验委托单表 + */ + Boolean updateByBo(IsInspectionCommissionBo bo); + + /** + * 校验并批量删除检验委托单表信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/service/IIsInspectionTaskService.java b/klp-mes/src/main/java/com/klp/mes/is/service/IIsInspectionTaskService.java new file mode 100644 index 00000000..569618ef --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/service/IIsInspectionTaskService.java @@ -0,0 +1,49 @@ +package com.klp.mes.is.service; + +import com.klp.mes.is.domain.IsInspectionTask; +import com.klp.mes.is.domain.vo.IsInspectionTaskVo; +import com.klp.mes.is.domain.bo.IsInspectionTaskBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检验任务表Service接口 + * + * @author Joshi + * @date 2025-08-15 + */ +public interface IIsInspectionTaskService { + + /** + * 查询检验任务表 + */ + IsInspectionTaskVo queryById(Long taskId); + + /** + * 查询检验任务表列表 + */ + TableDataInfo queryPageList(IsInspectionTaskBo bo, PageQuery pageQuery); + + /** + * 查询检验任务表列表 + */ + List queryList(IsInspectionTaskBo bo); + + /** + * 新增检验任务表 + */ + Boolean insertByBo(IsInspectionTaskBo bo); + + /** + * 修改检验任务表 + */ + Boolean updateByBo(IsInspectionTaskBo bo); + + /** + * 校验并批量删除检验任务表信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/service/IIsSampleInventoryService.java b/klp-mes/src/main/java/com/klp/mes/is/service/IIsSampleInventoryService.java new file mode 100644 index 00000000..b12a11db --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/service/IIsSampleInventoryService.java @@ -0,0 +1,49 @@ +package com.klp.mes.is.service; + +import com.klp.mes.is.domain.IsSampleInventory; +import com.klp.mes.is.domain.vo.IsSampleInventoryVo; +import com.klp.mes.is.domain.bo.IsSampleInventoryBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 样品库存表Service接口 + * + * @author Joshi + * @date 2025-08-15 + */ +public interface IIsSampleInventoryService { + + /** + * 查询样品库存表 + */ + IsSampleInventoryVo queryById(Long sampleId); + + /** + * 查询样品库存表列表 + */ + TableDataInfo queryPageList(IsSampleInventoryBo bo, PageQuery pageQuery); + + /** + * 查询样品库存表列表 + */ + List queryList(IsSampleInventoryBo bo); + + /** + * 新增样品库存表 + */ + Boolean insertByBo(IsSampleInventoryBo bo); + + /** + * 修改样品库存表 + */ + Boolean updateByBo(IsSampleInventoryBo bo); + + /** + * 校验并批量删除样品库存表信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsInspectionCommissionServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsInspectionCommissionServiceImpl.java new file mode 100644 index 00000000..d3f41a38 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsInspectionCommissionServiceImpl.java @@ -0,0 +1,117 @@ +package com.klp.mes.is.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.is.domain.bo.IsInspectionCommissionBo; +import com.klp.mes.is.domain.vo.IsInspectionCommissionVo; +import com.klp.mes.is.domain.IsInspectionCommission; +import com.klp.mes.is.mapper.IsInspectionCommissionMapper; +import com.klp.mes.is.service.IIsInspectionCommissionService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检验委托单表Service业务层处理 + * + * @author Joshi + * @date 2025-08-15 + */ +@RequiredArgsConstructor +@Service +public class IsInspectionCommissionServiceImpl implements IIsInspectionCommissionService { + + private final IsInspectionCommissionMapper baseMapper; + + /** + * 查询检验委托单表 + */ + @Override + public IsInspectionCommissionVo queryById(Long commissionId){ + return baseMapper.selectVoById(commissionId); + } + + /** + * 查询检验委托单表列表 + */ + @Override + public TableDataInfo queryPageList(IsInspectionCommissionBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检验委托单表列表 + */ + @Override + public List queryList(IsInspectionCommissionBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(IsInspectionCommissionBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getCommissionNo()), IsInspectionCommission::getCommissionNo, bo.getCommissionNo()); + lqw.eq(bo.getClientId() != null, IsInspectionCommission::getClientId, bo.getClientId()); + lqw.like(StringUtils.isNotBlank(bo.getSampleName()), IsInspectionCommission::getSampleName, bo.getSampleName()); + lqw.eq(StringUtils.isNotBlank(bo.getSampleType()), IsInspectionCommission::getSampleType, bo.getSampleType()); + lqw.eq(bo.getQuantity() != null, IsInspectionCommission::getQuantity, bo.getQuantity()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectionItems()), IsInspectionCommission::getInspectionItems, bo.getInspectionItems()); + lqw.eq(bo.getCommissionDate() != null, IsInspectionCommission::getCommissionDate, bo.getCommissionDate()); + lqw.eq(bo.getDeadline() != null, IsInspectionCommission::getDeadline, bo.getDeadline()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IsInspectionCommission::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增检验委托单表 + */ + @Override + public Boolean insertByBo(IsInspectionCommissionBo bo) { + IsInspectionCommission add = BeanUtil.toBean(bo, IsInspectionCommission.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setCommissionId(add.getCommissionId()); + } + return flag; + } + + /** + * 修改检验委托单表 + */ + @Override + public Boolean updateByBo(IsInspectionCommissionBo bo) { + IsInspectionCommission update = BeanUtil.toBean(bo, IsInspectionCommission.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(IsInspectionCommission 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/is/service/impl/IsInspectionTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsInspectionTaskServiceImpl.java new file mode 100644 index 00000000..bb6c9527 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsInspectionTaskServiceImpl.java @@ -0,0 +1,116 @@ +package com.klp.mes.is.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.is.domain.bo.IsInspectionTaskBo; +import com.klp.mes.is.domain.vo.IsInspectionTaskVo; +import com.klp.mes.is.domain.IsInspectionTask; +import com.klp.mes.is.mapper.IsInspectionTaskMapper; +import com.klp.mes.is.service.IIsInspectionTaskService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检验任务表Service业务层处理 + * + * @author Joshi + * @date 2025-08-15 + */ +@RequiredArgsConstructor +@Service +public class IsInspectionTaskServiceImpl implements IIsInspectionTaskService { + + private final IsInspectionTaskMapper baseMapper; + + /** + * 查询检验任务表 + */ + @Override + public IsInspectionTaskVo queryById(Long taskId){ + return baseMapper.selectVoById(taskId); + } + + /** + * 查询检验任务表列表 + */ + @Override + public TableDataInfo queryPageList(IsInspectionTaskBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), bo); + return TableDataInfo.build(result); + } + + /** + * 查询检验任务表列表 + */ + @Override + public List queryList(IsInspectionTaskBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(IsInspectionTaskBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTaskNo()), IsInspectionTask::getTaskNo, bo.getTaskNo()); + lqw.eq(bo.getCommissionId() != null, IsInspectionTask::getCommissionId, bo.getCommissionId()); + lqw.eq(bo.getAssignedTo() != null, IsInspectionTask::getAssignedTo, bo.getAssignedTo()); + lqw.eq(bo.getStartTime() != null, IsInspectionTask::getStartTime, bo.getStartTime()); + lqw.eq(bo.getEndTime() != null, IsInspectionTask::getEndTime, bo.getEndTime()); + lqw.eq(StringUtils.isNotBlank(bo.getResult()), IsInspectionTask::getResult, bo.getResult()); + lqw.eq(StringUtils.isNotBlank(bo.getConclusion()), IsInspectionTask::getConclusion, bo.getConclusion()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IsInspectionTask::getStatus, bo.getStatus()); + lqw.eq(bo.getPriority() != null, IsInspectionTask::getPriority, bo.getPriority()); + return lqw; + } + + /** + * 新增检验任务表 + */ + @Override + public Boolean insertByBo(IsInspectionTaskBo bo) { + IsInspectionTask add = BeanUtil.toBean(bo, IsInspectionTask.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTaskId(add.getTaskId()); + } + return flag; + } + + /** + * 修改检验任务表 + */ + @Override + public Boolean updateByBo(IsInspectionTaskBo bo) { + IsInspectionTask update = BeanUtil.toBean(bo, IsInspectionTask.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(IsInspectionTask 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/is/service/impl/IsSampleInventoryServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsSampleInventoryServiceImpl.java new file mode 100644 index 00000000..9ad5ffa4 --- /dev/null +++ b/klp-mes/src/main/java/com/klp/mes/is/service/impl/IsSampleInventoryServiceImpl.java @@ -0,0 +1,115 @@ +package com.klp.mes.is.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.is.domain.bo.IsSampleInventoryBo; +import com.klp.mes.is.domain.vo.IsSampleInventoryVo; +import com.klp.mes.is.domain.IsSampleInventory; +import com.klp.mes.is.mapper.IsSampleInventoryMapper; +import com.klp.mes.is.service.IIsSampleInventoryService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 样品库存表Service业务层处理 + * + * @author Joshi + * @date 2025-08-15 + */ +@RequiredArgsConstructor +@Service +public class IsSampleInventoryServiceImpl implements IIsSampleInventoryService { + + private final IsSampleInventoryMapper baseMapper; + + /** + * 查询样品库存表 + */ + @Override + public IsSampleInventoryVo queryById(Long sampleId){ + return baseMapper.selectVoById(sampleId); + } + + /** + * 查询样品库存表列表 + */ + @Override + public TableDataInfo queryPageList(IsSampleInventoryBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), bo); + return TableDataInfo.build(result); + } + + /** + * 查询样品库存表列表 + */ + @Override + public List queryList(IsSampleInventoryBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(IsSampleInventoryBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCommissionId() != null, IsSampleInventory::getCommissionId, bo.getCommissionId()); + lqw.eq(StringUtils.isNotBlank(bo.getLocation()), IsSampleInventory::getLocation, bo.getLocation()); + lqw.eq(bo.getCurrentQuantity() != null, IsSampleInventory::getCurrentQuantity, bo.getCurrentQuantity()); + lqw.eq(bo.getStorageTime() != null, IsSampleInventory::getStorageTime, bo.getStorageTime()); + lqw.eq(bo.getExpirationDate() != null, IsSampleInventory::getExpirationDate, bo.getExpirationDate()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), IsSampleInventory::getStatus, bo.getStatus()); + lqw.eq(bo.getOperatorId() != null, IsSampleInventory::getOperatorId, bo.getOperatorId()); + lqw.eq(bo.getLastUpdate() != null, IsSampleInventory::getLastUpdate, bo.getLastUpdate()); + return lqw; + } + + /** + * 新增样品库存表 + */ + @Override + public Boolean insertByBo(IsSampleInventoryBo bo) { + IsSampleInventory add = BeanUtil.toBean(bo, IsSampleInventory.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSampleId(add.getSampleId()); + } + return flag; + } + + /** + * 修改样品库存表 + */ + @Override + public Boolean updateByBo(IsSampleInventoryBo bo) { + IsSampleInventory update = BeanUtil.toBean(bo, IsSampleInventory.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(IsSampleInventory 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/is/IsInspectionCommissionMapper.xml b/klp-mes/src/main/resources/mapper/is/IsInspectionCommissionMapper.xml new file mode 100644 index 00000000..44acbad3 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/is/IsInspectionCommissionMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/is/IsInspectionTaskMapper.xml b/klp-mes/src/main/resources/mapper/is/IsInspectionTaskMapper.xml new file mode 100644 index 00000000..df8fc2f6 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/is/IsInspectionTaskMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/is/IsSampleInventoryMapper.xml b/klp-mes/src/main/resources/mapper/is/IsSampleInventoryMapper.xml new file mode 100644 index 00000000..7cc51c10 --- /dev/null +++ b/klp-mes/src/main/resources/mapper/is/IsSampleInventoryMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +