diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java new file mode 100644 index 0000000..6b60d38 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java @@ -0,0 +1,117 @@ +package org.dromara.qms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.qms.domain.vo.QcInspectionItemCategoryVo; +import org.dromara.qms.domain.bo.QcInspectionItemCategoryBo; +import org.dromara.qms.service.IQcInspectionItemCategoryService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 检测项类别 + * 前端访问路由地址为:/qms/qcInspectionItemCategory + * + * @author zch + * @date 2025-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qcInspectionItemCategory") +public class QcInspectionItemCategoryController extends BaseController { + + private final IQcInspectionItemCategoryService qcInspectionItemCategoryService; + + /** + * 查询检测项类别列表 + */ + @SaCheckPermission("qms:qcInspectionItemCategory:list") + @GetMapping("/list") + public TableDataInfo list(QcInspectionItemCategoryBo bo, PageQuery pageQuery) { + return qcInspectionItemCategoryService.queryPageList(bo, pageQuery); + } + + /** + * 导出检测项类别列表 + */ + @SaCheckPermission("qms:qcInspectionItemCategory:export") + @Log(title = "检测项类别", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcInspectionItemCategoryBo bo, HttpServletResponse response) { + List list = qcInspectionItemCategoryService.queryList(bo); + ExcelUtil.exportExcel(list, "检测项类别", QcInspectionItemCategoryVo.class, response); + } + + /** + * 获取检测项类别详细信息 + * + * @param categoryId 主键 + */ + @SaCheckPermission("qms:qcInspectionItemCategory:query") + @GetMapping("/{categoryId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long categoryId) { + return R.ok(qcInspectionItemCategoryService.queryById(categoryId)); + } + + /** + * 新增检测项类别 + */ + @SaCheckPermission("qms:qcInspectionItemCategory:add") + @Log(title = "检测项类别", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcInspectionItemCategoryBo bo) { + return toAjax(qcInspectionItemCategoryService.insertByBo(bo)); + } + + /** + * 修改检测项类别 + */ + @SaCheckPermission("qms:qcInspectionItemCategory:edit") + @Log(title = "检测项类别", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcInspectionItemCategoryBo bo) { + return toAjax(qcInspectionItemCategoryService.updateByBo(bo)); + } + + /** + * 删除检测项类别 + * + * @param categoryIds 主键串 + */ + @SaCheckPermission("qms:qcInspectionItemCategory:remove") + @Log(title = "检测项类别", businessType = BusinessType.DELETE) + @DeleteMapping("/{categoryIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] categoryIds) { + return toAjax(qcInspectionItemCategoryService.deleteWithValidByIds(List.of(categoryIds), true)); + } + + + /** + * 下拉框查询检测项类别列表 + */ + + @GetMapping("/getQcInspectionItemCategoryList") + public R> getQcInspectionItemCategoryList(QcInspectionItemCategoryBo bo) { + List list = qcInspectionItemCategoryService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemController.java new file mode 100644 index 0000000..f8418bc --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemController.java @@ -0,0 +1,117 @@ +package org.dromara.qms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.qms.domain.vo.QcInspectionItemVo; +import org.dromara.qms.domain.bo.QcInspectionItemBo; +import org.dromara.qms.service.IQcInspectionItemService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 检测项定义 + * 前端访问路由地址为:/qms/qcInspectionItem + * + * @author zch + * @date 2025-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qcInspectionItem") +public class QcInspectionItemController extends BaseController { + + private final IQcInspectionItemService qcInspectionItemService; + + /** + * 查询检测项定义列表 + */ + @SaCheckPermission("qms:qcInspectionItem:list") + @GetMapping("/list") + public TableDataInfo list(QcInspectionItemBo bo, PageQuery pageQuery) { + return qcInspectionItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出检测项定义列表 + */ + @SaCheckPermission("qms:qcInspectionItem:export") + @Log(title = "检测项定义", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcInspectionItemBo bo, HttpServletResponse response) { + List list = qcInspectionItemService.queryList(bo); + ExcelUtil.exportExcel(list, "检测项定义", QcInspectionItemVo.class, response); + } + + /** + * 获取检测项定义详细信息 + * + * @param itemId 主键 + */ + @SaCheckPermission("qms:qcInspectionItem:query") + @GetMapping("/{itemId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long itemId) { + return R.ok(qcInspectionItemService.queryById(itemId)); + } + + /** + * 新增检测项定义 + */ + @SaCheckPermission("qms:qcInspectionItem:add") + @Log(title = "检测项定义", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcInspectionItemBo bo) { + return toAjax(qcInspectionItemService.insertByBo(bo)); + } + + /** + * 修改检测项定义 + */ + @SaCheckPermission("qms:qcInspectionItem:edit") + @Log(title = "检测项定义", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcInspectionItemBo bo) { + return toAjax(qcInspectionItemService.updateByBo(bo)); + } + + /** + * 删除检测项定义 + * + * @param itemIds 主键串 + */ + @SaCheckPermission("qms:qcInspectionItem:remove") + @Log(title = "检测项定义", businessType = BusinessType.DELETE) + @DeleteMapping("/{itemIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] itemIds) { + return toAjax(qcInspectionItemService.deleteWithValidByIds(List.of(itemIds), true)); + } + + + /** + * 下拉框查询检测项定义列表 + */ + + @GetMapping("/getQcInspectionItemList") + public R> getQcInspectionItemList(QcInspectionItemBo bo) { + List list = qcInspectionItemService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionMainController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionMainController.java new file mode 100644 index 0000000..d5f87da --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionMainController.java @@ -0,0 +1,117 @@ +package org.dromara.qms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.qms.domain.vo.QcInspectionMainVo; +import org.dromara.qms.domain.bo.QcInspectionMainBo; +import org.dromara.qms.service.IQcInspectionMainService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 质检主表 + * 前端访问路由地址为:/qms/QcInspectionMain + * + * @author zch + * @date 2025-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/QcInspectionMain") +public class QcInspectionMainController extends BaseController { + + private final IQcInspectionMainService qcInspectionMainService; + + /** + * 查询质检主表列表 + */ + @SaCheckPermission("qms:QcInspectionMain:list") + @GetMapping("/list") + public TableDataInfo list(QcInspectionMainBo bo, PageQuery pageQuery) { + return qcInspectionMainService.queryPageList(bo, pageQuery); + } + + /** + * 导出质检主表列表 + */ + @SaCheckPermission("qms:QcInspectionMain:export") + @Log(title = "质检主表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcInspectionMainBo bo, HttpServletResponse response) { + List list = qcInspectionMainService.queryList(bo); + ExcelUtil.exportExcel(list, "质检主表", QcInspectionMainVo.class, response); + } + + /** + * 获取质检主表详细信息 + * + * @param inspectionId 主键 + */ + @SaCheckPermission("qms:QcInspectionMain:query") + @GetMapping("/{inspectionId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long inspectionId) { + return R.ok(qcInspectionMainService.queryById(inspectionId)); + } + + /** + * 新增质检主表 + */ + @SaCheckPermission("qms:QcInspectionMain:add") + @Log(title = "质检主表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcInspectionMainBo bo) { + return toAjax(qcInspectionMainService.insertByBo(bo)); + } + + /** + * 修改质检主表 + */ + @SaCheckPermission("qms:QcInspectionMain:edit") + @Log(title = "质检主表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcInspectionMainBo bo) { + return toAjax(qcInspectionMainService.updateByBo(bo)); + } + + /** + * 删除质检主表 + * + * @param inspectionIds 主键串 + */ + @SaCheckPermission("qms:QcInspectionMain:remove") + @Log(title = "质检主表", businessType = BusinessType.DELETE) + @DeleteMapping("/{inspectionIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] inspectionIds) { + return toAjax(qcInspectionMainService.deleteWithValidByIds(List.of(inspectionIds), true)); + } + + + /** + * 下拉框查询质检主表列表 + */ + + @GetMapping("/getQcInspectionMainList") + public R> getQcInspectionMainList(QcInspectionMainBo bo) { + List list = qcInspectionMainService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionResultController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionResultController.java new file mode 100644 index 0000000..137b55c --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionResultController.java @@ -0,0 +1,117 @@ +package org.dromara.qms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.qms.domain.vo.QcInspectionResultVo; +import org.dromara.qms.domain.bo.QcInspectionResultBo; +import org.dromara.qms.service.IQcInspectionResultService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 质检结果子表 + * 前端访问路由地址为:/qms/qcInspectionResult + * + * @author Yinq + * @date 2025-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qcInspectionResult") +public class QcInspectionResultController extends BaseController { + + private final IQcInspectionResultService qcInspectionResultService; + + /** + * 查询质检结果子表列表 + */ + @SaCheckPermission("qms:qcInspectionResult:list") + @GetMapping("/list") + public TableDataInfo list(QcInspectionResultBo bo, PageQuery pageQuery) { + return qcInspectionResultService.queryPageList(bo, pageQuery); + } + + /** + * 导出质检结果子表列表 + */ + @SaCheckPermission("qms:qcInspectionResult:export") + @Log(title = "质检结果子表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcInspectionResultBo bo, HttpServletResponse response) { + List list = qcInspectionResultService.queryList(bo); + ExcelUtil.exportExcel(list, "质检结果子表", QcInspectionResultVo.class, response); + } + + /** + * 获取质检结果子表详细信息 + * + * @param resultId 主键 + */ + @SaCheckPermission("qms:qcInspectionResult:query") + @GetMapping("/{resultId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long resultId) { + return R.ok(qcInspectionResultService.queryById(resultId)); + } + + /** + * 新增质检结果子表 + */ + @SaCheckPermission("qms:qcInspectionResult:add") + @Log(title = "质检结果子表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcInspectionResultBo bo) { + return toAjax(qcInspectionResultService.insertByBo(bo)); + } + + /** + * 修改质检结果子表 + */ + @SaCheckPermission("qms:qcInspectionResult:edit") + @Log(title = "质检结果子表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcInspectionResultBo bo) { + return toAjax(qcInspectionResultService.updateByBo(bo)); + } + + /** + * 删除质检结果子表 + * + * @param resultIds 主键串 + */ + @SaCheckPermission("qms:qcInspectionResult:remove") + @Log(title = "质检结果子表", businessType = BusinessType.DELETE) + @DeleteMapping("/{resultIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] resultIds) { + return toAjax(qcInspectionResultService.deleteWithValidByIds(List.of(resultIds), true)); + } + + + /** + * 下拉框查询质检结果子表列表 + */ + + @GetMapping("/getQcInspectionResultList") + public R> getQcInspectionResultList(QcInspectionResultBo bo) { + List list = qcInspectionResultService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTemplateController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTemplateController.java new file mode 100644 index 0000000..2e44eb8 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTemplateController.java @@ -0,0 +1,117 @@ +package org.dromara.qms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.qms.domain.vo.QcInspectionTemplateVo; +import org.dromara.qms.domain.bo.QcInspectionTemplateBo; +import org.dromara.qms.service.IQcInspectionTemplateService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 检测模板主 + * 前端访问路由地址为:/qms/qcInspectionTemplate + * + * @author zch + * @date 2025-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qcInspectionTemplate") +public class QcInspectionTemplateController extends BaseController { + + private final IQcInspectionTemplateService qcInspectionTemplateService; + + /** + * 查询检测模板主列表 + */ + @SaCheckPermission("qms:qcInspectionTemplate:list") + @GetMapping("/list") + public TableDataInfo list(QcInspectionTemplateBo bo, PageQuery pageQuery) { + return qcInspectionTemplateService.queryPageList(bo, pageQuery); + } + + /** + * 导出检测模板主列表 + */ + @SaCheckPermission("qms:qcInspectionTemplate:export") + @Log(title = "检测模板主", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcInspectionTemplateBo bo, HttpServletResponse response) { + List list = qcInspectionTemplateService.queryList(bo); + ExcelUtil.exportExcel(list, "检测模板主", QcInspectionTemplateVo.class, response); + } + + /** + * 获取检测模板主详细信息 + * + * @param templateId 主键 + */ + @SaCheckPermission("qms:qcInspectionTemplate:query") + @GetMapping("/{templateId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long templateId) { + return R.ok(qcInspectionTemplateService.queryById(templateId)); + } + + /** + * 新增检测模板主 + */ + @SaCheckPermission("qms:qcInspectionTemplate:add") + @Log(title = "检测模板主", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcInspectionTemplateBo bo) { + return toAjax(qcInspectionTemplateService.insertByBo(bo)); + } + + /** + * 修改检测模板主 + */ + @SaCheckPermission("qms:qcInspectionTemplate:edit") + @Log(title = "检测模板主", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcInspectionTemplateBo bo) { + return toAjax(qcInspectionTemplateService.updateByBo(bo)); + } + + /** + * 删除检测模板主 + * + * @param templateIds 主键串 + */ + @SaCheckPermission("qms:qcInspectionTemplate:remove") + @Log(title = "检测模板主", businessType = BusinessType.DELETE) + @DeleteMapping("/{templateIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] templateIds) { + return toAjax(qcInspectionTemplateService.deleteWithValidByIds(List.of(templateIds), true)); + } + + + /** + * 下拉框查询检测模板主列表 + */ + + @GetMapping("/getQcInspectionTemplateList") + public R> getQcInspectionTemplateList(QcInspectionTemplateBo bo) { + List list = qcInspectionTemplateService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTypeController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTypeController.java new file mode 100644 index 0000000..db34093 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTypeController.java @@ -0,0 +1,117 @@ +package org.dromara.qms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.qms.domain.vo.QcInspectionTypeVo; +import org.dromara.qms.domain.bo.QcInspectionTypeBo; +import org.dromara.qms.service.IQcInspectionTypeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 检测类型 + * 前端访问路由地址为:/qms/qcInspectionType + * + * @author zch + * @date 2025-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qcInspectionType") +public class QcInspectionTypeController extends BaseController { + + private final IQcInspectionTypeService qcInspectionTypeService; + + /** + * 查询检测类型列表 + */ + @SaCheckPermission("qms:qcInspectionType:list") + @GetMapping("/list") + public TableDataInfo list(QcInspectionTypeBo bo, PageQuery pageQuery) { + return qcInspectionTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出检测类型列表 + */ + @SaCheckPermission("qms:qcInspectionType:export") + @Log(title = "检测类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcInspectionTypeBo bo, HttpServletResponse response) { + List list = qcInspectionTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "检测类型", QcInspectionTypeVo.class, response); + } + + /** + * 获取检测类型详细信息 + * + * @param typeId 主键 + */ + @SaCheckPermission("qms:qcInspectionType:query") + @GetMapping("/{typeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long typeId) { + return R.ok(qcInspectionTypeService.queryById(typeId)); + } + + /** + * 新增检测类型 + */ + @SaCheckPermission("qms:qcInspectionType:add") + @Log(title = "检测类型", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcInspectionTypeBo bo) { + return toAjax(qcInspectionTypeService.insertByBo(bo)); + } + + /** + * 修改检测类型 + */ + @SaCheckPermission("qms:qcInspectionType:edit") + @Log(title = "检测类型", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcInspectionTypeBo bo) { + return toAjax(qcInspectionTypeService.updateByBo(bo)); + } + + /** + * 删除检测类型 + * + * @param typeIds 主键串 + */ + @SaCheckPermission("qms:qcInspectionType:remove") + @Log(title = "检测类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{typeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] typeIds) { + return toAjax(qcInspectionTypeService.deleteWithValidByIds(List.of(typeIds), true)); + } + + + /** + * 下拉框查询检测类型列表 + */ + + @GetMapping("/getQcInspectionTypeList") + public R> getQcInspectionTypeList(QcInspectionTypeBo bo) { + List list = qcInspectionTypeService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcTemplateItemController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcTemplateItemController.java new file mode 100644 index 0000000..2b6d81d --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcTemplateItemController.java @@ -0,0 +1,117 @@ +package org.dromara.qms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.qms.domain.vo.QcTemplateItemVo; +import org.dromara.qms.domain.bo.QcTemplateItemBo; +import org.dromara.qms.service.IQcTemplateItemService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 检测模板子表 + * 前端访问路由地址为:/qms/qcTemplateItem + * + * @author Yinq + * @date 2025-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/qcTemplateItem") +public class QcTemplateItemController extends BaseController { + + private final IQcTemplateItemService qcTemplateItemService; + + /** + * 查询检测模板子表列表 + */ + @SaCheckPermission("qms:qcTemplateItem:list") + @GetMapping("/list") + public TableDataInfo list(QcTemplateItemBo bo, PageQuery pageQuery) { + return qcTemplateItemService.queryPageList(bo, pageQuery); + } + + /** + * 导出检测模板子表列表 + */ + @SaCheckPermission("qms:qcTemplateItem:export") + @Log(title = "检测模板子表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QcTemplateItemBo bo, HttpServletResponse response) { + List list = qcTemplateItemService.queryList(bo); + ExcelUtil.exportExcel(list, "检测模板子表", QcTemplateItemVo.class, response); + } + + /** + * 获取检测模板子表详细信息 + * + * @param templateItemId 主键 + */ + @SaCheckPermission("qms:qcTemplateItem:query") + @GetMapping("/{templateItemId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long templateItemId) { + return R.ok(qcTemplateItemService.queryById(templateItemId)); + } + + /** + * 新增检测模板子表 + */ + @SaCheckPermission("qms:qcTemplateItem:add") + @Log(title = "检测模板子表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QcTemplateItemBo bo) { + return toAjax(qcTemplateItemService.insertByBo(bo)); + } + + /** + * 修改检测模板子表 + */ + @SaCheckPermission("qms:qcTemplateItem:edit") + @Log(title = "检测模板子表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QcTemplateItemBo bo) { + return toAjax(qcTemplateItemService.updateByBo(bo)); + } + + /** + * 删除检测模板子表 + * + * @param templateItemIds 主键串 + */ + @SaCheckPermission("qms:qcTemplateItem:remove") + @Log(title = "检测模板子表", businessType = BusinessType.DELETE) + @DeleteMapping("/{templateItemIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] templateItemIds) { + return toAjax(qcTemplateItemService.deleteWithValidByIds(List.of(templateItemIds), true)); + } + + + /** + * 下拉框查询检测模板子表列表 + */ + + @GetMapping("/getQcTemplateItemList") + public R> getQcTemplateItemList(QcTemplateItemBo bo) { + List list = qcTemplateItemService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItem.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItem.java new file mode 100644 index 0000000..7604ec4 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItem.java @@ -0,0 +1,127 @@ +package org.dromara.qms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 检测项定义对象 qc_inspection_item + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_inspection_item") +public class QcInspectionItem extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检测项主键 + */ + @TableId(value = "item_id", type = IdType.ASSIGN_ID) + private Long itemId; + + /** + * 检测项编码 + */ + private String itemCode; + + /** + * 检测项名称 + */ + private String itemName; + + /** + * 检测位置 + */ + private String inspectionPosition; + + /** + * 检测项类别（关联检测项类别表） + */ + private Long categoryId; + + /** + * 检测单类型 + */ + private Long inspectionType; + + /** + * 检测方法（0目视,1千分尺） + */ + private Long method; + + /** + * 检测方式（0定性,1定量） + */ + private Long detectType; + + /** + * 控制类型（0手动输入，1自动输入） + */ + private Long controlType; + + /** + * 标准值 + */ + private Long standardValue; + + /** + * 控制上限 + */ + private Long upperLimit; + + /** + * 控制下限 + */ + private Long lowerLimit; + + /** + * 规格名称 + */ + private String specName; + + /** + * 规格上限 + */ + private Long specUpper; + + /** + * 规格下限 + */ + private Long specLower; + + /** + * 检测项说明 + */ + private String description; + + /** + * 检测选项编码 + */ + private String optionCode; + + /** + * 检测选项名称 + */ + private String optionName; + + /** + * 是否默认选项（是/否） + */ + private String isDefault; + + /** + * 是否删除（0表示存在，2表示删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItemCategory.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItemCategory.java new file mode 100644 index 0000000..f8f79be --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItemCategory.java @@ -0,0 +1,69 @@ +package org.dromara.qms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 检测项类别对象 qc_inspection_item_category + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_inspection_item_category") +public class QcInspectionItemCategory extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检测项类别主键 + */ + @TableId(value = "category_id", type = IdType.ASSIGN_ID) + private Long categoryId; + + /** + * 检测项类别编码 + */ + private String categoryCode; + + /** + * 检测项类别名称 + */ + private String categoryName; + + /** + * 检测单类型（关联检测类型表） + */ + private Long typeId; + + /** + * 描述 + */ + private String description; + + /** + * 是否删除（0表示存在，2表示删除） + */ + @TableLogic + private String delFlag; + + /** + * 检测类型名称 + */ + @TableField(exist = false) + private String typeName;//join + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + @TableField(exist = false) + private Long qcInspectionType;//join + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java new file mode 100644 index 0000000..4452592 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java @@ -0,0 +1,169 @@ +package org.dromara.qms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 质检主表对象 qc_inspection_main + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_inspection_main") +public class QcInspectionMain extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 质检主键 + */ + @TableId(value = "inspection_id", type = IdType.ASSIGN_ID) + private Long inspectionId; + + /** + * 检测单号/卡号 + */ + private String inspectionNo; + + /** + * 物料编码 + */ + private String materialCode; + + /** + * 物料类型 + */ + private String materialType; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 工序名称 + */ + private String processName; + + /** + * 工位名称 + */ + private String stationName; + + /** + * 质检数量 + */ + private Integer inspectionQty; + + /** + * 合格数 + */ + private Integer qualifiedQty; + + /** + * 不合格数 + */ + private Integer unqualifiedQty; + + /** + * 质检结果（0合格/1不合格） + */ + private Long result; + + /** + * 车间 + */ + private String workshop; + + /** + * 检测类型主键 + */ + private Long typeId; + + /** + * 单据状态（0未处理/1完成） + */ + private Long status; + + /** + * 检测人员 + */ + private String inspector; + + /** + * 班次 + */ + private String shift; + + /** + * 班组 + */ + private String team; + + /** + * 检验时间 + */ + private Date inspectionTime; + + /** + * 生产订单号 + */ + private String productionOrder; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 条码号 + */ + private String barcode; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 备注 + */ + private String remark; + + /** + * 是否删除（0表示存在，2表示删除） + */ + @TableLogic + private String delFlag; + + + /** + * 检测类型编码 + */ + @TableField(exist = false) + private String typeCode;//JOIN + + /** + * 检测类型名称 + */ + @TableField(exist = false) + private String typeName;//JOIN + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + @TableField(exist = false) + private Long qcInspectionType;//JOIN + + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionResult.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionResult.java new file mode 100644 index 0000000..5dd8b00 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionResult.java @@ -0,0 +1,68 @@ +package org.dromara.qms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 质检结果子表对象 qc_inspection_result + * + * @author Yinq + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_inspection_result") +public class QcInspectionResult extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 结果主键 + */ + @TableId(value = "result_id", type = IdType.ASSIGN_ID) + private Long resultId; + + /** + * 关联质检主表ID + */ + private Long inspectionId; + + /** + * 关联检测项ID + */ + private Long itemId; + + /** + * 检测结果（0合格，1不合格） + */ + private Long detectResult; + + /** + * 定量检测值 + */ + private BigDecimal detectValue; + + /** + * 规格质检值 + */ + private String specInspection; + + /** + * 定性不合格明细 + */ + private String problemDetail; + + /** + * 是否删除（0表示存在，2表示删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionTemplate.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionTemplate.java new file mode 100644 index 0000000..0785a44 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionTemplate.java @@ -0,0 +1,114 @@ +package org.dromara.qms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 检测模板主对象 qc_inspection_template + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_inspection_template") +public class QcInspectionTemplate extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板主键 + */ + @TableId(value = "template_id", type = IdType.ASSIGN_ID) + private Long templateId; + + /** + * 模板编码 + */ + private String templateCode; + + /** + * 模板名称 + */ + private String templateName; + + /** + * 物料编码 + */ + private String materialCode; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 关联检测类型表ID + */ + private Long typeId; + + /** + * 工位编码 + */ + private String stationCode; + + /** + * 工位名称 + */ + private String stationName; + + /** + * 工序编码 + */ + private String processCode; + + /** + * 工序名称 + */ + private String processName; + + /** + * 供应商编码 + */ + private String supplierCode; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 模板说明 + */ + private String description; + + /** + * 是否删除（0表示存在，2表示删除） + */ + @TableLogic + private String delFlag; + + /** + * 检测类型编码 + */ + @TableField(exist = false) + private String typeCode;//JOIN + + /** + * 检测类型名称 + */ + @TableField(exist = false) + private String typeName;//JOIN + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + @TableField(exist = false) + private Long qcInspectionType;//JOIN + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionType.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionType.java new file mode 100644 index 0000000..5d92f6e --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionType.java @@ -0,0 +1,57 @@ +package org.dromara.qms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 检测类型对象 qc_inspection_type + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_inspection_type") +public class QcInspectionType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检测类型主键 + */ + @TableId(value = "type_id", type = IdType.ASSIGN_ID) + private Long typeId; + + /** + * 检测类型编码 + */ + private String typeCode; + + /** + * 检测类型名称 + */ + private String typeName; + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + private Long qcInspectionType; + + /** + * 创建方式（1人工创建 2自动创建） + */ + private Long createMethod; + + /** + * 是否删除（0表示存在，2表示删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcTemplateItem.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcTemplateItem.java new file mode 100644 index 0000000..351afae --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcTemplateItem.java @@ -0,0 +1,141 @@ +package org.dromara.qms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 检测模板子表对象 qc_template_item + * + * @author Yinq + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qc_template_item") +public class QcTemplateItem extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板子表主键 + */ + @TableId(value = "template_item_id", type = IdType.ASSIGN_ID) + private Long templateItemId; + + /** + * 关联模板主表ID + */ + private Long templateId; + + /** + * 关联检测项定义ID + */ + private Long itemId; + + /** + * 检测项编码 + */ + private String itemCode; + + /** + * 检测项名称 + */ + private String itemName; + + /** + * 检测位置 + */ + private String inspectionPosition; + + /** + * 检测项目类别 + */ + private String categoryName; + + /** + * 检测类型（根据主表关联的类型表主键查来的字典值自动存入） + */ + private Long inspectionType; + + /** + * 检测方式（0定性,1定量） + */ + private Long detectType; + + /** + * 控制类型(0手动,1自动) + */ + private Long controlType; + + /** + * 标准值 + */ + private BigDecimal standardValue; + + /** + * 控制上限 + */ + private BigDecimal upperLimit; + + /** + * 控制下限 + */ + private BigDecimal lowerLimit; + + /** + * 规格名称 + */ + private String specName; + + /** + * 规格上限 + */ + private BigDecimal specUpper; + + /** + * 规格下限 + */ + private BigDecimal specLower; + + /** + * 检测项说明 + */ + private String description; + + /** + * 是否删除（0表示存在，2表示删除） + */ + @TableLogic + private String delFlag; + + /** + * 模板编码 + */ + @TableField(exist = false) + private String templateCode;//JOIN + + /** + * 模板名称 + */ + @TableField(exist = false) + private String templateName;//JOIN + + /** + * 检测项名称 + */ + @TableField(exist = false) + private String inspectionItemName;//JOIN AS + + /** + * 检测项编码 + */ + @TableField(exist = false) + private String inspectionItemCode;//JOIN AS + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java new file mode 100644 index 0000000..0ca9ab0 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java @@ -0,0 +1,120 @@ +package org.dromara.qms.domain.bo; + +import org.dromara.qms.domain.QcInspectionItem; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 检测项定义业务对象 qc_inspection_item + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = QcInspectionItem.class, reverseConvertGenerate = false) +public class QcInspectionItemBo extends BaseEntity { + + /** + * 检测项主键 + */ + @NotNull(message = "检测项主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long itemId; + + /** + * 检测项编码 + */ + private String itemCode; + + /** + * 检测项名称 + */ + private String itemName; + + /** + * 检测位置 + */ + private String inspectionPosition; + + /** + * 检测项类别（关联检测项类别表） + */ + private Long categoryId; + + /** + * 检测单类型 + */ + private Long inspectionType; + + /** + * 检测方法（0目视,1千分尺） + */ + private Long method; + + /** + * 检测方式（0定性,1定量） + */ + private Long detectType; + + /** + * 控制类型（0手动输入，1自动输入） + */ + private Long controlType; + + /** + * 标准值 + */ + private Long standardValue; + + /** + * 控制上限 + */ + private Long upperLimit; + + /** + * 控制下限 + */ + private Long lowerLimit; + + /** + * 规格名称 + */ + private String specName; + + /** + * 规格上限 + */ + private Long specUpper; + + /** + * 规格下限 + */ + private Long specLower; + + /** + * 检测项说明 + */ + private String description; + + /** + * 检测选项编码 + */ + private String optionCode; + + /** + * 检测选项名称 + */ + private String optionName; + + /** + * 是否默认选项（是/否） + */ + private String isDefault; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemCategoryBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemCategoryBo.java new file mode 100644 index 0000000..9b0867e --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemCategoryBo.java @@ -0,0 +1,59 @@ +package org.dromara.qms.domain.bo; + +import org.dromara.qms.domain.QcInspectionItemCategory; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 检测项类别业务对象 qc_inspection_item_category + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = QcInspectionItemCategory.class, reverseConvertGenerate = false) +public class QcInspectionItemCategoryBo extends BaseEntity { + + /** + * 检测项类别主键 + */ + @NotNull(message = "检测项类别主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long categoryId; + + /** + * 检测项类别编码 + */ + private String categoryCode; + + /** + * 检测项类别名称 + */ + private String categoryName; + + /** + * 检测单类型（关联检测类型表） + */ + private Long typeId; + + /** + * 描述 + */ + private String description; + + /** + * 检测类型名称 + */ + private String typeName;//join + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + private Long qcInspectionType;//join + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java new file mode 100644 index 0000000..14c22b3 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java @@ -0,0 +1,157 @@ +package org.dromara.qms.domain.bo; + +import org.dromara.qms.domain.QcInspectionMain; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 质检主表业务对象 qc_inspection_main + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = QcInspectionMain.class, reverseConvertGenerate = false) +public class QcInspectionMainBo extends BaseEntity { + + /** + * 质检主键 + */ + @NotNull(message = "质检主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long inspectionId; + + /** + * 检测单号/卡号 + */ + private String inspectionNo; + + /** + * 物料编码 + */ + private String materialCode; + + /** + * 物料类型 + */ + private String materialType; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 工序名称 + */ + private String processName; + + /** + * 工位名称 + */ + private String stationName; + + /** + * 质检数量 + */ + private Integer inspectionQty; + + /** + * 合格数 + */ + private Integer qualifiedQty; + + /** + * 不合格数 + */ + private Integer unqualifiedQty; + + /** + * 质检结果（0合格/1不合格） + */ + private Long result; + + /** + * 车间 + */ + private String workshop; + + /** + * 检测类型主键 + */ + private Long typeId; + + /** + * 单据状态（0未处理/1完成） + */ + private Long status; + + /** + * 检测人员 + */ + private String inspector; + + /** + * 班次 + */ + private String shift; + + /** + * 班组 + */ + private String team; + + /** + * 检验时间 + */ + private Date inspectionTime; + + /** + * 生产订单号 + */ + private String productionOrder; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 条码号 + */ + private String barcode; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 备注 + */ + private String remark; + + + /** + * 检测类型编码 + */ + private String typeCode;//JOIN + + /** + * 检测类型名称 + */ + private String typeName;//JOIN + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + private Long qcInspectionType;//JOIN + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java new file mode 100644 index 0000000..0741a0c --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java @@ -0,0 +1,61 @@ +package org.dromara.qms.domain.bo; + +import org.dromara.qms.domain.QcInspectionResult; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +/** + * 质检结果子表业务对象 qc_inspection_result + * + * @author Yinq + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = QcInspectionResult.class, reverseConvertGenerate = false) +public class QcInspectionResultBo extends BaseEntity { + + /** + * 结果主键 + */ + @NotNull(message = "结果主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long resultId; + + /** + * 关联质检主表ID + */ + private Long inspectionId; + + /** + * 关联检测项ID + */ + private Long itemId; + + /** + * 检测结果（0合格，1不合格） + */ + private Long detectResult; + + /** + * 定量检测值 + */ + private BigDecimal detectValue; + + /** + * 规格质检值 + */ + private String specInspection; + + /** + * 定性不合格明细 + */ + private String problemDetail; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTemplateBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTemplateBo.java new file mode 100644 index 0000000..1bee476 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTemplateBo.java @@ -0,0 +1,107 @@ +package org.dromara.qms.domain.bo; + +import org.dromara.qms.domain.QcInspectionTemplate; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 检测模板主业务对象 qc_inspection_template + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = QcInspectionTemplate.class, reverseConvertGenerate = false) +public class QcInspectionTemplateBo extends BaseEntity { + + /** + * 模板主键 + */ + @NotNull(message = "模板主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long templateId; + + /** + * 模板编码 + */ + @NotBlank(message = "模板编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String templateCode; + + /** + * 模板名称 + */ + @NotBlank(message = "模板名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String templateName; + + /** + * 物料编码 + */ + private String materialCode; + + /** + * 物料名称 + */ + private String materialName; + + /** + * 关联检测类型表ID + */ + private Long typeId; + + /** + * 工位编码 + */ + private String stationCode; + + /** + * 工位名称 + */ + private String stationName; + + /** + * 工序编码 + */ + private String processCode; + + /** + * 工序名称 + */ + private String processName; + + /** + * 供应商编码 + */ + private String supplierCode; + + /** + * 供应商名称 + */ + private String supplierName; + + /** + * 模板说明 + */ + private String description; + + + /** + * 检测类型编码 + */ + private String typeCode;//JOIN + + /** + * 检测类型名称 + */ + private String typeName;//JOIN + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + private Long qcInspectionType;//JOIN + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTypeBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTypeBo.java new file mode 100644 index 0000000..79ba9d8 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTypeBo.java @@ -0,0 +1,54 @@ +package org.dromara.qms.domain.bo; + +import org.dromara.qms.domain.QcInspectionType; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 检测类型业务对象 qc_inspection_type + * + * @author zch + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = QcInspectionType.class, reverseConvertGenerate = false) +public class QcInspectionTypeBo extends BaseEntity { + + /** + * 检测类型主键 + */ + @NotNull(message = "检测类型主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long typeId; + + /** + * 检测类型编码 + */ + // @NotBlank(message = "检测类型编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String typeCode; + + /** + * 检测类型名称 + */ + // @NotBlank(message = "检测类型名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String typeName; + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + // @NotNull(message = "检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long qcInspectionType; + + /** + * 创建方式（1人工创建 2自动创建） + */ + // @NotNull(message = "创建方式（1人工创建 2自动创建）不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long createMethod; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java new file mode 100644 index 0000000..fe8a998 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java @@ -0,0 +1,130 @@ +package org.dromara.qms.domain.bo; + +import org.dromara.qms.domain.QcTemplateItem; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +/** + * 检测模板子表业务对象 qc_template_item + * + * @author Yinq + * @date 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = QcTemplateItem.class, reverseConvertGenerate = false) +public class QcTemplateItemBo extends BaseEntity { + + /** + * 模板子表主键 + */ + @NotNull(message = "模板子表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long templateItemId; + + /** + * 关联模板主表ID + */ + private Long templateId; + + /** + * 关联检测项定义ID + */ + private Long itemId; + + /** + * 检测项编码 + */ + private String itemCode; + + /** + * 检测项名称 + */ + private String itemName; + + /** + * 检测位置 + */ + private String inspectionPosition; + + /** + * 检测项目类别 + */ + private String categoryName; + + /** + * 检测类型（根据主表关联的类型表主键查来的字典值自动存入） + */ + private Long inspectionType; + + /** + * 检测方式（0定性,1定量） + */ + private Long detectType; + + /** + * 控制类型(0手动,1自动) + */ + private Long controlType; + + /** + * 标准值 + */ + private BigDecimal standardValue; + + /** + * 控制上限 + */ + private BigDecimal upperLimit; + + /** + * 控制下限 + */ + private BigDecimal lowerLimit; + + /** + * 规格名称 + */ + private String specName; + + /** + * 规格上限 + */ + private BigDecimal specUpper; + + /** + * 规格下限 + */ + private BigDecimal specLower; + + /** + * 检测项说明 + */ + private String description; + + /** + * 模板编码 + */ + private String templateCode;//JOIN + + /** + * 模板名称 + */ + private String templateName;//JOIN + + /** + * 检测项名称 + */ + private String inspectionItemName;//JOIN AS + + /** + * 检测项编码 + */ + private String inspectionItemCode;//JOIN AS + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemCategoryVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemCategoryVo.java new file mode 100644 index 0000000..e31b200 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemCategoryVo.java @@ -0,0 +1,74 @@ +package org.dromara.qms.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.qms.domain.QcInspectionItemCategory; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 检测项类别视图对象 qc_inspection_item_category + * + * @author zch + * @date 2025-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = QcInspectionItemCategory.class) +public class QcInspectionItemCategoryVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检测项类别主键 + */ + @ExcelProperty(value = "检测项类别主键") + private Long categoryId; + + /** + * 检测项类别编码 + */ + @ExcelProperty(value = "检测项类别编码") + private String categoryCode; + + /** + * 检测项类别名称 + */ + @ExcelProperty(value = "检测项类别名称") + private String categoryName; + + /** + * 检测单类型（关联检测类型表） + */ + @ExcelProperty(value = "检测单类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联检测类型表") + private Long typeId; + + /** + * 描述 + */ + @ExcelProperty(value = "描述") + private String description; + + + /** + * 检测类型名称 + */ + private String typeName;//join + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + private Long qcInspectionType;//join + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemVo.java new file mode 100644 index 0000000..3da4c12 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionItemVo.java @@ -0,0 +1,151 @@ +package org.dromara.qms.domain.vo; + +import org.dromara.qms.domain.QcInspectionItem; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 检测项定义视图对象 qc_inspection_item + * + * @author zch + * @date 2025-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = QcInspectionItem.class) +public class QcInspectionItemVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检测项主键 + */ + @ExcelProperty(value = "检测项主键") + private Long itemId; + + /** + * 检测项编码 + */ + @ExcelProperty(value = "检测项编码") + private String itemCode; + + /** + * 检测项名称 + */ + @ExcelProperty(value = "检测项名称") + private String itemName; + + /** + * 检测位置 + */ + @ExcelProperty(value = "检测位置") + private String inspectionPosition; + + /** + * 检测项类别（关联检测项类别表） + */ + @ExcelProperty(value = "检测项类别", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联检测项类别表") + private Long categoryId; + + /** + * 检测单类型 + */ + @ExcelProperty(value = "检测单类型") + private Long inspectionType; + + /** + * 检测方法（0目视,1千分尺） + */ + @ExcelProperty(value = "检测方法", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "qc_methond") + private Long method; + + /** + * 检测方式（0定性,1定量） + */ + @ExcelProperty(value = "检测方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "detect_type") + private Long detectType; + + /** + * 控制类型（0手动输入，1自动输入） + */ + @ExcelProperty(value = "控制类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "control_type") + private Long controlType; + + /** + * 标准值 + */ + @ExcelProperty(value = "标准值") + private Long standardValue; + + /** + * 控制上限 + */ + @ExcelProperty(value = "控制上限") + private Long upperLimit; + + /** + * 控制下限 + */ + @ExcelProperty(value = "控制下限") + private Long lowerLimit; + + /** + * 规格名称 + */ + @ExcelProperty(value = "规格名称") + private String specName; + + /** + * 规格上限 + */ + @ExcelProperty(value = "规格上限") + private Long specUpper; + + /** + * 规格下限 + */ + @ExcelProperty(value = "规格下限") + private Long specLower; + + /** + * 检测项说明 + */ + @ExcelProperty(value = "检测项说明") + private String description; + + /** + * 检测选项编码 + */ + @ExcelProperty(value = "检测选项编码") + private String optionCode; + + /** + * 检测选项名称 + */ + @ExcelProperty(value = "检测选项名称") + private String optionName; + + /** + * 是否默认选项（是/否） + */ + @ExcelProperty(value = "是否默认选项", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "is_default") + private String isDefault; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java new file mode 100644 index 0000000..96ea665 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java @@ -0,0 +1,189 @@ +package org.dromara.qms.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.qms.domain.QcInspectionMain; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 质检主表视图对象 qc_inspection_main + * + * @author zch + * @date 2025-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = QcInspectionMain.class) +public class QcInspectionMainVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 质检主键 + */ + @ExcelProperty(value = "质检主键") + private Long inspectionId; + + /** + * 检测单号/卡号 + */ + @ExcelProperty(value = "检测单号/卡号") + private String inspectionNo; + + /** + * 物料编码 + */ + @ExcelProperty(value = "物料编码") + private String materialCode; + + /** + * 物料类型 + */ + @ExcelProperty(value = "物料类型") + private String materialType; + + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName; + + /** + * 工序名称 + */ + @ExcelProperty(value = "工序名称") + private String processName; + + /** + * 工位名称 + */ + @ExcelProperty(value = "工位名称") + private String stationName; + + /** + * 质检数量 + */ + @ExcelProperty(value = "质检数量") + private Integer inspectionQty; + + /** + * 合格数 + */ + @ExcelProperty(value = "合格数") + private Integer qualifiedQty; + + /** + * 不合格数 + */ + @ExcelProperty(value = "不合格数") + private Integer unqualifiedQty; + + /** + * 质检结果（0合格/1不合格） + */ + @ExcelProperty(value = "质检结果", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "qc_result") + private Long result; + + /** + * 车间 + */ + @ExcelProperty(value = "车间") + private String workshop; + + /** + * 检测类型主键 + */ + @ExcelProperty(value = "检测类型主键") + private Long typeId; + + /** + * 单据状态（0未处理/1完成） + */ + @ExcelProperty(value = "单据状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "qc_status") + private Long status; + + /** + * 检测人员 + */ + @ExcelProperty(value = "检测人员") + private String inspector; + + /** + * 班次 + */ + @ExcelProperty(value = "班次") + private String shift; + + /** + * 班组 + */ + @ExcelProperty(value = "班组") + private String team; + + /** + * 检验时间 + */ + @ExcelProperty(value = "检验时间") + private Date inspectionTime; + + /** + * 生产订单号 + */ + @ExcelProperty(value = "生产订单号") + private String productionOrder; + + /** + * 批次号 + */ + @ExcelProperty(value = "批次号") + private String batchNo; + + /** + * 条码号 + */ + @ExcelProperty(value = "条码号") + private String barcode; + + /** + * 供应商名称 + */ + @ExcelProperty(value = "供应商名称") + private String supplierName; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + + /** + * 检测类型编码 + */ + private String typeCode;//JOIN + + /** + * 检测类型名称 + */ + private String typeName;//JOIN + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + private Long qcInspectionType;//JOIN + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionResultVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionResultVo.java new file mode 100644 index 0000000..45e05bd --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionResultVo.java @@ -0,0 +1,76 @@ +package org.dromara.qms.domain.vo; + +import java.math.BigDecimal; +import org.dromara.qms.domain.QcInspectionResult; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 质检结果子表视图对象 qc_inspection_result + * + * @author Yinq + * @date 2025-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = QcInspectionResult.class) +public class QcInspectionResultVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 结果主键 + */ + @ExcelProperty(value = "结果主键") + private Long resultId; + + /** + * 关联质检主表ID + */ + @ExcelProperty(value = "关联质检主表ID") + private Long inspectionId; + + /** + * 关联检测项ID + */ + @ExcelProperty(value = "关联检测项ID") + private Long itemId; + + /** + * 检测结果（0合格，1不合格） + */ + @ExcelProperty(value = "检测结果", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "qc_result") + private Long detectResult; + + /** + * 定量检测值 + */ + @ExcelProperty(value = "定量检测值") + private BigDecimal detectValue; + + /** + * 规格质检值 + */ + @ExcelProperty(value = "规格质检值") + private String specInspection; + + /** + * 定性不合格明细 + */ + @ExcelProperty(value = "定性不合格明细") + private String problemDetail; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionTemplateVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionTemplateVo.java new file mode 100644 index 0000000..321bed6 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionTemplateVo.java @@ -0,0 +1,124 @@ +package org.dromara.qms.domain.vo; + +import org.dromara.qms.domain.QcInspectionTemplate; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 检测模板主视图对象 qc_inspection_template + * + * @author zch + * @date 2025-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = QcInspectionTemplate.class) +public class QcInspectionTemplateVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板主键 + */ + @ExcelProperty(value = "模板主键") + private Long templateId; + + /** + * 模板编码 + */ + @ExcelProperty(value = "模板编码") + private String templateCode; + + /** + * 模板名称 + */ + @ExcelProperty(value = "模板名称") + private String templateName; + + /** + * 物料编码 + */ + @ExcelProperty(value = "物料编码") + private String materialCode; + + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName; + + /** + * 关联检测类型表ID + */ + @ExcelProperty(value = "关联检测类型表ID") + private Long typeId; + + /** + * 工位编码 + */ + @ExcelProperty(value = "工位编码") + private String stationCode; + + /** + * 工位名称 + */ + @ExcelProperty(value = "工位名称") + private String stationName; + + /** + * 工序编码 + */ + @ExcelProperty(value = "工序编码") + private String processCode; + + /** + * 工序名称 + */ + @ExcelProperty(value = "工序名称") + private String processName; + + /** + * 供应商编码 + */ + @ExcelProperty(value = "供应商编码") + private String supplierCode; + + /** + * 供应商名称 + */ + @ExcelProperty(value = "供应商名称") + private String supplierName; + + /** + * 模板说明 + */ + @ExcelProperty(value = "模板说明") + private String description; + + /** + * 检测类型编码 + */ + private String typeCode;//JOIN + + /** + * 检测类型名称 + */ + private String typeName;//JOIN + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + private Long qcInspectionType;//JOIN + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionTypeVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionTypeVo.java new file mode 100644 index 0000000..85a9c63 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionTypeVo.java @@ -0,0 +1,64 @@ +package org.dromara.qms.domain.vo; + +import org.dromara.qms.domain.QcInspectionType; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 检测类型视图对象 qc_inspection_type + * + * @author zch + * @date 2025-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = QcInspectionType.class) +public class QcInspectionTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 检测类型主键 + */ + @ExcelProperty(value = "检测类型主键") + private Long typeId; + + /** + * 检测类型编码 + */ + @ExcelProperty(value = "检测类型编码") + private String typeCode; + + /** + * 检测类型名称 + */ + @ExcelProperty(value = "检测类型名称") + private String typeName; + + /** + * 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检） + */ + @ExcelProperty(value = "检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "qc_inspection_type") + private Long qcInspectionType; + + /** + * 创建方式（1人工创建 2自动创建） + */ + @ExcelProperty(value = "创建方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "create_method") + private Long createMethod; + + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcTemplateItemVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcTemplateItemVo.java new file mode 100644 index 0000000..6e7bd13 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcTemplateItemVo.java @@ -0,0 +1,158 @@ +package org.dromara.qms.domain.vo; + +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.qms.domain.QcTemplateItem; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 检测模板子表视图对象 qc_template_item + * + * @author Yinq + * @date 2025-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = QcTemplateItem.class) +public class QcTemplateItemVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板子表主键 + */ + @ExcelProperty(value = "模板子表主键") + private Long templateItemId; + + /** + * 关联模板主表ID + */ + @ExcelProperty(value = "关联模板主表ID") + private Long templateId; + + /** + * 关联检测项定义ID + */ + @ExcelProperty(value = "关联检测项定义ID") + private Long itemId; + + /** + * 检测项编码 + */ + @ExcelProperty(value = "检测项编码") + private String itemCode; + + /** + * 检测项名称 + */ + @ExcelProperty(value = "检测项名称") + private String itemName; + + /** + * 检测位置 + */ + @ExcelProperty(value = "检测位置") + private String inspectionPosition; + + /** + * 检测项目类别 + */ + @ExcelProperty(value = "检测项目类别") + private String categoryName; + + /** + * 检测类型（根据主表关联的类型表主键查来的字典值自动存入） + */ + @ExcelProperty(value = "检测类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "根=据主表关联的类型表主键查来的字典值自动存入") + private Long inspectionType; + + /** + * 检测方式（0定性,1定量） + */ + @ExcelProperty(value = "检测方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "qc_methond") + private Long detectType; + + /** + * 控制类型(0手动,1自动) + */ + @ExcelProperty(value = "控制类型(0手动,1自动)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "control_type") + private Long controlType; + + /** + * 标准值 + */ + @ExcelProperty(value = "标准值") + private BigDecimal standardValue; + + /** + * 控制上限 + */ + @ExcelProperty(value = "控制上限") + private BigDecimal upperLimit; + + /** + * 控制下限 + */ + @ExcelProperty(value = "控制下限") + private BigDecimal lowerLimit; + + /** + * 规格名称 + */ + @ExcelProperty(value = "规格名称") + private String specName; + + /** + * 规格上限 + */ + @ExcelProperty(value = "规格上限") + private BigDecimal specUpper; + + /** + * 规格下限 + */ + @ExcelProperty(value = "规格下限") + private BigDecimal specLower; + + /** + * 检测项说明 + */ + @ExcelProperty(value = "检测项说明") + private String description; + + /** + * 模板编码 + */ + private String templateCode;//JOIN + + /** + * 模板名称 + */ + private String templateName;//JOIN + + /** + * 检测项名称 + */ + private String inspectionItemName;//JOIN AS + + /** + * 检测项编码 + */ + private String inspectionItemCode;//JOIN AS +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionItemCategoryMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionItemCategoryMapper.java new file mode 100644 index 0000000..e812fc0 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionItemCategoryMapper.java @@ -0,0 +1,34 @@ +package org.dromara.qms.mapper; + +import org.dromara.qms.domain.bo.QcInspectionItemCategoryBo; +import org.dromara.qms.domain.QcInspectionItemCategory; +import org.dromara.qms.domain.vo.QcInspectionItemCategoryVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 检测项类别Mapper接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface QcInspectionItemCategoryMapper extends BaseMapperPlus { + + /** + * 查询检测项类别列表 + * + * @param bo 查询条件 + * @return 检测项类别列表 + */ + List selectVoList(QcInspectionItemCategoryBo bo); + + /** + * 根据主键查询检测项类别 + * + * @param categoryId 主键 + * @return 检测项类别 + */ + QcInspectionItemCategoryVo selectVoByCategoryId(Long categoryId); + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionItemMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionItemMapper.java new file mode 100644 index 0000000..323cf6a --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionItemMapper.java @@ -0,0 +1,34 @@ +package org.dromara.qms.mapper; + +import org.dromara.qms.domain.bo.QcInspectionItemBo; +import org.dromara.qms.domain.QcInspectionItem; +import org.dromara.qms.domain.vo.QcInspectionItemVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 检测项定义Mapper接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface QcInspectionItemMapper extends BaseMapperPlus { + + /** + * 查询检测项定义列表 + * + * @param bo 查询条件 + * @return 检测项定义列表 + */ + List selectVoList(QcInspectionItemBo bo); + + /** + * 根据主键查询检测项定义 + * + * @param itemId 主键 + * @return 检测项定义 + */ + QcInspectionItemVo selectVoByItemId(Long itemId); + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionMainMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionMainMapper.java new file mode 100644 index 0000000..231c3f0 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionMainMapper.java @@ -0,0 +1,34 @@ +package org.dromara.qms.mapper; + +import org.dromara.qms.domain.bo.QcInspectionMainBo; +import org.dromara.qms.domain.QcInspectionMain; +import org.dromara.qms.domain.vo.QcInspectionMainVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 质检主表Mapper接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface QcInspectionMainMapper extends BaseMapperPlus { + + /** + * 查询质检主表列表 + * + * @param bo 查询条件 + * @return 质检主表列表 + */ + List selectVoList(QcInspectionMainBo bo); + + /** + * 根据主键查询质检主表 + * + * @param inspectionId 主键 + * @return 质检主表 + */ + QcInspectionMainVo selectVoByInspectionId(Long inspectionId); + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionResultMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionResultMapper.java new file mode 100644 index 0000000..c9dc459 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionResultMapper.java @@ -0,0 +1,34 @@ +package org.dromara.qms.mapper; + +import org.dromara.qms.domain.bo.QcInspectionResultBo; +import org.dromara.qms.domain.QcInspectionResult; +import org.dromara.qms.domain.vo.QcInspectionResultVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 质检结果子表Mapper接口 + * + * @author Yinq + * @date 2025-07-14 + */ +public interface QcInspectionResultMapper extends BaseMapperPlus { + + /** + * 查询质检结果子表列表 + * + * @param bo 查询条件 + * @return 质检结果子表列表 + */ + List selectVoList(QcInspectionResultBo bo); + + /** + * 根据主键查询质检结果子表 + * + * @param resultId 主键 + * @return 质检结果子表 + */ + QcInspectionResultVo selectVoByResultId(Long resultId); + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionTemplateMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionTemplateMapper.java new file mode 100644 index 0000000..e7a2717 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionTemplateMapper.java @@ -0,0 +1,34 @@ +package org.dromara.qms.mapper; + +import org.dromara.qms.domain.bo.QcInspectionTemplateBo; +import org.dromara.qms.domain.QcInspectionTemplate; +import org.dromara.qms.domain.vo.QcInspectionTemplateVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 检测模板主Mapper接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface QcInspectionTemplateMapper extends BaseMapperPlus { + + /** + * 查询检测模板主列表 + * + * @param bo 查询条件 + * @return 检测模板主列表 + */ + List selectVoList(QcInspectionTemplateBo bo); + + /** + * 根据主键查询检测模板主 + * + * @param templateId 主键 + * @return 检测模板主 + */ + QcInspectionTemplateVo selectVoByTemplateId(Long templateId); + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionTypeMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionTypeMapper.java new file mode 100644 index 0000000..170b5f2 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcInspectionTypeMapper.java @@ -0,0 +1,34 @@ +package org.dromara.qms.mapper; + +import org.dromara.qms.domain.bo.QcInspectionTypeBo; +import org.dromara.qms.domain.QcInspectionType; +import org.dromara.qms.domain.vo.QcInspectionTypeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 检测类型Mapper接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface QcInspectionTypeMapper extends BaseMapperPlus { + + /** + * 查询检测类型列表 + * + * @param bo 查询条件 + * @return 检测类型列表 + */ + List selectVoList(QcInspectionTypeBo bo); + + /** + * 根据主键查询检测类型 + * + * @param typeId 主键 + * @return 检测类型 + */ + QcInspectionTypeVo selectVoByTypeId(Long typeId); + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcTemplateItemMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcTemplateItemMapper.java new file mode 100644 index 0000000..bb941eb --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcTemplateItemMapper.java @@ -0,0 +1,34 @@ +package org.dromara.qms.mapper; + +import org.dromara.qms.domain.bo.QcTemplateItemBo; +import org.dromara.qms.domain.QcTemplateItem; +import org.dromara.qms.domain.vo.QcTemplateItemVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 检测模板子表Mapper接口 + * + * @author Yinq + * @date 2025-07-14 + */ +public interface QcTemplateItemMapper extends BaseMapperPlus { + + /** + * 查询检测模板子表列表 + * + * @param bo 查询条件 + * @return 检测模板子表列表 + */ + List selectVoList(QcTemplateItemBo bo); + + /** + * 根据主键查询检测模板子表 + * + * @param templateItemId 主键 + * @return 检测模板子表 + */ + QcTemplateItemVo selectVoByTemplateItemId(Long templateItemId); + +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemCategoryService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemCategoryService.java new file mode 100644 index 0000000..5142961 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemCategoryService.java @@ -0,0 +1,69 @@ +package org.dromara.qms.service; + +import org.dromara.qms.domain.QcInspectionItemCategory; +import org.dromara.qms.domain.vo.QcInspectionItemCategoryVo; +import org.dromara.qms.domain.bo.QcInspectionItemCategoryBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检测项类别Service接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface IQcInspectionItemCategoryService { + + /** + * 查询检测项类别 + * + * @param categoryId 主键 + * @return 检测项类别 + */ + QcInspectionItemCategoryVo queryById(Long categoryId); + + /** + * 分页查询检测项类别列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测项类别分页列表 + */ + TableDataInfo queryPageList(QcInspectionItemCategoryBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的检测项类别列表 + * + * @param bo 查询条件 + * @return 检测项类别列表 + */ + List queryList(QcInspectionItemCategoryBo bo); + + /** + * 新增检测项类别 + * + * @param bo 检测项类别 + * @return 是否新增成功 + */ + Boolean insertByBo(QcInspectionItemCategoryBo bo); + + /** + * 修改检测项类别 + * + * @param bo 检测项类别 + * @return 是否修改成功 + */ + Boolean updateByBo(QcInspectionItemCategoryBo bo); + + /** + * 校验并批量删除检测项类别信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemService.java new file mode 100644 index 0000000..f2bb7e0 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemService.java @@ -0,0 +1,69 @@ +package org.dromara.qms.service; + +import org.dromara.qms.domain.QcInspectionItem; +import org.dromara.qms.domain.vo.QcInspectionItemVo; +import org.dromara.qms.domain.bo.QcInspectionItemBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检测项定义Service接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface IQcInspectionItemService { + + /** + * 查询检测项定义 + * + * @param itemId 主键 + * @return 检测项定义 + */ + QcInspectionItemVo queryById(Long itemId); + + /** + * 分页查询检测项定义列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测项定义分页列表 + */ + TableDataInfo queryPageList(QcInspectionItemBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的检测项定义列表 + * + * @param bo 查询条件 + * @return 检测项定义列表 + */ + List queryList(QcInspectionItemBo bo); + + /** + * 新增检测项定义 + * + * @param bo 检测项定义 + * @return 是否新增成功 + */ + Boolean insertByBo(QcInspectionItemBo bo); + + /** + * 修改检测项定义 + * + * @param bo 检测项定义 + * @return 是否修改成功 + */ + Boolean updateByBo(QcInspectionItemBo bo); + + /** + * 校验并批量删除检测项定义信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionMainService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionMainService.java new file mode 100644 index 0000000..65859c4 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionMainService.java @@ -0,0 +1,69 @@ +package org.dromara.qms.service; + +import org.dromara.qms.domain.QcInspectionMain; +import org.dromara.qms.domain.vo.QcInspectionMainVo; +import org.dromara.qms.domain.bo.QcInspectionMainBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 质检主表Service接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface IQcInspectionMainService { + + /** + * 查询质检主表 + * + * @param inspectionId 主键 + * @return 质检主表 + */ + QcInspectionMainVo queryById(Long inspectionId); + + /** + * 分页查询质检主表列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 质检主表分页列表 + */ + TableDataInfo queryPageList(QcInspectionMainBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的质检主表列表 + * + * @param bo 查询条件 + * @return 质检主表列表 + */ + List queryList(QcInspectionMainBo bo); + + /** + * 新增质检主表 + * + * @param bo 质检主表 + * @return 是否新增成功 + */ + Boolean insertByBo(QcInspectionMainBo bo); + + /** + * 修改质检主表 + * + * @param bo 质检主表 + * @return 是否修改成功 + */ + Boolean updateByBo(QcInspectionMainBo bo); + + /** + * 校验并批量删除质检主表信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionResultService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionResultService.java new file mode 100644 index 0000000..b39286e --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionResultService.java @@ -0,0 +1,69 @@ +package org.dromara.qms.service; + +import org.dromara.qms.domain.QcInspectionResult; +import org.dromara.qms.domain.vo.QcInspectionResultVo; +import org.dromara.qms.domain.bo.QcInspectionResultBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 质检结果子表Service接口 + * + * @author Yinq + * @date 2025-07-14 + */ +public interface IQcInspectionResultService { + + /** + * 查询质检结果子表 + * + * @param resultId 主键 + * @return 质检结果子表 + */ + QcInspectionResultVo queryById(Long resultId); + + /** + * 分页查询质检结果子表列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 质检结果子表分页列表 + */ + TableDataInfo queryPageList(QcInspectionResultBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的质检结果子表列表 + * + * @param bo 查询条件 + * @return 质检结果子表列表 + */ + List queryList(QcInspectionResultBo bo); + + /** + * 新增质检结果子表 + * + * @param bo 质检结果子表 + * @return 是否新增成功 + */ + Boolean insertByBo(QcInspectionResultBo bo); + + /** + * 修改质检结果子表 + * + * @param bo 质检结果子表 + * @return 是否修改成功 + */ + Boolean updateByBo(QcInspectionResultBo bo); + + /** + * 校验并批量删除质检结果子表信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionTemplateService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionTemplateService.java new file mode 100644 index 0000000..200a7ea --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionTemplateService.java @@ -0,0 +1,69 @@ +package org.dromara.qms.service; + +import org.dromara.qms.domain.QcInspectionTemplate; +import org.dromara.qms.domain.vo.QcInspectionTemplateVo; +import org.dromara.qms.domain.bo.QcInspectionTemplateBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检测模板主Service接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface IQcInspectionTemplateService { + + /** + * 查询检测模板主 + * + * @param templateId 主键 + * @return 检测模板主 + */ + QcInspectionTemplateVo queryById(Long templateId); + + /** + * 分页查询检测模板主列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测模板主分页列表 + */ + TableDataInfo queryPageList(QcInspectionTemplateBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的检测模板主列表 + * + * @param bo 查询条件 + * @return 检测模板主列表 + */ + List queryList(QcInspectionTemplateBo bo); + + /** + * 新增检测模板主 + * + * @param bo 检测模板主 + * @return 是否新增成功 + */ + Boolean insertByBo(QcInspectionTemplateBo bo); + + /** + * 修改检测模板主 + * + * @param bo 检测模板主 + * @return 是否修改成功 + */ + Boolean updateByBo(QcInspectionTemplateBo bo); + + /** + * 校验并批量删除检测模板主信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionTypeService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionTypeService.java new file mode 100644 index 0000000..fdd6256 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionTypeService.java @@ -0,0 +1,69 @@ +package org.dromara.qms.service; + +import org.dromara.qms.domain.QcInspectionType; +import org.dromara.qms.domain.vo.QcInspectionTypeVo; +import org.dromara.qms.domain.bo.QcInspectionTypeBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检测类型Service接口 + * + * @author zch + * @date 2025-07-14 + */ +public interface IQcInspectionTypeService { + + /** + * 查询检测类型 + * + * @param typeId 主键 + * @return 检测类型 + */ + QcInspectionTypeVo queryById(Long typeId); + + /** + * 分页查询检测类型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测类型分页列表 + */ + TableDataInfo queryPageList(QcInspectionTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的检测类型列表 + * + * @param bo 查询条件 + * @return 检测类型列表 + */ + List queryList(QcInspectionTypeBo bo); + + /** + * 新增检测类型 + * + * @param bo 检测类型 + * @return 是否新增成功 + */ + Boolean insertByBo(QcInspectionTypeBo bo); + + /** + * 修改检测类型 + * + * @param bo 检测类型 + * @return 是否修改成功 + */ + Boolean updateByBo(QcInspectionTypeBo bo); + + /** + * 校验并批量删除检测类型信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcTemplateItemService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcTemplateItemService.java new file mode 100644 index 0000000..08f2ef9 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcTemplateItemService.java @@ -0,0 +1,69 @@ +package org.dromara.qms.service; + +import org.dromara.qms.domain.QcTemplateItem; +import org.dromara.qms.domain.vo.QcTemplateItemVo; +import org.dromara.qms.domain.bo.QcTemplateItemBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 检测模板子表Service接口 + * + * @author Yinq + * @date 2025-07-14 + */ +public interface IQcTemplateItemService { + + /** + * 查询检测模板子表 + * + * @param templateItemId 主键 + * @return 检测模板子表 + */ + QcTemplateItemVo queryById(Long templateItemId); + + /** + * 分页查询检测模板子表列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测模板子表分页列表 + */ + TableDataInfo queryPageList(QcTemplateItemBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的检测模板子表列表 + * + * @param bo 查询条件 + * @return 检测模板子表列表 + */ + List queryList(QcTemplateItemBo bo); + + /** + * 新增检测模板子表 + * + * @param bo 检测模板子表 + * @return 是否新增成功 + */ + Boolean insertByBo(QcTemplateItemBo bo); + + /** + * 修改检测模板子表 + * + * @param bo 检测模板子表 + * @return 是否修改成功 + */ + Boolean updateByBo(QcTemplateItemBo bo); + + /** + * 校验并批量删除检测模板子表信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemCategoryServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemCategoryServiceImpl.java new file mode 100644 index 0000000..56d3602 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemCategoryServiceImpl.java @@ -0,0 +1,142 @@ +package org.dromara.qms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.qms.domain.QcInspectionType; +import org.springframework.stereotype.Service; +import org.dromara.qms.domain.bo.QcInspectionItemCategoryBo; +import org.dromara.qms.domain.vo.QcInspectionItemCategoryVo; +import org.dromara.qms.domain.QcInspectionItemCategory; +import org.dromara.qms.mapper.QcInspectionItemCategoryMapper; +import org.dromara.qms.service.IQcInspectionItemCategoryService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检测项类别Service业务层处理 + * + * @author zch + * @date 2025-07-14 + */ +@RequiredArgsConstructor +@Service +public class QcInspectionItemCategoryServiceImpl implements IQcInspectionItemCategoryService { + + private final QcInspectionItemCategoryMapper baseMapper; + + /** + * 查询检测项类别 + * + * @param categoryId 主键 + * @return 检测项类别 + */ + @Override + public QcInspectionItemCategoryVo queryById(Long categoryId){ + return baseMapper.selectVoById(categoryId); + } + + /** + * 分页查询检测项类别列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测项类别分页列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionItemCategoryBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的检测项类别列表 + * + * @param bo 查询条件 + * @return 检测项类别列表 + */ + @Override + public List queryList(QcInspectionItemCategoryBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(QcInspectionItemCategoryBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(QcInspectionItemCategory.class) + .selectAll(QcInspectionItemCategory.class) + + // 查询检测类型列表 + .select(QcInspectionType::getTypeName) + .leftJoin(QcInspectionType.class, QcInspectionType::getTypeId, QcInspectionItemCategory::getTypeId) + + .eq(bo.getCategoryId() != null, QcInspectionItemCategory::getCategoryId, bo.getCategoryId()) + .eq(StringUtils.isNotBlank(bo.getCategoryCode()), QcInspectionItemCategory::getCategoryCode, bo.getCategoryCode()) + .like(StringUtils.isNotBlank(bo.getCategoryName()), QcInspectionItemCategory::getCategoryName, bo.getCategoryName()) + .eq(bo.getTypeId() != null, QcInspectionItemCategory::getTypeId, bo.getTypeId()) + .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionItemCategory::getDescription, bo.getDescription()) + .orderByDesc(QcInspectionItemCategory::getCreateTime); + return lqw; + } + + /** + * 新增检测项类别 + * + * @param bo 检测项类别 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(QcInspectionItemCategoryBo bo) { + QcInspectionItemCategory add = MapstructUtils.convert(bo, QcInspectionItemCategory.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setCategoryId(add.getCategoryId()); + } + return flag; + } + + /** + * 修改检测项类别 + * + * @param bo 检测项类别 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(QcInspectionItemCategoryBo bo) { + QcInspectionItemCategory update = MapstructUtils.convert(bo, QcInspectionItemCategory.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcInspectionItemCategory entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除检测项类别信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java new file mode 100644 index 0000000..ef58f0e --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java @@ -0,0 +1,150 @@ +package org.dromara.qms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.qms.domain.bo.QcInspectionItemBo; +import org.dromara.qms.domain.vo.QcInspectionItemVo; +import org.dromara.qms.domain.QcInspectionItem; +import org.dromara.qms.mapper.QcInspectionItemMapper; +import org.dromara.qms.service.IQcInspectionItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检测项定义Service业务层处理 + * + * @author zch + * @date 2025-07-14 + */ +@RequiredArgsConstructor +@Service +public class QcInspectionItemServiceImpl implements IQcInspectionItemService { + + private final QcInspectionItemMapper baseMapper; + + /** + * 查询检测项定义 + * + * @param itemId 主键 + * @return 检测项定义 + */ + @Override + public QcInspectionItemVo queryById(Long itemId){ + return baseMapper.selectVoById(itemId); + } + + /** + * 分页查询检测项定义列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测项定义分页列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionItemBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的检测项定义列表 + * + * @param bo 查询条件 + * @return 检测项定义列表 + */ + @Override + public List queryList(QcInspectionItemBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(QcInspectionItemBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(QcInspectionItem.class) + .selectAll(QcInspectionItem.class) + .eq(bo.getItemId() != null, QcInspectionItem::getItemId, bo.getItemId()) + .eq(StringUtils.isNotBlank(bo.getItemCode()), QcInspectionItem::getItemCode, bo.getItemCode()) + .like(StringUtils.isNotBlank(bo.getItemName()), QcInspectionItem::getItemName, bo.getItemName()) + .eq(StringUtils.isNotBlank(bo.getInspectionPosition()), QcInspectionItem::getInspectionPosition, bo.getInspectionPosition()) + .eq(bo.getCategoryId() != null, QcInspectionItem::getCategoryId, bo.getCategoryId()) + .eq(bo.getInspectionType() != null, QcInspectionItem::getInspectionType, bo.getInspectionType()) + .eq(bo.getMethod() != null, QcInspectionItem::getMethod, bo.getMethod()) + .eq(bo.getDetectType() != null, QcInspectionItem::getDetectType, bo.getDetectType()) + .eq(bo.getControlType() != null, QcInspectionItem::getControlType, bo.getControlType()) + .eq(bo.getStandardValue() != null, QcInspectionItem::getStandardValue, bo.getStandardValue()) + .eq(bo.getUpperLimit() != null, QcInspectionItem::getUpperLimit, bo.getUpperLimit()) + .eq(bo.getLowerLimit() != null, QcInspectionItem::getLowerLimit, bo.getLowerLimit()) + .like(StringUtils.isNotBlank(bo.getSpecName()), QcInspectionItem::getSpecName, bo.getSpecName()) + .eq(bo.getSpecUpper() != null, QcInspectionItem::getSpecUpper, bo.getSpecUpper()) + .eq(bo.getSpecLower() != null, QcInspectionItem::getSpecLower, bo.getSpecLower()) + .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionItem::getDescription, bo.getDescription()) + .eq(StringUtils.isNotBlank(bo.getOptionCode()), QcInspectionItem::getOptionCode, bo.getOptionCode()) + .like(StringUtils.isNotBlank(bo.getOptionName()), QcInspectionItem::getOptionName, bo.getOptionName()) + .eq(StringUtils.isNotBlank(bo.getIsDefault()), QcInspectionItem::getIsDefault, bo.getIsDefault()) + .orderByDesc(QcInspectionItem::getCreateTime); + return lqw; + } + + /** + * 新增检测项定义 + * + * @param bo 检测项定义 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(QcInspectionItemBo bo) { + QcInspectionItem add = MapstructUtils.convert(bo, QcInspectionItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setItemId(add.getItemId()); + } + return flag; + } + + /** + * 修改检测项定义 + * + * @param bo 检测项定义 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(QcInspectionItemBo bo) { + QcInspectionItem update = MapstructUtils.convert(bo, QcInspectionItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcInspectionItem entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除检测项定义信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java new file mode 100644 index 0000000..363eb09 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java @@ -0,0 +1,160 @@ +package org.dromara.qms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.qms.domain.QcInspectionTemplate; +import org.dromara.qms.domain.QcInspectionType; +import org.springframework.stereotype.Service; +import org.dromara.qms.domain.bo.QcInspectionMainBo; +import org.dromara.qms.domain.vo.QcInspectionMainVo; +import org.dromara.qms.domain.QcInspectionMain; +import org.dromara.qms.mapper.QcInspectionMainMapper; +import org.dromara.qms.service.IQcInspectionMainService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 质检主表Service业务层处理 + * + * @author zch + * @date 2025-07-14 + */ +@RequiredArgsConstructor +@Service +public class QcInspectionMainServiceImpl implements IQcInspectionMainService { + + private final QcInspectionMainMapper baseMapper; + + /** + * 查询质检主表 + * + * @param inspectionId 主键 + * @return 质检主表 + */ + @Override + public QcInspectionMainVo queryById(Long inspectionId){ + return baseMapper.selectVoById(inspectionId); + } + + /** + * 分页查询质检主表列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 质检主表分页列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionMainBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的质检主表列表 + * + * @param bo 查询条件 + * @return 质检主表列表 + */ + @Override + public List queryList(QcInspectionMainBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(QcInspectionMainBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(QcInspectionMain.class) + .selectAll(QcInspectionMain.class) + + //关联检测类型 + .select(QcInspectionType::getTypeName, QcInspectionType::getQcInspectionType, QcInspectionType::getTypeCode) + .leftJoin(QcInspectionType.class, QcInspectionType::getTypeId, QcInspectionMain::getTypeId) + + .eq(bo.getInspectionId() != null, QcInspectionMain::getInspectionId, bo.getInspectionId()) + .eq(StringUtils.isNotBlank(bo.getInspectionNo()), QcInspectionMain::getInspectionNo, bo.getInspectionNo()) + .eq(StringUtils.isNotBlank(bo.getMaterialCode()), QcInspectionMain::getMaterialCode, bo.getMaterialCode()) + .eq(StringUtils.isNotBlank(bo.getMaterialType()), QcInspectionMain::getMaterialType, bo.getMaterialType()) + .like(StringUtils.isNotBlank(bo.getMaterialName()), QcInspectionMain::getMaterialName, bo.getMaterialName()) + .like(StringUtils.isNotBlank(bo.getProcessName()), QcInspectionMain::getProcessName, bo.getProcessName()) + .like(StringUtils.isNotBlank(bo.getStationName()), QcInspectionMain::getStationName, bo.getStationName()) + .eq(bo.getInspectionQty() != null, QcInspectionMain::getInspectionQty, bo.getInspectionQty()) + .eq(bo.getQualifiedQty() != null, QcInspectionMain::getQualifiedQty, bo.getQualifiedQty()) + .eq(bo.getUnqualifiedQty() != null, QcInspectionMain::getUnqualifiedQty, bo.getUnqualifiedQty()) + .eq(bo.getResult() != null, QcInspectionMain::getResult, bo.getResult()) + .eq(StringUtils.isNotBlank(bo.getWorkshop()), QcInspectionMain::getWorkshop, bo.getWorkshop()) + .eq(bo.getTypeId() != null, QcInspectionMain::getTypeId, bo.getTypeId()) + .eq(bo.getStatus() != null, QcInspectionMain::getStatus, bo.getStatus()) + .eq(StringUtils.isNotBlank(bo.getInspector()), QcInspectionMain::getInspector, bo.getInspector()) + .eq(StringUtils.isNotBlank(bo.getShift()), QcInspectionMain::getShift, bo.getShift()) + .eq(StringUtils.isNotBlank(bo.getTeam()), QcInspectionMain::getTeam, bo.getTeam()) + .eq(bo.getInspectionTime() != null, QcInspectionMain::getInspectionTime, bo.getInspectionTime()) + .eq(StringUtils.isNotBlank(bo.getProductionOrder()), QcInspectionMain::getProductionOrder, bo.getProductionOrder()) + .eq(StringUtils.isNotBlank(bo.getBatchNo()), QcInspectionMain::getBatchNo, bo.getBatchNo()) + .eq(StringUtils.isNotBlank(bo.getBarcode()), QcInspectionMain::getBarcode, bo.getBarcode()) + .like(StringUtils.isNotBlank(bo.getSupplierName()), QcInspectionMain::getSupplierName, bo.getSupplierName()) + .orderByDesc(QcInspectionMain::getCreateTime); + return lqw; + } + + /** + * 新增质检主表 + * + * @param bo 质检主表 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(QcInspectionMainBo bo) { + QcInspectionMain add = MapstructUtils.convert(bo, QcInspectionMain.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInspectionId(add.getInspectionId()); + } + return flag; + } + + /** + * 修改质检主表 + * + * @param bo 质检主表 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(QcInspectionMainBo bo) { + QcInspectionMain update = MapstructUtils.convert(bo, QcInspectionMain.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcInspectionMain entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除质检主表信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java new file mode 100644 index 0000000..d72ccea --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionResultServiceImpl.java @@ -0,0 +1,138 @@ +package org.dromara.qms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.qms.domain.bo.QcInspectionResultBo; +import org.dromara.qms.domain.vo.QcInspectionResultVo; +import org.dromara.qms.domain.QcInspectionResult; +import org.dromara.qms.mapper.QcInspectionResultMapper; +import org.dromara.qms.service.IQcInspectionResultService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 质检结果子表Service业务层处理 + * + * @author Yinq + * @date 2025-07-14 + */ +@RequiredArgsConstructor +@Service +public class QcInspectionResultServiceImpl implements IQcInspectionResultService { + + private final QcInspectionResultMapper baseMapper; + + /** + * 查询质检结果子表 + * + * @param resultId 主键 + * @return 质检结果子表 + */ + @Override + public QcInspectionResultVo queryById(Long resultId){ + return baseMapper.selectVoById(resultId); + } + + /** + * 分页查询质检结果子表列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 质检结果子表分页列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionResultBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的质检结果子表列表 + * + * @param bo 查询条件 + * @return 质检结果子表列表 + */ + @Override + public List queryList(QcInspectionResultBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(QcInspectionResultBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(QcInspectionResult.class) + .selectAll(QcInspectionResult.class) + .eq(bo.getResultId() != null, QcInspectionResult::getResultId, bo.getResultId()) + .eq(bo.getInspectionId() != null, QcInspectionResult::getInspectionId, bo.getInspectionId()) + .eq(bo.getItemId() != null, QcInspectionResult::getItemId, bo.getItemId()) + .eq(bo.getDetectResult() != null, QcInspectionResult::getDetectResult, bo.getDetectResult()) + .eq(bo.getDetectValue() != null, QcInspectionResult::getDetectValue, bo.getDetectValue()) + .eq(StringUtils.isNotBlank(bo.getSpecInspection()), QcInspectionResult::getSpecInspection, bo.getSpecInspection()) + .eq(StringUtils.isNotBlank(bo.getProblemDetail()), QcInspectionResult::getProblemDetail, bo.getProblemDetail()) + .orderByDesc(QcInspectionResult::getCreateTime); + return lqw; + } + + /** + * 新增质检结果子表 + * + * @param bo 质检结果子表 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(QcInspectionResultBo bo) { + QcInspectionResult add = MapstructUtils.convert(bo, QcInspectionResult.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setResultId(add.getResultId()); + } + return flag; + } + + /** + * 修改质检结果子表 + * + * @param bo 质检结果子表 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(QcInspectionResultBo bo) { + QcInspectionResult update = MapstructUtils.convert(bo, QcInspectionResult.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcInspectionResult entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除质检结果子表信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTemplateServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTemplateServiceImpl.java new file mode 100644 index 0000000..2a70d94 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTemplateServiceImpl.java @@ -0,0 +1,150 @@ +package org.dromara.qms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.qms.domain.QcInspectionType; +import org.springframework.stereotype.Service; +import org.dromara.qms.domain.bo.QcInspectionTemplateBo; +import org.dromara.qms.domain.vo.QcInspectionTemplateVo; +import org.dromara.qms.domain.QcInspectionTemplate; +import org.dromara.qms.mapper.QcInspectionTemplateMapper; +import org.dromara.qms.service.IQcInspectionTemplateService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检测模板主Service业务层处理 + * + * @author zch + * @date 2025-07-14 + */ +@RequiredArgsConstructor +@Service +public class QcInspectionTemplateServiceImpl implements IQcInspectionTemplateService { + + private final QcInspectionTemplateMapper baseMapper; + + /** + * 查询检测模板主 + * + * @param templateId 主键 + * @return 检测模板主 + */ + @Override + public QcInspectionTemplateVo queryById(Long templateId){ + return baseMapper.selectVoById(templateId); + } + + /** + * 分页查询检测模板主列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测模板主分页列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionTemplateBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的检测模板主列表 + * + * @param bo 查询条件 + * @return 检测模板主列表 + */ + @Override + public List queryList(QcInspectionTemplateBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(QcInspectionTemplateBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(QcInspectionTemplate.class) + .selectAll(QcInspectionTemplate.class) + + //关联检测类型 + .select(QcInspectionType::getTypeName, QcInspectionType::getQcInspectionType, QcInspectionType::getTypeCode) + .leftJoin(QcInspectionType.class, QcInspectionType::getTypeId, QcInspectionTemplate::getTypeId) + + .eq(bo.getTemplateId() != null, QcInspectionTemplate::getTemplateId, bo.getTemplateId()) + .eq(StringUtils.isNotBlank(bo.getTemplateCode()), QcInspectionTemplate::getTemplateCode, bo.getTemplateCode()) + .like(StringUtils.isNotBlank(bo.getTemplateName()), QcInspectionTemplate::getTemplateName, bo.getTemplateName()) + .eq(StringUtils.isNotBlank(bo.getMaterialCode()), QcInspectionTemplate::getMaterialCode, bo.getMaterialCode()) + .like(StringUtils.isNotBlank(bo.getMaterialName()), QcInspectionTemplate::getMaterialName, bo.getMaterialName()) + .eq(bo.getTypeId() != null, QcInspectionTemplate::getTypeId, bo.getTypeId()) + .eq(StringUtils.isNotBlank(bo.getStationCode()), QcInspectionTemplate::getStationCode, bo.getStationCode()) + .like(StringUtils.isNotBlank(bo.getStationName()), QcInspectionTemplate::getStationName, bo.getStationName()) + .eq(StringUtils.isNotBlank(bo.getProcessCode()), QcInspectionTemplate::getProcessCode, bo.getProcessCode()) + .like(StringUtils.isNotBlank(bo.getProcessName()), QcInspectionTemplate::getProcessName, bo.getProcessName()) + .eq(StringUtils.isNotBlank(bo.getSupplierCode()), QcInspectionTemplate::getSupplierCode, bo.getSupplierCode()) + .like(StringUtils.isNotBlank(bo.getSupplierName()), QcInspectionTemplate::getSupplierName, bo.getSupplierName()) + .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionTemplate::getDescription, bo.getDescription()) + .orderByDesc(QcInspectionTemplate::getCreateTime); + return lqw; + } + + /** + * 新增检测模板主 + * + * @param bo 检测模板主 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(QcInspectionTemplateBo bo) { + QcInspectionTemplate add = MapstructUtils.convert(bo, QcInspectionTemplate.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTemplateId(add.getTemplateId()); + } + return flag; + } + + /** + * 修改检测模板主 + * + * @param bo 检测模板主 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(QcInspectionTemplateBo bo) { + QcInspectionTemplate update = MapstructUtils.convert(bo, QcInspectionTemplate.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcInspectionTemplate entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除检测模板主信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTypeServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTypeServiceImpl.java new file mode 100644 index 0000000..0c2c7a9 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTypeServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.qms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.qms.domain.bo.QcInspectionTypeBo; +import org.dromara.qms.domain.vo.QcInspectionTypeVo; +import org.dromara.qms.domain.QcInspectionType; +import org.dromara.qms.mapper.QcInspectionTypeMapper; +import org.dromara.qms.service.IQcInspectionTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检测类型Service业务层处理 + * + * @author zch + * @date 2025-07-14 + */ +@RequiredArgsConstructor +@Service +public class QcInspectionTypeServiceImpl implements IQcInspectionTypeService { + + private final QcInspectionTypeMapper baseMapper; + + /** + * 查询检测类型 + * + * @param typeId 主键 + * @return 检测类型 + */ + @Override + public QcInspectionTypeVo queryById(Long typeId){ + return baseMapper.selectVoById(typeId); + } + + /** + * 分页查询检测类型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测类型分页列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionTypeBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的检测类型列表 + * + * @param bo 查询条件 + * @return 检测类型列表 + */ + @Override + public List queryList(QcInspectionTypeBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(QcInspectionTypeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(QcInspectionType.class) + .selectAll(QcInspectionType.class) + .eq(bo.getTypeId() != null, QcInspectionType::getTypeId, bo.getTypeId()) + .eq(StringUtils.isNotBlank(bo.getTypeCode()), QcInspectionType::getTypeCode, bo.getTypeCode()) + .like(StringUtils.isNotBlank(bo.getTypeName()), QcInspectionType::getTypeName, bo.getTypeName()) + .eq(bo.getQcInspectionType() != null, QcInspectionType::getQcInspectionType, bo.getQcInspectionType()) + .eq(bo.getCreateMethod() != null, QcInspectionType::getCreateMethod, bo.getCreateMethod()) + .orderByDesc(QcInspectionType::getCreateTime); + return lqw; + } + + /** + * 新增检测类型 + * + * @param bo 检测类型 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(QcInspectionTypeBo bo) { + QcInspectionType add = MapstructUtils.convert(bo, QcInspectionType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTypeId(add.getTypeId()); + } + return flag; + } + + /** + * 修改检测类型 + * + * @param bo 检测类型 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(QcInspectionTypeBo bo) { + QcInspectionType update = MapstructUtils.convert(bo, QcInspectionType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcInspectionType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除检测类型信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcTemplateItemServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcTemplateItemServiceImpl.java new file mode 100644 index 0000000..94b7cc5 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcTemplateItemServiceImpl.java @@ -0,0 +1,162 @@ +package org.dromara.qms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.qms.domain.QcInspectionItem; +import org.dromara.qms.domain.QcInspectionTemplate; +import org.dromara.qms.domain.QcInspectionType; +import org.springframework.stereotype.Service; +import org.dromara.qms.domain.bo.QcTemplateItemBo; +import org.dromara.qms.domain.vo.QcTemplateItemVo; +import org.dromara.qms.domain.QcTemplateItem; +import org.dromara.qms.mapper.QcTemplateItemMapper; +import org.dromara.qms.service.IQcTemplateItemService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检测模板子表Service业务层处理 + * + * @author Yinq + * @date 2025-07-14 + */ +@RequiredArgsConstructor +@Service +public class QcTemplateItemServiceImpl implements IQcTemplateItemService { + + private final QcTemplateItemMapper baseMapper; + + /** + * 查询检测模板子表 + * + * @param templateItemId 主键 + * @return 检测模板子表 + */ + @Override + public QcTemplateItemVo queryById(Long templateItemId){ + return baseMapper.selectVoById(templateItemId); + } + + /** + * 分页查询检测模板子表列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测模板子表分页列表 + */ + @Override + public TableDataInfo queryPageList(QcTemplateItemBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的检测模板子表列表 + * + * @param bo 查询条件 + * @return 检测模板子表列表 + */ + @Override + public List queryList(QcTemplateItemBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(QcTemplateItemBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(QcTemplateItem.class) + .selectAll(QcTemplateItem.class) + + //关联模板主表 + .select(QcInspectionTemplate::getTemplateName, QcInspectionTemplate::getTemplateCode) + .leftJoin(QcInspectionTemplate.class, QcInspectionTemplate::getTemplateId, QcTemplateItem::getTemplateId) + + //关联检测项定义表 + // .select(QcInspectionItem::getItemName, QcInspectionItem::getItemCode) + .selectAs(QcInspectionItem::getItemName, QcTemplateItem::getInspectionItemName) + .selectAs(QcInspectionItem::getItemCode, QcTemplateItem::getInspectionItemCode) + .leftJoin(QcInspectionItem.class, QcInspectionItem::getItemId, QcTemplateItem::getItemId) + + .eq(bo.getTemplateItemId() != null, QcTemplateItem::getTemplateItemId, bo.getTemplateItemId()) + .eq(bo.getTemplateId() != null, QcTemplateItem::getTemplateId, bo.getTemplateId()) + .eq(bo.getItemId() != null, QcTemplateItem::getItemId, bo.getItemId()) + .eq(StringUtils.isNotBlank(bo.getItemCode()), QcTemplateItem::getItemCode, bo.getItemCode()) + .like(StringUtils.isNotBlank(bo.getItemName()), QcTemplateItem::getItemName, bo.getItemName()) + .eq(StringUtils.isNotBlank(bo.getInspectionPosition()), QcTemplateItem::getInspectionPosition, bo.getInspectionPosition()) + .eq(StringUtils.isNotBlank(bo.getCategoryName()), QcTemplateItem::getCategoryName, bo.getCategoryName()) + .eq(bo.getInspectionType() != null, QcTemplateItem::getInspectionType, bo.getInspectionType()) + .eq(bo.getDetectType() != null, QcTemplateItem::getDetectType, bo.getDetectType()) + .eq(bo.getControlType() != null, QcTemplateItem::getControlType, bo.getControlType()) + .eq(bo.getStandardValue() != null, QcTemplateItem::getStandardValue, bo.getStandardValue()) + .eq(bo.getUpperLimit() != null, QcTemplateItem::getUpperLimit, bo.getUpperLimit()) + .eq(bo.getLowerLimit() != null, QcTemplateItem::getLowerLimit, bo.getLowerLimit()) + .eq(StringUtils.isNotBlank(bo.getSpecName()), QcTemplateItem::getSpecName, bo.getSpecName()) + .eq(bo.getSpecUpper() != null, QcTemplateItem::getSpecUpper, bo.getSpecUpper()) + .eq(bo.getSpecLower() != null, QcTemplateItem::getSpecLower, bo.getSpecLower()) + .eq(StringUtils.isNotBlank(bo.getDescription()), QcTemplateItem::getDescription, bo.getDescription()) + .orderByDesc(QcTemplateItem::getCreateTime); + return lqw; + } + + /** + * 新增检测模板子表 + * + * @param bo 检测模板子表 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(QcTemplateItemBo bo) { + QcTemplateItem add = MapstructUtils.convert(bo, QcTemplateItem.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTemplateItemId(add.getTemplateItemId()); + } + return flag; + } + + /** + * 修改检测模板子表 + * + * @param bo 检测模板子表 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(QcTemplateItemBo bo) { + QcTemplateItem update = MapstructUtils.convert(bo, QcTemplateItem.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QcTemplateItem entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除检测模板子表信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/QSM.SQL b/ruoyi-modules/hwmom-qms/src/main/resources/QSM.SQL index 0470331..444e48f 100644 --- a/ruoyi-modules/hwmom-qms/src/main/resources/QSM.SQL +++ b/ruoyi-modules/hwmom-qms/src/main/resources/QSM.SQL @@ -21,10 +21,10 @@ CREATE TABLE qc_grade_info ( attr3 VARCHAR(255) -- 预留字段3 ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'存储产品各工序的品级定义信息，如合格、不良品、废品等', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'存储产品各工序的品级定义信息，如合格、不良品、废品等', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_grade_info'; -- 为品级信息表字段添加中文备注 @@ -71,10 +71,10 @@ CREATE TABLE qc_defect_detail ( remark VARCHAR(255) -- 备注 ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'存储产品质检中各类病疵的详细信息，包括病疵代号、名称、关联工序等，用于质检时记录问题明细', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'存储产品质检中各类病疵的详细信息，包括病疵代号、名称、关联工序等，用于质检时记录问题明细', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_defect_detail'; -- 为病疵信息表字段添加中文备注 @@ -112,10 +112,10 @@ CREATE TABLE qc_inspection_type ( update_time DATETIME -- 修改时间 ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'定义质检的类型信息，包括检测类型名称、编码、检测单类型及任务创建方式，用于关联检测模板和触发质检任务', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'定义质检的类型信息，包括检测类型名称、编码、检测单类型及任务创建方式，用于关联检测模板和触发质检任务', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_type'; -- 为检测类型表字段添加中文备注 @@ -145,10 +145,10 @@ CREATE TABLE qc_inspection_item_category ( FOREIGN KEY (inspection_type) REFERENCES qc_inspection_type(inspection_type) ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'定义检测项的分类信息，如外观质检、尺寸质检等，关联检测类型表的检测单类型，用于组织检测项', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'定义检测项的分类信息，如外观质检、尺寸质检等，关联检测类型表的检测单类型，用于组织检测项', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_item_category'; -- 为检测项类别表字段添加中文备注 @@ -178,8 +178,8 @@ CREATE TABLE qc_inspection_item ( upper_limit DECIMAL(18,2), -- 控制上限 lower_limit DECIMAL(18,2), -- 控制下限 spec_name VARCHAR(50), -- 规格名称 - spec_upper VARCHAR(50), -- 规格上线 - spec_lower VARCHAR(50), -- 规格下线 + spec_upper VARCHAR(50), -- 规格上限 + spec_lower VARCHAR(50), -- 规格下限 description VARCHAR(500), -- 检测项说明 option_code VARCHAR(30), -- 检测选项编码 option_name VARCHAR(50), -- 检测选项名称 @@ -187,10 +187,10 @@ CREATE TABLE qc_inspection_item ( FOREIGN KEY (category_id) REFERENCES qc_inspection_item_category(category_id) ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'定义具体的检测项目信息，包括检测项名称、编码、方法、上下限等，关联检测项类别，用于检测模板和质检结果记录', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'定义具体的检测项目信息，包括检测项名称、编码、方法、上下限等，关联检测项类别，用于检测模板和质检结果记录', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_item'; -- 为检测项定义表字段添加中文备注 @@ -207,8 +207,8 @@ EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'标准值' , @leve EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'控制上限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'upper_limit'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'控制下限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'lower_limit'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格名称' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_name'; -EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格上线' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_upper'; -EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格下线' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_lower'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格上限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_upper'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格下限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_lower'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测项说明' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'description'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测选项编码' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'option_code'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测选项名称' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'option_name'; @@ -237,10 +237,10 @@ CREATE TABLE qc_inspection_template ( FOREIGN KEY (type_id) REFERENCES qc_inspection_type(type_id) ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'存储质检模板的基本信息，包括模板名称、关联物料、检测类型、工序等，用于生成质检任务的标准模板', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'存储质检模板的基本信息，包括模板名称、关联物料、检测类型、工序等，用于生成质检任务的标准模板', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_template'; -- 为检测模板主表字段添加中文备注 @@ -279,17 +279,17 @@ CREATE TABLE qc_template_item ( upper_limit DECIMAL(18,2), -- 控制上限 lower_limit DECIMAL(18,2), -- 控制下限 spec_name VARCHAR(50), -- 规格名称 - spec_upper VARCHAR(50), -- 规格上线 - spec_lower VARCHAR(50), -- 规格下线 + spec_upper VARCHAR(50), -- 规格上限 + spec_lower VARCHAR(50), -- 规格下限 description VARCHAR(500), -- 检测项说明 FOREIGN KEY (template_id) REFERENCES qc_inspection_template(template_id), FOREIGN KEY (item_id) REFERENCES qc_inspection_item(item_id) ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'存储质检模板关联的具体检测项明细，包括检测项名称、上下限、检测方式等，与模板主表和检测项定义表关联', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'存储质检模板关联的具体检测项明细，包括检测项名称、上下限、检测方式等，与模板主表和检测项定义表关联', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_template_item'; -- 为检测模板子表字段添加中文备注 @@ -307,8 +307,8 @@ EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'标准值' , @leve EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'控制上限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_template_item',@level2type=N'COLUMN',@level2name=N'upper_limit'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'控制下限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_template_item',@level2type=N'COLUMN',@level2name=N'lower_limit'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格名称' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_template_item',@level2type=N'COLUMN',@level2name=N'spec_name'; -EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格上线' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_template_item',@level2type=N'COLUMN',@level2name=N'spec_upper'; -EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格下线' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_template_item',@level2type=N'COLUMN',@level2name=N'spec_lower'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格上限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_template_item',@level2type=N'COLUMN',@level2name=N'spec_upper'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格下限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_template_item',@level2type=N'COLUMN',@level2name=N'spec_lower'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测项说明' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_template_item',@level2type=N'COLUMN',@level2name=N'description'; @@ -338,10 +338,10 @@ CREATE TABLE qc_inspection_main ( supplier_name VARCHAR(255) -- 供应商名称 ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'存储质检任务的整体信息，包括检测单号、关联物料、质检数量、合格数、不合格数及单据状态等，作为质检结果的主表', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'存储质检任务的整体信息，包括检测单号、关联物料、质检数量、合格数、不合格数及单据状态等，作为质检结果的主表', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_main'; -- 为质检主表字段添加中文备注 @@ -382,10 +382,10 @@ CREATE TABLE qc_inspection_result ( FOREIGN KEY (item_id) REFERENCES qc_inspection_item(item_id) ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'存储每个检测项的具体质检结果，包括检测结果、定量检测值、定性不合格明细等，关联质检主表和检测项定义表', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'存储每个检测项的具体质检结果，包括检测结果、定量检测值、定性不合格明细等，关联质检主表和检测项定义表', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_result'; -- 为质检结果子表字段添加中文备注 @@ -417,10 +417,10 @@ CREATE TABLE qc_unqualified_review ( FOREIGN KEY (inspection_id) REFERENCES qc_inspection_main(inspection_id) ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'存储不合格品的待评审信息，包括不合格检测单号、关联质检任务、检测类型及评审结果，用于不合格品的处置流程', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'存储不合格品的待评审信息，包括不合格检测单号、关联质检任务、检测类型及评审结果，用于不合格品的处置流程', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_unqualified_review'; -- 为不合格品待评审表字段添加中文备注 @@ -449,10 +449,10 @@ CREATE TABLE qc_unqualified_record ( FOREIGN KEY (review_id) REFERENCES qc_unqualified_review(review_id) ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'存储不合格品的评审历史记录，包括评审时间、补充说明等，关联不合格品待评审表，用于追溯评审过程', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'存储不合格品的评审历史记录，包括评审时间、补充说明等，关联不合格品待评审表，用于追溯评审过程', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_unqualified_record'; -- 为不合格品评审记录表字段添加中文备注 diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionItemCategoryMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionItemCategoryMapper.xml new file mode 100644 index 0000000..6dea803 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionItemCategoryMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + select category_id, tenant_id, category_code, category_name, type_id, description, create_by, create_dept, create_time, update_by, update_time, del_flag + from qc_inspection_item_category + + + + + + + diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionItemMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionItemMapper.xml new file mode 100644 index 0000000..4d4d587 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionItemMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select item_id, tenant_id, item_code, item_name, inspection_position, category_id, inspection_type, method, detect_type, control_type, standard_value, upper_limit, lower_limit, spec_name, spec_upper, spec_lower, description, option_code, option_name, is_default, create_by, create_dept, create_time, update_by, update_time, del_flag + from qc_inspection_item + + + + + + + diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml new file mode 100644 index 0000000..6e6c755 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select inspection_id, tenant_id, inspection_no, material_code, material_type, material_name, process_name, station_name, inspection_qty, qualified_qty, unqualified_qty, result, workshop, type_id, status, inspector, shift, team, inspection_time, production_order, batch_no, barcode, supplier_name, remark, create_dept, create_by, create_time, update_by, update_time, del_flag + from qc_inspection_main + + + + + + + diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionResultMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionResultMapper.xml new file mode 100644 index 0000000..a6e1b3d --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionResultMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + select result_id, tenant_id, inspection_id, item_id, detect_result, detect_value, spec_inspection, problem_detail, create_dept, create_by, create_time, update_by, update_time, del_flag + from qc_inspection_result + + + + + + + diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionTemplateMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionTemplateMapper.xml new file mode 100644 index 0000000..6fab796 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionTemplateMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select template_id, tenant_id, template_code, template_name, material_code, material_name, type_id, station_code, station_name, process_code, process_name, supplier_code, supplier_name, description, create_dept, create_by, create_time, update_by, update_time, del_flag + from qc_inspection_template + + + + + + + diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionTypeMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionTypeMapper.xml new file mode 100644 index 0000000..0ea0409 --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionTypeMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + select type_id, tenant_id, type_code, type_name, qc_inspection_type, create_method, create_by, create_dept, create_time, update_by, update_time, del_flag + from qc_inspection_type + + + + + + + diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcTemplateItemMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcTemplateItemMapper.xml new file mode 100644 index 0000000..00ed84b --- /dev/null +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcTemplateItemMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select template_item_id, tenant_id, template_id, item_id, item_code, item_name, inspection_position, category_name, inspection_type, detect_type, control_type, standard_value, upper_limit, lower_limit, spec_name, spec_upper, spec_lower, description, create_dept, create_by, create_time, update_by, update_time, del_flag + from qc_template_item + + + + + + + diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/qms新建表结构.sql b/ruoyi-modules/hwmom-qms/src/main/resources/qms新建表结构.sql index 0d64150..528e652 100644 --- a/ruoyi-modules/hwmom-qms/src/main/resources/qms新建表结构.sql +++ b/ruoyi-modules/hwmom-qms/src/main/resources/qms新建表结构.sql @@ -6,6 +6,9 @@ IF OBJECT_ID(N'dbo.qc_inspection_template', N'U') IS NOT NULL DROP TABLE dbo.qc_ IF OBJECT_ID(N'dbo.qc_template_item', N'U') IS NOT NULL DROP TABLE dbo.qc_template_item; IF OBJECT_ID(N'dbo.qc_inspection_main', N'U') IS NOT NULL DROP TABLE dbo.qc_inspection_main; IF OBJECT_ID(N'dbo.qc_inspection_result', N'U') IS NOT NULL DROP TABLE dbo.qc_inspection_result; +IF OBJECT_ID(N'dbo.qc_unqualified_review', N'U') IS NOT NULL DROP TABLE dbo.qc_unqualified_review; +IF OBJECT_ID(N'dbo.qc_unqualified_record', N'U') IS NOT NULL DROP TABLE dbo.qc_unqualified_record; + -- 3. 检测类型表（定义质检的类型，如首检、过程检等） -- 其他表绑定检测类型主键来查询编码、名称、类型（字典，通过字典键值来进行一定的逻辑操作） @@ -24,10 +27,10 @@ CREATE TABLE qc_inspection_type ( del_flag CHAR(1) DEFAULT '0' -- 是否删除（0表示存在，2表示删除 ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'检测类型表，其他表绑定检测类型主键来查询编码、名称、类型（字典，通过字典键值来进行一定的逻辑操作）', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'检测类型表，其他表绑定检测类型主键来查询编码、名称、类型（字典，通过字典键值来进行一定的逻辑操作）', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_type'; -- 为检测类型表字段添加中文备注 @@ -61,10 +64,10 @@ CREATE TABLE qc_inspection_item_category ( del_flag CHAR(1) DEFAULT '0' -- 是否删除（0表示存在，2表示删除 ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'检测项类别表', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'检测项类别表', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_item_category'; -- 为检测项类别表字段添加中文备注 @@ -94,12 +97,12 @@ CREATE TABLE qc_inspection_item ( method char(1), -- 检测方法（0目视,1千分尺） detect_type char(1) , -- 检测方式（0定性,1定量） control_type char(1), -- 控制类型（0手动输入，1自动输入） - standard_value DECIMAL(18,2), -- 标准值 + standard_value DECIMAL(18,2), -- 标准值 upper_limit DECIMAL(18,2), -- 控制上限 lower_limit DECIMAL(18,2), -- 控制下限 spec_name VARCHAR(50), -- 规格名称 - spec_upper DECIMAL(18,2), -- 规格上线 - spec_lower DECIMAL(18,2), -- 规格下线 + spec_upper DECIMAL(18,2), -- 规格上限 + spec_lower DECIMAL(18,2), -- 规格下限 description VARCHAR(500), -- 检测项说明 option_code VARCHAR(30), -- 检测选项编码 option_name VARCHAR(50), -- 检测选项名称 @@ -112,10 +115,10 @@ CREATE TABLE qc_inspection_item ( del_flag CHAR(1) DEFAULT '0' -- 是否删除（0表示存在，2表示删除 ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', +EXEC sp_addextendedproperty + @name = N'MS_Description', @value = N'检测项定义表', - @level0type = N'SCHEMA', @level0name = N'dbo', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_item'; -- 为检测项定义表字段添加中文备注 @@ -133,8 +136,8 @@ EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'标准值' , @leve EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'控制上限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'upper_limit'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'控制下限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'lower_limit'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格名称' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_name'; -EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格上线' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_upper'; -EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格下线' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_lower'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格上限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_upper'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'规格下限' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'spec_lower'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测项说明' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'description'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测选项编码' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'option_code'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测选项名称' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_item',@level2type=N'COLUMN',@level2name=N'option_name'; @@ -170,10 +173,10 @@ CREATE TABLE qc_inspection_template ( del_flag CHAR(1) DEFAULT '0', -- 是否删除（0表示存在，2表示删除） ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'检测模板主表', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'检测模板主表', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_template'; -- 为检测模板主表字段添加中文备注 @@ -227,10 +230,10 @@ CREATE TABLE qc_template_item ( del_flag CHAR(1) DEFAULT '0', -- 是否删除（0表示存在，2表示删除） ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'检测模板子表', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'检测模板子表', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_template_item'; -- 为检测模板子表字段添加中文备注 @@ -294,10 +297,10 @@ CREATE TABLE qc_inspection_main ( del_flag CHAR(1) DEFAULT '0', -- 是否删除（0表示存在，2表示删除） ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'质检主表', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'质检主表', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_main'; -- 为质检主表字段添加中文备注 @@ -352,15 +355,15 @@ CREATE TABLE qc_inspection_result ( ); -- 添加表备注 -EXEC sp_addextendedproperty - @name = N'MS_Description', - @value = N'质检结果子表', - @level0type = N'SCHEMA', @level0name = N'dbo', +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'质检结果子表', + @level0type = N'SCHEMA', @level0name = N'dbo', @level1type = N'TABLE', @level1name = N'qc_inspection_result'; -- 为质检结果子表字段添加中文备注 EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'结果主键' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'result_id'; -EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'租户号' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'tenant_id'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'租户号' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'tenant_id'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'关联质检主表ID' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'inspection_id'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'关联检测项ID' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'item_id'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测结果（0合格，1不合格）' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'detect_result'; @@ -372,4 +375,93 @@ EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @l EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'update_by'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'update_time'; EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'是否删除（0表示存在，2表示删除）' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'del_flag'; -EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建部门' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'create_dept'; \ No newline at end of file +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建部门' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'create_dept'; + + +-- 10. 不合格品待评审表（存储不合格品的待评审信息，用于评审处置） +CREATE TABLE qc_unqualified_review ( + review_id BIGINT PRIMARY KEY, -- 评审主键 + tenant_id VARCHAR(32), -- 租户号 + unqualified_no VARCHAR(50) NOT NULL, -- 不合格检测单号 + inspection_id BIGINT NOT NULL, -- 关联质检主表ID + type_id BIGINT NOT NULL, -- 检测类型ID + work_order VARCHAR(50), -- 派工单号 + process_code VARCHAR(50), -- 工序编码 + process_name VARCHAR(255), -- 工序名称 + batch_no VARCHAR(50), -- 批次号 + material_name VARCHAR(255), -- 物料名称 + material_code VARCHAR(50), -- 物料编码 + inspector_result VARCHAR(10), -- 质检员检测结果 + review_result char(1), -- 评审结果（0报废/1返工/2退货） + reviewer VARCHAR(32), -- 评审人 + review_time DATETIME, -- 评审时间 + create_dept BIGINT, -- 创建部门 + create_by BIGINT, -- 创建人 + create_time DATETIME, -- 创建时间 + update_by BIGINT, -- 修改人 + update_time DATETIME, -- 修改时间 + del_flag CHAR(1) DEFAULT '0', -- 是否删除（0表示存在，2表示删除） +); +-- 添加表备注 +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'不合格品待评审表', + @level0type = N'SCHEMA', @level0name = N'dbo', + @level1type = N'TABLE', @level1name = N'qc_unqualified_review'; + +-- 为不合格品待评审表字段添加中文备注 +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'评审主键' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'review_id'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'租户号' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'tenant_id'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'不合格检测单号' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'unqualified_no'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'关联质检主表ID' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'inspection_id'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'检测类型ID' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level2type=N'COLUMN',@level2name=N'type_id'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'派工单号' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'work_order'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'工序编码' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'process_code'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'工序名称' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'process_name'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'批次号' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'batch_no'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'物料名称' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'material_name'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'物料编码' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'material_code'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'质检员检测结果' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'inspector_result'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'评审结果（0报废/1返工/2退货）' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level2type=N'COLUMN',@level2name=N'review_result'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'评审人' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'reviewer'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'评审时间' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_review',@level2type=N'COLUMN',@level2name=N'review_time'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'create_by'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'create_time'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'update_by'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'update_time'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'是否删除（0表示存在，2表示删除）' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'del_flag'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建部门' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_inspection_result',@level2type=N'COLUMN',@level2name=N'create_dept'; + + +-- 11. 不合格品评审记录表（存储不合格品的评审历史记录） +CREATE TABLE qc_unqualified_record ( + record_id BIGINT PRIMARY KEY, -- 记录主键 + tenant_id VARCHAR(32), -- 租户号 + review_id BIGINT NOT NULL, -- 关联待评审表ID + remark VARCHAR(500), -- 备注 + create_dept BIGINT, -- 创建部门 + create_by BIGINT, -- 创建人 + create_time DATETIME, -- 创建时间 + update_by BIGINT, -- 修改人 + update_time DATETIME, -- 修改时间 + del_flag CHAR(1) DEFAULT '0', -- 是否删除（0表示存在，2表示删除） +); +-- 添加表备注 +EXEC sp_addextendedproperty + @name = N'MS_Description', + @value = N'不合格品评审记录表', + @level0type = N'SCHEMA', @level0name = N'dbo', + @level1type = N'TABLE', @level1name = N'qc_unqualified_record'; + +-- 为不合格品评审记录表字段添加中文备注 +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'记录主键' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'record_id'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'租户号' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'tenant_id'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'关联待评审表ID' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'review_id'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'备注' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'remark'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建人' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'create_by'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建时间' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'create_time'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'update_by'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'update_time'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'是否删除（0表示存在，2表示删除）' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'del_flag'; +EXEC sp_addextendedproperty @name=N'MS_Description', @value=N'创建部门' , @level0type=N'SCHEMA',@level0name=N'dbo',@level1type=N'TABLE',@level1name=N'qc_unqualified_record',@level2type=N'COLUMN',@level2name=N'create_dept'; +