feat(is): 添加检验委托单、检验任务和样品库存相关功能- 新增检验委托单、检验任务和样品库存的实体类、BO、VO

- 实现检验委托单、检验任务和样品库存的增删查改功能 - 添加检验任务与委托单的关联查询
2025-08-15 09:41:32 +08:00
parent 62ebe2f592
commit 99c93793b2
24 changed files with 1748 additions and 0 deletions
--- 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
@@ -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<IsInspectionCommissionVo> 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<IsInspectionCommissionVo> list = iIsInspectionCommissionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "检验委托单表", IsInspectionCommissionVo.class, response);
+    }
+
+    /**
+     * 获取检验委托单表详细信息
+     *
+     * @param commissionId 主键
+     */
+    @GetMapping("/{commissionId}")
+    public R<IsInspectionCommissionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long commissionId) {
+        return R.ok(iIsInspectionCommissionService.queryById(commissionId));
+    }
+
+    /**
+     * 新增检验委托单表
+     */
+    @Log(title = "检验委托单表", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody IsInspectionCommissionBo bo) {
+        return toAjax(iIsInspectionCommissionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改检验委托单表
+     */
+    @Log(title = "检验委托单表", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody IsInspectionCommissionBo bo) {
+        return toAjax(iIsInspectionCommissionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除检验委托单表
+     *
+     * @param commissionIds 主键串
+     */
+    @Log(title = "检验委托单表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{commissionIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] commissionIds) {
+        return toAjax(iIsInspectionCommissionService.deleteWithValidByIds(Arrays.asList(commissionIds), true));
+    }
+}
--- 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
@@ -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<IsInspectionTaskVo> 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<IsInspectionTaskVo> list = iIsInspectionTaskService.queryList(bo);
+        ExcelUtil.exportExcel(list, "检验任务表", IsInspectionTaskVo.class, response);
+    }
+
+    /**
+     * 获取检验任务表详细信息
+     *
+     * @param taskId 主键
+     */
+    @GetMapping("/{taskId}")
+    public R<IsInspectionTaskVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long taskId) {
+        return R.ok(iIsInspectionTaskService.queryById(taskId));
+    }
+
+    /**
+     * 新增检验任务表
+     */
+    @Log(title = "检验任务表", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody IsInspectionTaskBo bo) {
+        return toAjax(iIsInspectionTaskService.insertByBo(bo));
+    }
+
+    /**
+     * 修改检验任务表
+     */
+    @Log(title = "检验任务表", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody IsInspectionTaskBo bo) {
+        return toAjax(iIsInspectionTaskService.updateByBo(bo));
+    }
+
+    /**
+     * 删除检验任务表
+     *
+     * @param taskIds 主键串
+     */
+    @Log(title = "检验任务表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{taskIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] taskIds) {
+        return toAjax(iIsInspectionTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true));
+    }
+}
--- 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
@@ -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<IsSampleInventoryVo> 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<IsSampleInventoryVo> list = iIsSampleInventoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "样品库存表", IsSampleInventoryVo.class, response);
+    }
+
+    /**
+     * 获取样品库存表详细信息
+     *
+     * @param sampleId 主键
+     */
+    @GetMapping("/{sampleId}")
+    public R<IsSampleInventoryVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long sampleId) {
+        return R.ok(iIsSampleInventoryService.queryById(sampleId));
+    }
+
+    /**
+     * 新增样品库存表
+     */
+    @Log(title = "样品库存表", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody IsSampleInventoryBo bo) {
+        return toAjax(iIsSampleInventoryService.insertByBo(bo));
+    }
+
+    /**
+     * 修改样品库存表
+     */
+    @Log(title = "样品库存表", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody IsSampleInventoryBo bo) {
+        return toAjax(iIsSampleInventoryService.updateByBo(bo));
+    }
+
+    /**
+     * 删除样品库存表
+     *
+     * @param sampleIds 主键串
+     */
+    @Log(title = "样品库存表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{sampleIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] sampleIds) {
+        return toAjax(iIsSampleInventoryService.deleteWithValidByIds(Arrays.asList(sampleIds), true));
+    }
+}