From 63770ba4d6c76180ca426e98c7ec68fbdc77fe32 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 10:51:29 +0800 Subject: [PATCH 01/13] =?UTF-8?q?setBaseVOValue=20=E5=92=8C=20en=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E7=9A=84=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/mapper/en/EnBaseMapper.java | 2 +- .../desk/basic/pojo/vo/BaseEntityVO.java | 14 +- .../desk/basic/service/ExBaseService.java | 12 - .../desk/basic/service/en/EnBaseService.java | 12 + .../service/en/impl/EnBaseServiceImpl.java | 93 +++++ .../basic/service/impl/ExBaseServiceImpl.java | 17 - .../desk/quality/constant/AuditFileConst.java | 8 + .../quality/constant/ProReTemplateConst.java | 4 + .../controller/AuditFileController.java | 320 +++++++++--------- .../desk/quality/pojo/vo/ProReTemplateVO.java | 3 - .../quality/service/IAuditFileService.java | 5 +- .../service/IProReTemplateService.java | 3 +- .../service/impl/AuditFileServiceImpl.java | 55 +-- .../impl/ProReTemplateServiceImpl.java | 135 ++++---- 14 files changed, 403 insertions(+), 280 deletions(-) delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/EnBaseService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/impl/EnBaseServiceImpl.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java index 11811aa2..510a3c05 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java @@ -9,5 +9,5 @@ import org.springblade.core.mp.base.BaseEntity; * @param */ public interface EnBaseMapper extends BaseMapper { - + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java index e05c23a4..f0e0ba7a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java @@ -4,8 +4,10 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** - * todo: + * BaseEntity 共用字段对应VO. */ @Data @EqualsAndHashCode() @@ -32,10 +34,18 @@ public class BaseEntityVO { @Schema(description = "维护[用户]id") private Long keepUser = 0L; /** - * + * 维护[用户]-真名 */ @Schema(description = "维护[用户]-真名") private String keepUserRealName = "维护[用户]-真名"; + /** + * 维护时间 + */ + @Schema(description = "维护时间") + private Date keepTime; + /** + * 业务状态 名称 + */ @Schema(description = "业务状态 名称") private String statusName = "statusName"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java deleted file mode 100644 index 39570a64..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.springblade.desk.basic.service; - -import org.springblade.core.mp.base.BaseService; - -/** - * 扩展框架中的BaseService. - * - * @param - */ -public interface ExBaseService extends BaseService { - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/EnBaseService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/EnBaseService.java new file mode 100644 index 00000000..95362667 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/EnBaseService.java @@ -0,0 +1,12 @@ +package org.springblade.desk.basic.service.en; + +import org.springblade.core.mp.base.BaseService; + +/** + * Enhance BaseService. + * + * @param + */ +public interface EnBaseService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/impl/EnBaseServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/impl/EnBaseServiceImpl.java new file mode 100644 index 00000000..fe78bf6b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/impl/EnBaseServiceImpl.java @@ -0,0 +1,93 @@ +package org.springblade.desk.basic.service.en.impl; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.pojo.vo.BaseEntityVO; +import org.springblade.desk.basic.service.en.EnBaseService; +import org.springblade.desk.basic.util.IdUtil; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.ISysClient; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.Dept; +import org.springblade.system.pojo.entity.UserInfo; + +/** + * Enhance BaseServiceImpl. + * + * @param + * @param + */ +public class EnBaseServiceImpl, T extends BaseEntity> + extends BaseServiceImpl implements EnBaseService { + + /** + * 构建BaseEntityVO + * + * @param userClient feign IUserClient + * @param dictClient feign ISysClient + * @param sysClient feign IDictClient + * @param be 不赋值可以传入null + * @param statusCode 不需要可以传入null + * @return BaseEntityVO + */ + public BaseEntityVO setBaseVOValue(IUserClient userClient, ISysClient sysClient, IDictClient dictClient, + BaseEntity be, String statusCode) { + if (be == null) { + return null; + } + BaseEntityVO bv = new BaseEntityVO(); + R rUICR = null; + R rUIUP = null; + R rDept = null; + // createUserRealName + if (IdUtil.isValid(be.getCreateUser())) { + rUICR = userClient.userInfo(be.getCreateUser()); + if (rUICR != null && rUICR.isSuccess() && + rUICR.getData() != null && rUICR.getData().getUser() != null) { + bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); + } + } + // updateUserRealName + if (IdUtil.isValid(be.getUpdateUser())) { + rUIUP = userClient.userInfo(be.getUpdateUser()); + if (rUIUP != null && rUIUP.isSuccess() && + rUIUP.getData() != null && rUIUP.getData().getUser() != null) { + bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); + } + } + // createDeptName + if (IdUtil.isValid(be.getCreateDept())) { + rDept = sysClient.getDept(be.getCreateDept()); + if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { + bv.setCreateDeptName(rDept.getData().getDeptName()); + } + } + // setKeepUser setKeepUserRealName setKeepTime + if (be.getCreateTime() != null && be.getUpdateTime() != null) { + if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚 + bv.setKeepUser(be.getUpdateUser()); + bv.setKeepUserRealName(bv.getUpdateUserRealName()); + bv.setKeepTime(be.getUpdateTime()); + } else { // 等于或更早 + bv.setKeepUser(be.getCreateUser()); + bv.setKeepUserRealName(bv.getCreateUserRealName()); + bv.setKeepTime(be.getCreateTime()); + } + } else if (be.getCreateTime() != null && be.getUpdateTime() == null) { + bv.setKeepUser(be.getCreateUser()); + bv.setKeepUserRealName(bv.getCreateUserRealName()); + bv.setKeepTime(be.getCreateTime()); + } + // statusName + if (StringUtils.isNotBlank(statusCode)) { + R rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); + if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { + bv.setStatusName(rStatusDic.getData()); + } + } + return bv; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java deleted file mode 100644 index 57d9b36c..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.springblade.desk.basic.service.impl; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.desk.basic.service.ExBaseService; - -/** - * 扩展框架中的BaseServiceImpl. - * - * @param - * @param - */ -public class ExBaseServiceImpl, T extends BaseEntity> - extends BaseServiceImpl implements ExBaseService { - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java new file mode 100644 index 00000000..fb6295f9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java @@ -0,0 +1,8 @@ +package org.springblade.desk.quality.constant; + +public interface AuditFileConst { + + Integer S_NORMAL = 1; + + Integer S_ABANDON = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java index baf3f7cb..69a19725 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java @@ -15,6 +15,10 @@ public interface ProReTemplateConst { Integer STATUS_NO = 3; + Integer APPROVAL_STATUS_1 = 1; + Integer APPROVAL_STATUS_2 = 2; + + Integer ONLINE = 1; Integer OFFLINE = 0; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index 736fadab..96c258ef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -40,6 +40,7 @@ import java.util.stream.Collectors; /** * [工艺文件] 控制器 + * mes v1: * * @author Tom Shuo * @since 2025-12-22 @@ -54,184 +55,191 @@ import java.util.stream.Collectors; public class AuditFileController extends BladeController { @Resource - private IAuditFileService service; - - /** - * [工艺文件] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入AuditFile Obj") - public R detail(AuditFile auditFile) { - QueryWrapper qw = Condition.getQueryWrapper(auditFile); - AuditFile detail = service.getOne(qw); - AuditFileVO detailVO = AuditFileWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [工艺文件] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入AuditFile Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map auditFile, - Query query) { + private IAuditFileService service; + + /** + * [工艺文件] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入AuditFile Obj") + public R detail(AuditFile auditFile) { + QueryWrapper qw = Condition.getQueryWrapper(auditFile); + AuditFile detail = service.getOne(qw); + AuditFileVO detailVO = AuditFileWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工艺文件] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入AuditFile Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map auditFile, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = AuditFileWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [工艺文件] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入AuditFile Obj") - public R> page(AuditFileVO auditFile, Query query) { - IPage pagesVO = service.selectAuditFilePage( - Condition.getPage(query), auditFile - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = AuditFileWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [工艺文件] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入AuditFile Obj") + public R> page(AuditFileVO auditFile, Query query) { + IPage pagesVO = service.selectAuditFilePage( + Condition.getPage(query), auditFile + ); + return R.data(pagesVO); + } + + /** * [工艺文件] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = AuditFileWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = AuditFileWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工艺文件] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入AuditFile Obj") + public R save(@Valid @RequestBody AuditFile addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [工艺文件] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入AuditFile Obj") - public R save(@Valid @RequestBody AuditFile addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [工艺文件] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入AuditFile List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [工艺文件] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入AuditFile Obj") - public R update(@Valid @RequestBody AuditFile updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入AuditFile List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [工艺文件] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入AuditFile Obj") + public R update(@Valid @RequestBody AuditFile updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [工艺文件] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入AuditFile List") + @Operation(summary = "修改批量", description = "传入AuditFile List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [工艺文件] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入AuditFile Obj") - public R submit(@Valid @RequestBody AuditFile mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [工艺文件] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入AuditFile Obj") + public R submit(@Valid @RequestBody AuditFile mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [工艺文件] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入AuditFile List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [工艺文件] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [工艺文件] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入AuditFile") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map auditFile, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(AuditFile::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(AuditFileEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportAuditFile(qw); - ExcelUtil.export(response, "[工艺文件]数据" + DateUtil.time(), - "[工艺文件]数据表", list, AuditFileExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入AuditFile List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [工艺文件] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [工艺文件] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入AuditFile") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map auditFile, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AuditFile::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(AuditFileEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportAuditFile(qw); + ExcelUtil.export(response, "[工艺文件]数据" + DateUtil.time(), + "[工艺文件]数据表", list, AuditFileExcel.class); + } + + /** * [工艺文件] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [工艺文件] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, AuditFile.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [工艺文件] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, AuditFile.class + ); + return R.status(service.saveBatch(importList)); + } + + @PostMapping("/upgradeVer") + @ApiOperationSupport(order = 50) + @Operation(summary = "升版", description = "传入AuditFile Obj") + public R upgradeVer(@Valid @RequestBody AuditFile find) { + return service.upgradeVer(find); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java index 1fbc8607..f0e2d93e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java @@ -23,9 +23,6 @@ import java.util.List; public class ProReTemplateVO extends ProReTemplate { @Serial private static final long serialVersionUID = 1L; - /** - * todo: - */ @Schema(description = "base信息字段") private BaseEntityVO base; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java index 2bf11cff..bba72eb9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.vo.AuditFileVO; @@ -19,7 +20,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-22 */ -public interface IAuditFileService extends BaseService { +public interface IAuditFileService extends EnBaseService { /** * 自定义分页 * @@ -43,5 +44,5 @@ public interface IAuditFileService extends BaseService { */ void setVOValue(AuditFileVO vo); - R upgradeVer(Long id); + R upgradeVer(AuditFile find); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java index 11cfef4c..89dc56ac 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Parameter; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.pojo.entity.ProReTemplate; import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; @@ -22,7 +23,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-22 */ -public interface IProReTemplateService extends BaseService { +public interface IProReTemplateService extends EnBaseService { /** * 自定义分页 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index a4e32882..de5d0928 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; @@ -12,11 +13,15 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; +import org.springblade.desk.quality.constant.AuditFileConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; @@ -33,32 +38,44 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class AuditFileServiceImpl extends BaseServiceImpl implements IAuditFileService { +public class AuditFileServiceImpl extends EnBaseServiceImpl + implements IAuditFileService { @Resource private IUserClient userClient; + @Resource + private ISysClient sysClient; + @Resource + private IDictClient dictClient; - @Override - public IPage selectAuditFilePage(IPage page, AuditFileVO auditFile) { - return page.setRecords(baseMapper.selectAuditFilePage(page, auditFile)); - } + @Override + public IPage selectAuditFilePage(IPage page, AuditFileVO auditFile) { + return page.setRecords(baseMapper.selectAuditFilePage(page, auditFile)); + } - @Override - public List exportAuditFile(Wrapper queryWrapper) { - List auditFileList = baseMapper.exportAuditFile(queryWrapper); - //auditFileList.forEach(auditFile -> { - // auditFile.setTypeName(DictCache.getValue(DictEnum.YES_NO, AuditFile.getType())); - //}); - return auditFileList; - } + @Override + public List exportAuditFile(Wrapper queryWrapper) { + List auditFileList = baseMapper.exportAuditFile(queryWrapper); + //auditFileList.forEach(auditFile -> { + // auditFile.setTypeName(DictCache.getValue(DictEnum.YES_NO, AuditFile.getType())); + //}); + return auditFileList; + } - @Override + @Override public void setVOValue(AuditFileVO vo) { - + vo.setBase(setBaseVOValue(userClient, sysClient, dictClient, vo, "AuditFile-Status")); } - @Override - public R upgradeVer(Long id) { - return null; - } + @Override + public R upgradeVer(AuditFile find) { + AuditFile create = new AuditFile(); + BeanUtil.copyProperties(find, create); + find.setStatus(AuditFileConst.S_ABANDON); + create.setStatus(AuditFileConst.S_NORMAL); + create.setId(null); + updateById(find); + save(create); + return R.success("升版成功"); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index 2d82f75d..407a7bb3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -16,6 +16,7 @@ import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.pojo.vo.BaseEntityVO; +import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.quality.constant.ProReTemplateConst; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.mapper.ProReTemplateMapper; @@ -35,8 +36,7 @@ import org.springblade.system.pojo.entity.User; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; -import java.util.Comparator; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -50,7 +50,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class ProReTemplateServiceImpl extends BaseServiceImpl +public class ProReTemplateServiceImpl extends EnBaseServiceImpl implements IProReTemplateService { @Resource @@ -80,75 +80,76 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl tankVOList = tankService.getListByTemplateId(vo.getId()); - if (tankVOList != null && !tankVOList.isEmpty()) { - // 根据插入序号 getInsertIndex 排序 生成新的list - tankVOList = tankVOList.stream() - .sorted(Comparator.comparingInt(ProReTemplateTankVO::getInsertIndex)) - .collect(Collectors.toList()); - vo.setPreserveSlotList(tankVOList); - for (ProReTemplateTankVO tankVO : vo.getPreserveSlotList()) { - List detailVOList = detailService.getListByTemplateTankId(tankVO.getId()); - tankVO.setChildrenList(detailVOList); - } + // 根据插入序号 getInsertIndex 排序 生成新的list todo: +// tankVOList = Optional.ofNullable(tankVOList) +// .orElse(Collections.emptyList()) +// .stream() +// .filter(Objects::nonNull) +// .sorted(Comparator.comparingInt(ProReTemplateTankVO::getInsertIndex)) +// .collect(Collectors.toList()); + vo.setPreserveSlotList(tankVOList); + for (ProReTemplateTankVO tankVO : vo.getPreserveSlotList()) { + List detailVOList = detailService.getListByTemplateTankId(tankVO.getId()); + tankVO.setChildrenList(detailVOList); } } - /** - * 构建BaseEntityVO - * - * @param be 不赋值可以传入null - * @param statusCode 不需要可以传null - * @return BaseEntityVO - */ - public BaseEntityVO setBaseVOValue(BaseEntity be, String statusCode) { - if (be == null) { - return null; - } - BaseEntityVO bv = new BaseEntityVO(); - R rUICR = null; - R rUIUP = null; - R rDept = null; - if (IdUtil.isValid(be.getCreateUser())) { - rUICR = userClient.userInfo(be.getCreateUser()); - if (rUICR != null && rUICR.isSuccess() && - rUICR.getData() != null && rUICR.getData().getUser() != null) { - bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); - } - - } - if (IdUtil.isValid(be.getUpdateUser())) { - rUIUP = userClient.userInfo(be.getUpdateUser()); - if (rUIUP != null && rUIUP.isSuccess() && - rUIUP.getData() != null && rUIUP.getData().getUser() != null) { - bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); - } - } - if (IdUtil.isValid(be.getCreateDept())) { - rDept = sysClient.getDept(be.getCreateDept()); - if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { - bv.setCreateDeptName(rDept.getData().getDeptName()); - } - } - if (be.getCreateTime() != null && be.getUpdateTime() != null) { - if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚 - bv.setKeepUser(be.getUpdateUser()); - bv.setKeepUserRealName(bv.getUpdateUserRealName()); - } else { // 等于或更早 - bv.setKeepUser(be.getCreateUser()); - bv.setKeepUserRealName(bv.getCreateUserRealName()); - } - } - if (StringUtils.isNotBlank(statusCode)) { - R rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); - if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { - bv.setStatusName(rStatusDic.getData()); - } - } - return bv; - } +// /** +// * 构建BaseEntityVO +// * +// * @param be 不赋值可以传入null +// * @param statusCode 不需要可以传入null +// * @return BaseEntityVO +// */ +// public BaseEntityVO setBaseVOValue(BaseEntity be, String statusCode) { +// if (be == null) { +// return null; +// } +// BaseEntityVO bv = new BaseEntityVO(); +// R rUICR = null; +// R rUIUP = null; +// R rDept = null; +// if (IdUtil.isValid(be.getCreateUser())) { +// rUICR = userClient.userInfo(be.getCreateUser()); +// if (rUICR != null && rUICR.isSuccess() && +// rUICR.getData() != null && rUICR.getData().getUser() != null) { +// bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); +// } +// +// } +// if (IdUtil.isValid(be.getUpdateUser())) { +// rUIUP = userClient.userInfo(be.getUpdateUser()); +// if (rUIUP != null && rUIUP.isSuccess() && +// rUIUP.getData() != null && rUIUP.getData().getUser() != null) { +// bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); +// } +// } +// if (IdUtil.isValid(be.getCreateDept())) { +// rDept = sysClient.getDept(be.getCreateDept()); +// if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { +// bv.setCreateDeptName(rDept.getData().getDeptName()); +// } +// } +// if (be.getCreateTime() != null && be.getUpdateTime() != null) { +// if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚 +// bv.setKeepUser(be.getUpdateUser()); +// bv.setKeepUserRealName(bv.getUpdateUserRealName()); +// } else { // 等于或更早 +// bv.setKeepUser(be.getCreateUser()); +// bv.setKeepUserRealName(bv.getCreateUserRealName()); +// } +// } +// if (StringUtils.isNotBlank(statusCode)) { +// R rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); +// if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { +// bv.setStatusName(rStatusDic.getData()); +// } +// } +// return bv; +// } @Override public R updateDetail(ProReTemplateVO vo) { From 0842981456cdf2c179cb9debba4e3833f93edc1b Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 10:52:01 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProReTemplateServiceImpl.java | 56 +------------------ 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index 407a7bb3..ca120e43 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -96,61 +96,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl rUICR = null; -// R rUIUP = null; -// R rDept = null; -// if (IdUtil.isValid(be.getCreateUser())) { -// rUICR = userClient.userInfo(be.getCreateUser()); -// if (rUICR != null && rUICR.isSuccess() && -// rUICR.getData() != null && rUICR.getData().getUser() != null) { -// bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); -// } -// -// } -// if (IdUtil.isValid(be.getUpdateUser())) { -// rUIUP = userClient.userInfo(be.getUpdateUser()); -// if (rUIUP != null && rUIUP.isSuccess() && -// rUIUP.getData() != null && rUIUP.getData().getUser() != null) { -// bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); -// } -// } -// if (IdUtil.isValid(be.getCreateDept())) { -// rDept = sysClient.getDept(be.getCreateDept()); -// if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { -// bv.setCreateDeptName(rDept.getData().getDeptName()); -// } -// } -// if (be.getCreateTime() != null && be.getUpdateTime() != null) { -// if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚 -// bv.setKeepUser(be.getUpdateUser()); -// bv.setKeepUserRealName(bv.getUpdateUserRealName()); -// } else { // 等于或更早 -// bv.setKeepUser(be.getCreateUser()); -// bv.setKeepUserRealName(bv.getCreateUserRealName()); -// } -// } -// if (StringUtils.isNotBlank(statusCode)) { -// R rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); -// if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { -// bv.setStatusName(rStatusDic.getData()); -// } -// } -// return bv; -// } - + @Override public R updateDetail(ProReTemplateVO vo) { for (ProReTemplateTankVO tankOne : vo.getPreserveSlotList()) { From 4bfe03cf15914aee880056e3b2a80b1fea8d8ba3 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 11:50:30 +0800 Subject: [PATCH 03/13] =?UTF-8?q?AuditFile=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/constant/BaseRequest.java | 43 ++++++++++++++----- .../desk/basic/pojo/vo/BaseEntityVO.java | 8 ++-- .../controller/AuditFileController.java | 14 ++++-- .../InspectionTemplateController.java | 12 +++--- .../LiquidTankTaskCopyController.java | 8 ++-- .../desk/quality/mapper/AuditFileMapper.java | 3 ++ .../desk/quality/mapper/AuditFileMapper.xml | 17 ++++++++ .../quality/pojo/request/AuditFileSearch.java | 14 ++++++ .../quality/service/IAuditFileService.java | 5 +++ .../service/impl/AuditFileServiceImpl.java | 8 ++++ .../impl/ProReTemplateServiceImpl.java | 2 +- 11 files changed, 104 insertions(+), 30 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java index b8e7a8e5..54168a1f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java @@ -2,15 +2,36 @@ package org.springblade.desk.basic.constant; public interface BaseRequest { - String CR_REAL_NAME = "createUserRealName"; - - String UP_REAL_NAME = "updateUserRealName"; - - String CR_TIME_START = "createTimeStart"; - - String CR_TIME_END = "createTimeEnd"; - - String UP_TIME_START = "updateTimeStart"; - - String UP_TIME_END = "updateTimeEnd"; + /** + * 创建[用户]-真名 + */ + String CREATE_USER_REAL_NAME = "createUserRealName"; + /** + * 创建[部门]-部门名 + */ + String CREATE_DEPT_NAME = "createDeptName"; + /** + * + */ + String CREATE_TIME_START = "createTimeStart"; + /** + * + */ + String CREATE_TIME_END = "createTimeEnd"; + /** + * 更新[用户]-真名 + */ + String UPDATE_USER_REAL_NAME = "updateUserRealName"; + /** + * + */ + String UPDATE_TIME_START = "updateTimeStart"; + /** + * + */ + String UPDATE_TIME_END = "updateTimeEnd"; + /** + * + */ + String KEEP_USER_REAL_NAME = "keepUserRealName"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java index f0e0ba7a..2739c5aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java @@ -17,7 +17,7 @@ public class BaseEntityVO { * 创建[用户]-真名 */ @Schema(description = "创建[用户]-真名") - private String createUserRealName = "创建[用户]-真名"; + private String createUserRealName = ""; /** * 创建[部门]-部门名 */ @@ -27,7 +27,7 @@ public class BaseEntityVO { * 更新[用户]-真名 */ @Schema(description = "更新用户-真名") - private String updateUserRealName = "更新用户-真名"; + private String updateUserRealName = ""; /** * 维护[用户]id */ @@ -37,7 +37,7 @@ public class BaseEntityVO { * 维护[用户]-真名 */ @Schema(description = "维护[用户]-真名") - private String keepUserRealName = "维护[用户]-真名"; + private String keepUserRealName = ""; /** * 维护时间 */ @@ -47,5 +47,5 @@ public class BaseEntityVO { * 业务状态 名称 */ @Schema(description = "业务状态 名称") - private String statusName = "statusName"; + private String statusName = ""; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index 96c258ef..af509792 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -24,9 +24,11 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.desk.quality.wrapper.AuditFileWrapper; @@ -77,10 +79,15 @@ public class AuditFileController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 20) @Operation(summary = "list分页", description = "传入AuditFile Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map auditFile, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); - IPage pages = service.page(Condition.getPage(query), qw); + QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); + AuditFileSearch search = new AuditFileSearch(); + // todo: Func 用法 + search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); + search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); + search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() @@ -89,7 +96,6 @@ public class AuditFileController extends BladeController { return R.data(pagesVO); } - /** * [工艺文件] page分页 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index e286263e..7e3e0404 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -103,18 +103,18 @@ public class InspectionTemplateController extends BladeController { if (map.containsKey("processNum")) { search.setProcessNum(Integer.parseInt((String) map.get("processNum"))); } - if (map.containsKey(BaseRequest.UP_REAL_NAME)) { - search.setUpdateUserRealName((String) map.get(BaseRequest.UP_REAL_NAME)); + if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) { + search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME)); } if (map.containsKey(InspectionTemplate.COL_CATEGORY)) { search.setCategory((String) map.get(InspectionTemplate.COL_CATEGORY)); } - if (map.containsKey(BaseRequest.UP_REAL_NAME)) { - search.setUpdateUserRealName((String) map.get(BaseRequest.UP_REAL_NAME)); + if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) { + search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME)); } // if (map.containsKey(BaseRequest.UP_TIME_START) && map.containsKey(BaseRequest.UP_TIME_END)) { - Date upStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.UP_TIME_START); - Date upEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.UP_TIME_END); + Date upStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.UPDATE_TIME_START); + Date upEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.UPDATE_TIME_END); search.setUpdateTimeStart(upStart); search.setUpdateTimeEnd(upEnd); // } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index 7d000f29..2e74e410 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -87,8 +87,8 @@ public class LiquidTankTaskCopyController extends BladeController { } ); // 范围日期 - Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CR_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CR_TIME_END); + Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class); // 完成的 qw.in(BaseCol.STATUS, Arrays.asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); @@ -119,8 +119,8 @@ public class LiquidTankTaskCopyController extends BladeController { } ); // 范围日期 - Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CR_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CR_TIME_END); + Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class); // 完成的 qw.in(BaseCol.STATUS, Arrays.asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java index a32d8129..0ab9c401 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; @@ -37,4 +38,6 @@ public interface AuditFileMapper extends BaseMapper { * @return List */ List exportAuditFile(@Param("ew") Wrapper queryWrapper); + + List listSearch(IPage page, @Param("q") AuditFileSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml index 6327b2f2..b481eb05 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml @@ -27,4 +27,21 @@ SELECT * FROM QA_AUDIT_FILE ${ew.customSqlSegment} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java new file mode 100644 index 00000000..8554b322 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.AuditFile; + +@Data +@EqualsAndHashCode(callSuper = true) +public class AuditFileSearch extends AuditFile { + + @Schema(description = "") + private String keepUserRealName; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java index bba72eb9..7ec3536f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java @@ -10,6 +10,9 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.entity.InspectionTemplate; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; +import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; @@ -44,5 +47,7 @@ public interface IAuditFileService extends EnBaseService { */ void setVOValue(AuditFileVO vo); + IPage listSearch(IPage page, AuditFileSearch search); + R upgradeVer(AuditFile find); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index de5d0928..1c0154f5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -18,6 +18,9 @@ import org.springblade.desk.quality.constant.AuditFileConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.entity.InspectionTemplate; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; +import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.system.feign.IDictClient; @@ -67,6 +70,11 @@ public class AuditFileServiceImpl extends EnBaseServiceImpl listSearch(IPage page, AuditFileSearch search) { + return page.setRecords(baseMapper.listSearch(page, search)); + } + @Override public R upgradeVer(AuditFile find) { AuditFile create = new AuditFile(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index ca120e43..b4a1c764 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -96,7 +96,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl Date: Sun, 4 Jan 2026 14:26:35 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0OEM=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/controller/OemController.java | 238 ++++++++++++++++++ .../desk/basic/excel/OemExcel.java | 117 +++++++++ .../desk/basic/mapper/OemMapper.java | 39 +++ .../desk/basic/mapper/OemMapper.xml | 30 +++ .../desk/basic/pojo/dto/OemDTO.java | 23 ++ .../desk/basic/pojo/entity/Oem.java | 155 ++++++++++++ .../springblade/desk/basic/pojo/vo/OemVO.java | 23 ++ .../desk/basic/service/IOemService.java | 43 ++++ .../basic/service/impl/OemServiceImpl.java | 60 +++++ .../desk/basic/wrapper/OemWrapper.java | 35 +++ 10 files changed, 763 insertions(+) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java new file mode 100644 index 00000000..bc1c113c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; + +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.wrapper.OemWrapper; +import org.springblade.desk.basic.service.IOemService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import java.util.Map; +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + +/** + * [外协厂家] 控制器 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@RestController +@RequestMapping("/Oem") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[外协厂家]", description = "[外协厂家]接口") +public class OemController extends BladeController { + + @Resource + private IOemService service; + + /** + * [外协厂家] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Oem Obj") + public R detail(Oem oem) { + QueryWrapper qw = Condition.getQueryWrapper(oem); + Oem detail = service.getOne(qw); + OemVO detailVO = OemWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [外协厂家] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Oem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map oem, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = OemWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [外协厂家] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Oem Obj") + public R> page(OemVO oem, Query query) { + IPage pagesVO = service.selectOemPage( + Condition.getPage(query), oem + ); + return R.data(pagesVO); + } + + /** + * [外协厂家] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = OemWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [外协厂家] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Oem Obj") + public R save(@Valid @RequestBody Oem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [外协厂家] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Oem List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [外协厂家] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Oem Obj") + public R update(@Valid @RequestBody Oem updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [外协厂家] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Oem List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [外协厂家] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Oem Obj") + public R submit(@Valid @RequestBody Oem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [外协厂家] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Oem List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [外协厂家] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [外协厂家] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Oem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map oem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Oem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportOem(qw); + ExcelUtil.export(response, "[外协厂家]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[外协厂家]数据表", list, OemExcel.class); + } + + /** + * [外协厂家] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [外协厂家] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Oem.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java new file mode 100644 index 00000000..df17ee99 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java @@ -0,0 +1,117 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import lombok.Data; + +import java.io.Serializable; +import org.springblade.core.mp.base.BaseEntity; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serial; + + +/** + * [外协厂家] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class OemExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 简称 + */ + @ColumnWidth(20) + @ExcelProperty("简称") + private String abbreviation; + /** + * 工艺能力 + */ + @ColumnWidth(20) + @ExcelProperty("工艺能力") + private String craftAbility; + /** + * 地区 + */ + @ColumnWidth(20) + @ExcelProperty("地区") + private String region; + /** + * 地址 + */ + @ColumnWidth(20) + @ExcelProperty("地址") + private String address; + /** + * 资质 + */ + @ColumnWidth(20) + @ExcelProperty("资质") + private Short qualification; + /** + * 联系人 + */ + @ColumnWidth(20) + @ExcelProperty("联系人") + private String contactMan; + /** + * 邮箱 + */ + @ColumnWidth(20) + @ExcelProperty("邮箱") + private String email; + /** + * 联系电话 + */ + @ColumnWidth(20) + @ExcelProperty("联系电话") + private String contactPhone; + /** + * 密码 + */ + @ColumnWidth(20) + @ExcelProperty("密码") + private String oemPassword; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String ocName; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long oemType; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java new file mode 100644 index 00000000..3a3892f4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.basic.excel.OemExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * [外协厂家] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public interface OemMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param oem 查询参数 + * @return List + */ + List selectOemPage(IPage page, OemVO oem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportOem(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.xml new file mode 100644 index 00000000..7ccd83c3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java new file mode 100644 index 00000000..4a346a40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import org.springblade.desk.basic.pojo.entity.Oem; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [外协厂家] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class OemDTO extends Oem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java new file mode 100644 index 00000000..7ec9e2d5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -0,0 +1,155 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import org.springblade.core.mp.base.BaseEntity; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [外协厂家] 实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@TableName("BA_OEM") +@Schema(description = "Oem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Oem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 简称 + */ + public static final String COL_ABBREVIATION = "ABBREVIATION"; + /** + * 工艺能力 + */ + public static final String COL_CRAFT_ABILITY = "CRAFT_ABILITY"; + /** + * 地区 + */ + public static final String COL_REGION = "REGION"; + /** + * 地址 + */ + public static final String COL_ADDRESS = "ADDRESS"; + /** + * 资质 + */ + public static final String COL_QUALIFICATION = "QUALIFICATION"; + /** + * 联系人 + */ + public static final String COL_CONTACT_MAN = "CONTACT_MAN"; + /** + * 邮箱 + */ + public static final String COL_EMAIL = "EMAIL"; + /** + * 联系电话 + */ + public static final String COL_CONTACT_PHONE = "CONTACT_PHONE"; + /** + * 密码 + */ + public static final String COL_OEM_PASSWORD = "OEM_PASSWORD"; + /** + * 名称 + */ + public static final String COL_OC_NAME = "OC_NAME"; + /** + * 类型 + */ + public static final String COL_OEM_TYPE = "OEM_TYPE"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 简称 + */ + @Schema(description = "简称") + private String abbreviation; + /** + * 工艺能力 + */ + @Schema(description = "工艺能力") + private String craftAbility; + /** + * 地区 + */ + @Schema(description = "地区") + private String region; + /** + * 地址 + */ + @Schema(description = "地址") + private String address; + /** + * 资质 + */ + @Schema(description = "资质") + private Short qualification; + /** + * 联系人 + */ + @Schema(description = "联系人") + private String contactMan; + /** + * 邮箱 + */ + @Schema(description = "邮箱") + private String email; + /** + * 联系电话 + */ + @Schema(description = "联系电话") + private String contactPhone; + /** + * 密码 + */ + @Schema(description = "密码") + private String oemPassword; + /** + * 名称 + */ + @Schema(description = "名称") + private String ocName; + /** + * 类型 + */ + @Schema(description = "类型") + private Long oemType; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java new file mode 100644 index 00000000..a5f19f3a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import org.springblade.desk.basic.pojo.entity.Oem; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [外协厂家] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class OemVO extends Oem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java new file mode 100644 index 00000000..6d951030 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.basic.excel.OemExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [外协厂家] 服务类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public interface IOemService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param oem 查询参数 + * @return IPage + */ + IPage selectOemPage(IPage page, OemVO oem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportOem(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(OemVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java new file mode 100644 index 00000000..3bcc0bca --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.mapper.OemMapper; +import org.springblade.desk.basic.service.IOemService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.feign.IDictClient; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * [外协厂家] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class OemServiceImpl extends BaseServiceImpl implements IOemService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectOemPage(IPage page, OemVO oem) { + return page.setRecords(baseMapper.selectOemPage(page, oem)); + } + + @Override + public List exportOem(Wrapper queryWrapper) { + List oemList = baseMapper.exportOem(queryWrapper); + //oemList.forEach(oem -> { + // oem.setTypeName(DictCache.getValue(DictEnum.YES_NO, Oem.getType())); + //}); + return oemList; + } + + @Override + public void setVOValue(OemVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java new file mode 100644 index 00000000..0c047145 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java @@ -0,0 +1,35 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import java.util.Objects; + +/** + * [外协厂家] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public class OemWrapper extends BaseEntityWrapper { + + public static OemWrapper build() { + return new OemWrapper(); + } + + @Override + public OemVO entityVO(Oem oem) { + OemVO VO = Objects.requireNonNull(BeanUtil.copyProperties(oem, OemVO.class)); + + //User createUser = UserCache.getUser(oem.getCreateUser()); + //User updateUser = UserCache.getUser(oem.getUpdateUser()); + //oemVO.setCreateUserName(createUser.getName()); + //oemVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} From d25ef291ba0f9068896274dd95c782bebc80baa8 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 14:27:51 +0800 Subject: [PATCH 05/13] =?UTF-8?q?BA=E6=A8=A1=E5=9D=97=20Controller=20PREFI?= =?UTF-8?q?X=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/constant/FlowConst.java | 57 +++ .../basic/controller/BatConfigController.java | 315 ++++++++-------- .../basic/controller/FormulaController.java | 5 +- .../desk/basic/controller/OemController.java | 355 +++++++++--------- .../controller/ProcessAbilityController.java | 315 ++++++++-------- .../basic/controller/ProdMarkController.java | 315 ++++++++-------- .../basic/controller/TeamSetController.java | 3 +- .../controller/TestPowerJobController.java | 3 +- .../controller/WorkCenterController.java | 3 +- .../basic/controller/WorkTankController.java | 5 +- .../desk/basic/excel/OemExcel.java | 7 +- .../desk/basic/mapper/OemMapper.java | 9 +- .../desk/basic/pojo/dto/OemDTO.java | 3 +- .../desk/basic/pojo/entity/Oem.java | 7 +- .../springblade/desk/basic/pojo/vo/OemVO.java | 3 +- .../desk/basic/service/IOemService.java | 7 +- .../basic/service/impl/OemServiceImpl.java | 15 +- .../desk/basic/wrapper/OemWrapper.java | 1 + .../constant/InspectionTemplateConst.java | 2 +- .../controller/AuditFileController.java | 16 +- .../controller/ProReTemplateController.java | 7 +- .../desk/quality/mapper/AuditFileMapper.xml | 8 +- .../impl/ProReTemplateServiceImpl.java | 3 +- 23 files changed, 773 insertions(+), 691 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java new file mode 100644 index 00000000..e1188f94 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java @@ -0,0 +1,57 @@ +package org.springblade.desk.basic.constant; + +/** + * mes v1: copy from IFlowBusinessBean + */ +public interface FlowConst { + + /** + * 初始状态(未发送审批) + */ + public static final short STATUS_NEW = -1; + + /** + * 审批中(审批中) + */ + public static final short STATUS_CHECKING = 0; + + /** + * 审批完毕(审批通过) + */ + public static final short STATUS_CHECKED = 1; + + /** + * 变更待审中 + */ + public static final short STATUS_CHANGE_WAITING_FOR_CHECKUP = 2; + + /** + * 变更中 + */ + public static final short STATUS_CHANGING = 3; + + /** + * 打回 + */ + public static final short STATUS_RETURN = 4; + + /** + * 审批未通过 + */ + public static final short STATUS_UNPASS = 10; + + /** + * 已完成 + */ + public static final short STATUS_COMPLETE = 20; + + /** + * 已作废 + */ + public static final short STATUS_CANCEL = 21; + + /** + * 已变更 + */ + public static final short STATUS_CHANGE_OK = 22; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java index c46d35be..50043f69 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.BatConfigExcel; import org.springblade.desk.basic.pojo.entity.BatConfig; import org.springblade.desk.basic.pojo.vo.BatConfigVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/BA/BatConfig") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/BatConfig") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class BatConfigController extends BladeController { @Resource - private IBatConfigService service; - - /** - * [批量配置] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入BatConfig Obj") - public R detail(BatConfig batConfig) { - QueryWrapper qw = Condition.getQueryWrapper(batConfig); - BatConfig detail = service.getOne(qw); - BatConfigVO detailVO = BatConfigWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [批量配置] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入BatConfig Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map batConfig, - Query query) { + private IBatConfigService service; + + /** + * [批量配置] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入BatConfig Obj") + public R detail(BatConfig batConfig) { + QueryWrapper qw = Condition.getQueryWrapper(batConfig); + BatConfig detail = service.getOne(qw); + BatConfigVO detailVO = BatConfigWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [批量配置] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入BatConfig Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map batConfig, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = BatConfigWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [批量配置] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入BatConfig Obj") - public R> page(BatConfigVO batConfig, Query query) { - IPage pagesVO = service.selectBatConfigPage( - Condition.getPage(query), batConfig - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = BatConfigWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [批量配置] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入BatConfig Obj") + public R> page(BatConfigVO batConfig, Query query) { + IPage pagesVO = service.selectBatConfigPage( + Condition.getPage(query), batConfig + ); + return R.data(pagesVO); + } + + /** * [批量配置] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = BatConfigWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = BatConfigWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [批量配置] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入BatConfig Obj") + public R save(@Valid @RequestBody BatConfig addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [批量配置] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入BatConfig Obj") - public R save(@Valid @RequestBody BatConfig addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [批量配置] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入BatConfig List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [批量配置] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入BatConfig Obj") - public R update(@Valid @RequestBody BatConfig updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入BatConfig List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [批量配置] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入BatConfig Obj") + public R update(@Valid @RequestBody BatConfig updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [批量配置] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入BatConfig List") + @Operation(summary = "修改批量", description = "传入BatConfig List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [批量配置] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入BatConfig Obj") - public R submit(@Valid @RequestBody BatConfig mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [批量配置] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入BatConfig Obj") + public R submit(@Valid @RequestBody BatConfig mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [批量配置] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入BatConfig List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [批量配置] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [批量配置] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入BatConfig") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map batConfig, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(BatConfig::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(BatConfigEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportBatConfig(qw); - ExcelUtil.export(response, "[批量配置]数据" + DateUtil.time(), - "[批量配置]数据表", list, BatConfigExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入BatConfig List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [批量配置] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [批量配置] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入BatConfig") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map batConfig, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BatConfig::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BatConfigEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportBatConfig(qw); + ExcelUtil.export(response, "[批量配置]数据" + DateUtil.time(), + "[批量配置]数据表", list, BatConfigExcel.class); + } + + /** * [批量配置] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [批量配置] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, BatConfig.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BatConfig.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index b37783b4..1422781a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.FormulaExcel; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.vo.FormulaVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/Formula") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Formula") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -98,7 +99,7 @@ public class FormulaController extends BladeController { */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect( @Parameter(description = "formulaType", required = true) @RequestParam Integer formulaType) { List list = service.list( diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index bc1c113c..f2885e00 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -3,50 +3,51 @@ */ package org.springblade.desk.basic.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; -import org.springblade.desk.basic.wrapper.OemWrapper; import org.springblade.desk.basic.service.IOemService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.OemWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.stream.Collectors; /** * [外协厂家] 控制器 + * mes v1: bs_oem_customer * * @author Tom Shuo * @since 2026-01-04 */ @RestController -@RequestMapping("/Oem") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Oem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -55,184 +56,184 @@ import jakarta.servlet.http.HttpServletResponse; public class OemController extends BladeController { @Resource - private IOemService service; - - /** - * [外协厂家] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Oem Obj") - public R detail(Oem oem) { - QueryWrapper qw = Condition.getQueryWrapper(oem); - Oem detail = service.getOne(qw); - OemVO detailVO = OemWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [外协厂家] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Oem Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map oem, - Query query) { + private IOemService service; + + /** + * [外协厂家] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Oem Obj") + public R detail(Oem oem) { + QueryWrapper qw = Condition.getQueryWrapper(oem); + Oem detail = service.getOne(qw); + OemVO detailVO = OemWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [外协厂家] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Oem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map oem, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = OemWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [外协厂家] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Oem Obj") - public R> page(OemVO oem, Query query) { - IPage pagesVO = service.selectOemPage( - Condition.getPage(query), oem - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = OemWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [外协厂家] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Oem Obj") + public R> page(OemVO oem, Query query) { + IPage pagesVO = service.selectOemPage( + Condition.getPage(query), oem + ); + return R.data(pagesVO); + } + + /** * [外协厂家] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = OemWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = OemWrapper.build().listVO(list); + return R.data(listVO); } - /** - * [外协厂家] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Oem Obj") - public R save(@Valid @RequestBody Oem addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** + * [外协厂家] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Oem Obj") + public R save(@Valid @RequestBody Oem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** * [外协厂家] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Oem List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [外协厂家] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Oem Obj") - public R update(@Valid @RequestBody Oem updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Oem List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [外协厂家] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Oem Obj") + public R update(@Valid @RequestBody Oem updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [外协厂家] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Oem List") + @Operation(summary = "修改批量", description = "传入Oem List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [外协厂家] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Oem Obj") - public R submit(@Valid @RequestBody Oem mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [外协厂家] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Oem Obj") + public R submit(@Valid @RequestBody Oem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [外协厂家] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Oem List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [外协厂家] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [外协厂家] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Oem") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map oem, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Oem::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportOem(qw); - ExcelUtil.export(response, "[外协厂家]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[外协厂家]数据表", list, OemExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Oem List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [外协厂家] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [外协厂家] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Oem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map oem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Oem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportOem(qw); + ExcelUtil.export(response, "[外协厂家]数据" + DateUtil.time(), + "[外协厂家]数据表", list, OemExcel.class); + } + + /** * [外协厂家] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [外协厂家] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, Oem.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [外协厂家] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Oem.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java index 6280713f..e8d9d8aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ProcessAbilityExcel; import org.springblade.desk.basic.pojo.entity.ProcessAbility; import org.springblade.desk.basic.pojo.vo.ProcessAbilityVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/ProcessAbility") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/ProcessAbility") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class ProcessAbilityController extends BladeController { @Resource - private IProcessAbilityService service; - - /** - * [工艺能力] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入ProcessAbility Obj") - public R detail(ProcessAbility processAbility) { - QueryWrapper qw = Condition.getQueryWrapper(processAbility); - ProcessAbility detail = service.getOne(qw); - ProcessAbilityVO detailVO = ProcessAbilityWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [工艺能力] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入ProcessAbility Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map processAbility, - Query query) { + private IProcessAbilityService service; + + /** + * [工艺能力] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ProcessAbility Obj") + public R detail(ProcessAbility processAbility) { + QueryWrapper qw = Condition.getQueryWrapper(processAbility); + ProcessAbility detail = service.getOne(qw); + ProcessAbilityVO detailVO = ProcessAbilityWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工艺能力] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ProcessAbility Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map processAbility, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ProcessAbilityWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [工艺能力] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入ProcessAbility Obj") - public R> page(ProcessAbilityVO processAbility, Query query) { - IPage pagesVO = service.selectProcessAbilityPage( - Condition.getPage(query), processAbility - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ProcessAbilityWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [工艺能力] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ProcessAbility Obj") + public R> page(ProcessAbilityVO processAbility, Query query) { + IPage pagesVO = service.selectProcessAbilityPage( + Condition.getPage(query), processAbility + ); + return R.data(pagesVO); + } + + /** * [工艺能力] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = ProcessAbilityWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = ProcessAbilityWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工艺能力] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ProcessAbility Obj") + public R save(@Valid @RequestBody ProcessAbility addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [工艺能力] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入ProcessAbility Obj") - public R save(@Valid @RequestBody ProcessAbility addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [工艺能力] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入ProcessAbility List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [工艺能力] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入ProcessAbility Obj") - public R update(@Valid @RequestBody ProcessAbility updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ProcessAbility List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [工艺能力] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ProcessAbility Obj") + public R update(@Valid @RequestBody ProcessAbility updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [工艺能力] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入ProcessAbility List") + @Operation(summary = "修改批量", description = "传入ProcessAbility List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [工艺能力] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入ProcessAbility Obj") - public R submit(@Valid @RequestBody ProcessAbility mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [工艺能力] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ProcessAbility Obj") + public R submit(@Valid @RequestBody ProcessAbility mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [工艺能力] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入ProcessAbility List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [工艺能力] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [工艺能力] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入ProcessAbility") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map processAbility, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(ProcessAbility::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ProcessAbilityEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportProcessAbility(qw); - ExcelUtil.export(response, "[工艺能力]数据" + DateUtil.time(), - "[工艺能力]数据表", list, ProcessAbilityExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ProcessAbility List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [工艺能力] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [工艺能力] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ProcessAbility") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map processAbility, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ProcessAbility::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ProcessAbilityEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportProcessAbility(qw); + ExcelUtil.export(response, "[工艺能力]数据" + DateUtil.time(), + "[工艺能力]数据表", list, ProcessAbilityExcel.class); + } + + /** * [工艺能力] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [工艺能力] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, ProcessAbility.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [工艺能力] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ProcessAbility.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java index 60d7b5fd..7b8be809 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ProdMarkExcel; import org.springblade.desk.basic.pojo.entity.ProdMark; import org.springblade.desk.basic.pojo.vo.ProdMarkVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/BA/ProdMark") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/ProdMark") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class ProdMarkController extends BladeController { @Resource - private IProdMarkService service; - - /** - * [生产标识] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入ProdMark Obj") - public R detail(ProdMark prodMark) { - QueryWrapper qw = Condition.getQueryWrapper(prodMark); - ProdMark detail = service.getOne(qw); - ProdMarkVO detailVO = ProdMarkWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [生产标识] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入ProdMark Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map prodMark, - Query query) { + private IProdMarkService service; + + /** + * [生产标识] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ProdMark Obj") + public R detail(ProdMark prodMark) { + QueryWrapper qw = Condition.getQueryWrapper(prodMark); + ProdMark detail = service.getOne(qw); + ProdMarkVO detailVO = ProdMarkWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [生产标识] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ProdMark Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map prodMark, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ProdMarkWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [生产标识] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入ProdMark Obj") - public R> page(ProdMarkVO prodMark, Query query) { - IPage pagesVO = service.selectProdMarkPage( - Condition.getPage(query), prodMark - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ProdMarkWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [生产标识] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ProdMark Obj") + public R> page(ProdMarkVO prodMark, Query query) { + IPage pagesVO = service.selectProdMarkPage( + Condition.getPage(query), prodMark + ); + return R.data(pagesVO); + } + + /** * [生产标识] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = ProdMarkWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = ProdMarkWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [生产标识] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ProdMark Obj") + public R save(@Valid @RequestBody ProdMark addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [生产标识] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入ProdMark Obj") - public R save(@Valid @RequestBody ProdMark addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [生产标识] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入ProdMark List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [生产标识] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入ProdMark Obj") - public R update(@Valid @RequestBody ProdMark updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ProdMark List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [生产标识] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ProdMark Obj") + public R update(@Valid @RequestBody ProdMark updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [生产标识] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入ProdMark List") + @Operation(summary = "修改批量", description = "传入ProdMark List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [生产标识] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入ProdMark Obj") - public R submit(@Valid @RequestBody ProdMark mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [生产标识] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ProdMark Obj") + public R submit(@Valid @RequestBody ProdMark mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [生产标识] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入ProdMark List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [生产标识] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [生产标识] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入ProdMark") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map prodMark, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(ProdMark::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ProdMarkEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportProdMark(qw); - ExcelUtil.export(response, "[生产标识]数据" + DateUtil.time(), - "[生产标识]数据表", list, ProdMarkExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ProdMark List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [生产标识] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [生产标识] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ProdMark") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map prodMark, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ProdMark::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ProdMarkEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportProdMark(qw); + ExcelUtil.export(response, "[生产标识]数据" + DateUtil.time(), + "[生产标识]数据表", list, ProdMarkExcel.class); + } + + /** * [生产标识] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [生产标识] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, ProdMark.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [生产标识] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ProdMark.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index 8ce777c0..a1aa3505 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.TeamSetExcel; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/TeamSet") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/TeamSet") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java index b2b912e8..191696c5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.service.TestPowerJobService; import org.springblade.desk.quality.service.CycleTestTaskService2; import org.springblade.desk.quality.service.TestService; @@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; @RestController -@RequestMapping("/BA/TestPowerJob") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/TestPowerJob") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index 38f99e47..4256df39 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.WorkCenterExcel; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.vo.WorkCenterVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/WorkCenter") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/WorkCenter") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index c3bdd619..0a9fab13 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.WorkTankExcel; import org.springblade.desk.basic.pojo.entity.WorkTank; import org.springblade.desk.basic.pojo.vo.WorkTankVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/WorkTank") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/WorkTank") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -99,7 +100,7 @@ public class WorkTankController extends BladeController { */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect(@Parameter(hidden = true) @RequestParam Map workTank) { QueryWrapper qw = Condition.getQueryWrapper(workTank, WorkTank.class); List list = service.list(qw); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java index df17ee99..e52f7fc1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java @@ -4,15 +4,14 @@ package org.springblade.desk.basic.excel; -import lombok.Data; - -import java.io.Serializable; -import org.springblade.core.mp.base.BaseEntity; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + import java.io.Serial; +import java.io.Serializable; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java index 3a3892f4..72ae9820 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -3,13 +3,14 @@ */ package org.springblade.desk.basic.mapper; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java index 4a346a40..9782f5cd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.basic.pojo.dto; -import org.springblade.desk.basic.pojo.entity.Oem; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java index 7ec9e2d5..3546ce73 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -3,11 +3,12 @@ */ package org.springblade.desk.basic.pojo.entity; -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; -import org.springblade.core.mp.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java index a5f19f3a..b3c1408f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.basic.pojo.vo; -import org.springblade.desk.basic.pojo.entity.Oem; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index 6d951030..22bfb08c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -4,11 +4,12 @@ package org.springblade.desk.basic.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 3bcc0bca..40cc9d5e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -3,22 +3,23 @@ */ package org.springblade.desk.basic.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; import org.springblade.desk.basic.service.IOemService; -import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java index 0c047145..cadccfeb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java @@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.vo.OemVO; + import java.util.Objects; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java index 86bc68d7..9857b2da 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java @@ -1,6 +1,6 @@ package org.springblade.desk.quality.constant; -public class InspectionTemplateConst { +public interface InspectionTemplateConst { String DICT_CATEGORY = ""; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index af509792..e5f7cd36 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; /** * [工艺文件] 控制器 - * mes v1: + * mes v1: ds_audit_file * * @author Tom Shuo * @since 2025-12-22 @@ -81,12 +81,18 @@ public class AuditFileController extends BladeController { @Operation(summary = "list分页", description = "传入AuditFile Obj") public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); + // QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); AuditFileSearch search = new AuditFileSearch(); // todo: Func 用法 - search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); - search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); - search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + if (map.containsKey(AuditFile.COL_PPS_ID)) { + search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); + } + if (map.containsKey(AuditFile.COL_PQ_ID)) { + search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); + } + if (map.containsKey(BaseRequest.KEEP_USER_REAL_NAME)) { + search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + } IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java index ba275361..8e8d86fa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; /** * [过程记录模板] 控制器 + * mes v1: ds_rb_file_preserve * * @author Tom Shuo * @since 2025-12-22 @@ -122,9 +123,9 @@ public class ProReTemplateController extends BladeController { @ApiOperationSupport(order = 30) @Operation(summary = "新增一条", description = "传入ProReTemplate Obj") public R save(@Valid @RequestBody ProReTemplate addOne) { - addOne.setId(null); addOne.setStatus(ProReTemplateConst.STATUS_NEW); - addOne.setApprovalStatus(1); + addOne.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1); + addOne.setId(null); return R.status(service.save(addOne)); } @@ -136,6 +137,8 @@ public class ProReTemplateController extends BladeController { @Operation(summary = "新增批量", description = "传入ProReTemplate List") public R saveBat(@Valid @RequestBody List addList) { addList.forEach(one -> { + one.setStatus(ProReTemplateConst.STATUS_NEW); + one.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1); one.setId(null); }); return R.status(service.saveBatch(addList)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml index b481eb05..06fb0f6c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml @@ -29,16 +29,16 @@ + SELECT * FROM QA_NG WHERE is_deleted = 0 + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java new file mode 100644 index 00000000..efc30a87 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import org.springblade.desk.quality.pojo.entity.Ng; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgDTO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java new file mode 100644 index 00000000..b6b7f2e3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -0,0 +1,129 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import org.springblade.core.mp.base.BaseEntity; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@TableName("QA_NG") +@Schema(description = "Ng Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Ng extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + public static final String COL_NG_TYPE = "NG_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 父级[不良原因]id + */ + public static final String COL_PARENT_ID = "PARENT_ID"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 缺陷描述 + */ + public static final String COL_DESC = "DESC"; + /** + * [制品]id + */ + public static final String COL_PRODUCT_ID = "PRODUCT_ID"; + /** + * [制品]编码 + */ + public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; + /** + * [工序]id + */ + public static final String COL_PROCESS_ID = "PROCESS_ID"; + /** + * [工序]编码 + */ + public static final String COL_PROCESS_CODE = "PROCESS_CODE"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + @Schema(description = "故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") + private Long ngType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 父级[不良原因]id + */ + @Schema(description = "父级[不良原因]id") + private BigDecimal parentId; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 缺陷描述 + */ + @Schema(description = "缺陷描述") + private String desc; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private String productCode; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java new file mode 100644 index 00000000..e2a09db8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import org.springblade.desk.quality.pojo.entity.Ng; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgVO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java new file mode 100644 index 00000000..6191565b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [缺陷] 服务类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public interface INgService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return IPage + */ + IPage selectNgPage(IPage page, NgVO ng); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(NgVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java new file mode 100644 index 00000000..b022af64 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.mapper.NgMapper; +import org.springblade.desk.quality.service.INgService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.feign.IDictClient; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * [缺陷] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class NgServiceImpl extends BaseServiceImpl implements INgService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectNgPage(IPage page, NgVO ng) { + return page.setRecords(baseMapper.selectNgPage(page, ng)); + } + + @Override + public List exportNg(Wrapper queryWrapper) { + List ngList = baseMapper.exportNg(queryWrapper); + //ngList.forEach(ng -> { + // ng.setTypeName(DictCache.getValue(DictEnum.YES_NO, Ng.getType())); + //}); + return ngList; + } + + @Override + public void setVOValue(NgVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java new file mode 100644 index 00000000..6deefe1b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java @@ -0,0 +1,35 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import java.util.Objects; + +/** + * [缺陷] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public class NgWrapper extends BaseEntityWrapper { + + public static NgWrapper build() { + return new NgWrapper(); + } + + @Override + public NgVO entityVO(Ng ng) { + NgVO VO = Objects.requireNonNull(BeanUtil.copyProperties(ng, NgVO.class)); + + //User createUser = UserCache.getUser(ng.getCreateUser()); + //User updateUser = UserCache.getUser(ng.getUpdateUser()); + //ngVO.setCreateUserName(createUser.getName()); + //ngVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} From d0c3dc24d759c0f3e43e30e8c894eccfb69844f2 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 15:13:30 +0800 Subject: [PATCH 07/13] CONTROLLER_PREFIX --- .../desk/quality/controller/NgController.java | 238 +++++++++++ .../desk/quality/excel/NgExcel.java | 100 +++++ .../desk/quality/mapper/NgMapper.java | 39 ++ .../desk/quality/mapper/NgMapper.xml | 27 ++ .../desk/quality/pojo/dto/NgDTO.java | 23 ++ .../desk/quality/pojo/entity/Ng.java | 129 ++++++ .../desk/quality/pojo/vo/NgVO.java | 23 ++ .../desk/quality/service/INgService.java | 43 ++ .../quality/service/impl/NgServiceImpl.java | 60 +++ .../desk/quality/wrapper/NgWrapper.java | 35 ++ .../springblade/test/CodeGeneratorVer2.java | 2 +- .../desk/basic/controller/OemController.java | 10 + .../desk/basic/service/IOemService.java | 36 +- .../basic/service/impl/OemServiceImpl.java | 41 +- .../desk/quality/constant/QAModuleConst.java | 2 + .../controller/AuditFileController.java | 7 +- .../controller/CycleTestController.java | 3 +- .../controller/CycleTestItemController.java | 3 +- .../CycleTestStandardController.java | 3 +- .../controller/CycleTestTaskController.java | 3 +- .../controller/IndicatorMonthController.java | 3 +- .../controller/IndicatorYearController.java | 3 +- .../IndicatorYearDetailController.java | 3 +- .../controller/InspectionItemController.java | 3 +- .../InspectionResultController.java | 3 +- .../controller/InspectionTaskController.java | 3 +- .../InspectionTemplateController.java | 3 +- .../controller/IotHardnessController.java | 3 +- .../controller/IotThicknessController.java | 3 +- .../controller/LiquidTankController.java | 3 +- .../LiquidTankReportConfigController.java | 3 +- .../LiquidTankReportController.java | 3 +- .../controller/LiquidTankTaskController.java | 3 +- .../LiquidTankTaskCopyController.java | 3 +- .../LiquidTankTaskHiController.java | 3 +- .../controller/LiquidTankWaveController.java | 3 +- .../desk/quality/controller/NgController.java | 368 +++++++++--------- .../controller/PlanTestController.java | 3 +- .../controller/ProReTemplateController.java | 3 +- .../ProReTemplateDetailController.java | 3 +- .../ProReTemplateTankController.java | 3 +- .../RelInsTemplateItemController.java | 3 +- .../RelTankReportItemController.java | 3 +- .../controller/RelTankWaveItemController.java | 3 +- .../controller/RemindMsgController.java | 3 +- .../controller/StandardController.java | 3 +- .../controller/StandardParamController.java | 3 +- .../SupplyInspectionController.java | 3 +- .../quality/controller/TestController.java | 3 +- .../desk/quality/excel/NgExcel.java | 9 +- .../desk/quality/mapper/NgMapper.java | 9 +- .../desk/quality/pojo/dto/NgDTO.java | 3 +- .../desk/quality/pojo/entity/Ng.java | 17 +- .../desk/quality/pojo/vo/NgVO.java | 3 +- .../desk/quality/service/INgService.java | 7 +- .../quality/service/impl/NgServiceImpl.java | 15 +- .../desk/quality/wrapper/NgWrapper.java | 1 + 57 files changed, 1072 insertions(+), 271 deletions(-) create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java new file mode 100644 index 00000000..83fd7c52 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; + +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.wrapper.NgWrapper; +import org.springblade.desk.quality.service.INgService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import java.util.Map; +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + +/** + * [缺陷] 控制器 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@RestController +@RequestMapping("/Ng") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[缺陷]", description = "[缺陷]接口") +public class NgController extends BladeController { + + @Resource + private INgService service; + + /** + * [缺陷] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Ng Obj") + public R detail(Ng ng) { + QueryWrapper qw = Condition.getQueryWrapper(ng); + Ng detail = service.getOne(qw); + NgVO detailVO = NgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [缺陷] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Ng Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map ng, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = NgWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [缺陷] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Ng Obj") + public R> page(NgVO ng, Query query) { + IPage pagesVO = service.selectNgPage( + Condition.getPage(query), ng + ); + return R.data(pagesVO); + } + + /** + * [缺陷] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Ng Obj") + public R save(@Valid @RequestBody Ng addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [缺陷] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Ng List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [缺陷] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Ng Obj") + public R update(@Valid @RequestBody Ng updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [缺陷] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Ng List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [缺陷] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Ng Obj") + public R submit(@Valid @RequestBody Ng mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [缺陷] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Ng List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [缺陷] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [缺陷] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Ng") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportNg(qw); + ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[缺陷]数据表", list, NgExcel.class); + } + + /** + * [缺陷] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [缺陷] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Ng.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java new file mode 100644 index 00000000..b9345bdd --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java @@ -0,0 +1,100 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import org.springblade.core.mp.base.BaseEntity; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serial; + + +/** + * [缺陷] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class NgExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + @ColumnWidth(20) + @ExcelProperty("故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") + private Long ngType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 父级[不良原因]id + */ + @ColumnWidth(20) + @ExcelProperty("父级[不良原因]id") + private BigDecimal parentId; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 缺陷描述 + */ + @ColumnWidth(20) + @ExcelProperty("缺陷描述") + private String desc; + /** + * [制品]id + */ + @ColumnWidth(20) + @ExcelProperty("[制品]id") + private BigDecimal productId; + /** + * [制品]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[制品]编码") + private String productCode; + /** + * [工序]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序]id") + private BigDecimal processId; + /** + * [工序]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[工序]编码") + private String processCode; +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java new file mode 100644 index 00000000..d70d9b7b --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * [缺陷] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public interface NgMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return List + */ + List selectNgPage(IPage page, NgVO ng); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml new file mode 100644 index 00000000..ac77b49d --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java new file mode 100644 index 00000000..efc30a87 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import org.springblade.desk.quality.pojo.entity.Ng; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgDTO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java new file mode 100644 index 00000000..b6b7f2e3 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -0,0 +1,129 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import org.springblade.core.mp.base.BaseEntity; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@TableName("QA_NG") +@Schema(description = "Ng Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Ng extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + public static final String COL_NG_TYPE = "NG_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 父级[不良原因]id + */ + public static final String COL_PARENT_ID = "PARENT_ID"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 缺陷描述 + */ + public static final String COL_DESC = "DESC"; + /** + * [制品]id + */ + public static final String COL_PRODUCT_ID = "PRODUCT_ID"; + /** + * [制品]编码 + */ + public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; + /** + * [工序]id + */ + public static final String COL_PROCESS_ID = "PROCESS_ID"; + /** + * [工序]编码 + */ + public static final String COL_PROCESS_CODE = "PROCESS_CODE"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + @Schema(description = "故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") + private Long ngType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 父级[不良原因]id + */ + @Schema(description = "父级[不良原因]id") + private BigDecimal parentId; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 缺陷描述 + */ + @Schema(description = "缺陷描述") + private String desc; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private String productCode; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java new file mode 100644 index 00000000..e2a09db8 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import org.springblade.desk.quality.pojo.entity.Ng; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgVO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java new file mode 100644 index 00000000..6191565b --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [缺陷] 服务类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public interface INgService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return IPage + */ + IPage selectNgPage(IPage page, NgVO ng); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(NgVO vo); +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java new file mode 100644 index 00000000..b022af64 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.mapper.NgMapper; +import org.springblade.desk.quality.service.INgService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.feign.IDictClient; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * [缺陷] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class NgServiceImpl extends BaseServiceImpl implements INgService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectNgPage(IPage page, NgVO ng) { + return page.setRecords(baseMapper.selectNgPage(page, ng)); + } + + @Override + public List exportNg(Wrapper queryWrapper) { + List ngList = baseMapper.exportNg(queryWrapper); + //ngList.forEach(ng -> { + // ng.setTypeName(DictCache.getValue(DictEnum.YES_NO, Ng.getType())); + //}); + return ngList; + } + + @Override + public void setVOValue(NgVO vo) { + + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java new file mode 100644 index 00000000..6deefe1b --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java @@ -0,0 +1,35 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import java.util.Objects; + +/** + * [缺陷] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public class NgWrapper extends BaseEntityWrapper { + + public static NgWrapper build() { + return new NgWrapper(); + } + + @Override + public NgVO entityVO(Ng ng) { + NgVO VO = Objects.requireNonNull(BeanUtil.copyProperties(ng, NgVO.class)); + + //User createUser = UserCache.getUser(ng.getCreateUser()); + //User updateUser = UserCache.getUser(ng.getUpdateUser()); + //ngVO.setCreateUserName(createUser.getName()); + //ngVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java index 49683bae..8b894068 100644 --- a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java +++ b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java @@ -65,7 +65,7 @@ public class CodeGeneratorVer2 { * 需要生成的表名(两者只能取其一) */ public static String[] INCLUDE_TABLES = { - "QA_PLAN_TEST" + "QA_NG" }; /** * 需要排除的表名(两者只能取其一) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index f2885e00..110c701e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -236,4 +236,14 @@ public class OemController extends BladeController { ); return R.status(service.saveBatch(importList)); } + + /** + * [外协厂家] 设置密码 + */ + @PostMapping("/setPassword") + @ApiOperationSupport(order = 40) + @Operation(summary = "设置密码", description = "传入Oem Obj") + public R setPassword(@Valid @RequestBody Oem updateOne) { + return service.setPassword(updateOne); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index 22bfb08c..df2ef9b8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -6,6 +6,7 @@ package org.springblade.desk.basic.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.vo.OemVO; @@ -19,26 +20,29 @@ import java.util.List; * @since 2026-01-04 */ public interface IOemService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param oem 查询参数 - * @return IPage - */ - IPage selectOemPage(IPage page, OemVO oem); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param oem 查询参数 + * @return IPage + */ + IPage selectOemPage(IPage page, OemVO oem); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportOem(Wrapper queryWrapper); + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportOem(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(OemVO vo); + void setVOValue(OemVO vo); + + R setPassword(Oem updateOne); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 40cc9d5e..9361d4ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -11,6 +11,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; import org.springblade.desk.basic.pojo.entity.Oem; @@ -40,22 +41,32 @@ public class OemServiceImpl extends BaseServiceImpl implements I @Resource private IDictClient dictClient; - @Override - public IPage selectOemPage(IPage page, OemVO oem) { - return page.setRecords(baseMapper.selectOemPage(page, oem)); - } - - @Override - public List exportOem(Wrapper queryWrapper) { - List oemList = baseMapper.exportOem(queryWrapper); - //oemList.forEach(oem -> { - // oem.setTypeName(DictCache.getValue(DictEnum.YES_NO, Oem.getType())); - //}); - return oemList; - } - - @Override + @Override + public IPage selectOemPage(IPage page, OemVO oem) { + return page.setRecords(baseMapper.selectOemPage(page, oem)); + } + + @Override + public List exportOem(Wrapper queryWrapper) { + List oemList = baseMapper.exportOem(queryWrapper); + //oemList.forEach(oem -> { + // oem.setTypeName(DictCache.getValue(DictEnum.YES_NO, Oem.getType())); + //}); + return oemList; + } + + @Override public void setVOValue(OemVO vo) { } + + @Override + public R setPassword(Oem updateOne) { + Oem find = getById(updateOne.getId()); + if (find == null) { + return R.fail("没有找到对应外协厂商"); + } + find.setOemPassword(updateOne.getOemPassword()); + return R.success("设置密码成功"); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java index 26abaa29..807e0ff8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java @@ -9,4 +9,6 @@ public interface QAModuleConst { * 模块前缀 */ String PREFIX = "QA"; + + String CONTROLLER_PREFIX = "/QA"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index e5f7cd36..14b956f2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -24,8 +24,10 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.request.AuditFileSearch; @@ -48,7 +50,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/AuditFile") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/AuditFile") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -93,6 +95,9 @@ public class AuditFileController extends BladeController { if (map.containsKey(BaseRequest.KEEP_USER_REAL_NAME)) { search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); } + if (map.containsKey(BaseCol.STATUS)) { + search.setStatus(Func.toInt(map.get(BaseCol.STATUS))); + } IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java index 20d224c1..58ec68d1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestExcel; import org.springblade.desk.quality.excel.CycleTestExcelImport; import org.springblade.desk.quality.pojo.entity.CycleTest; @@ -55,7 +56,7 @@ import java.util.Map; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@RequestMapping("/QA/CycleTest") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTest") @Tag(name = "[QA][周期试验]", description = "[周期试验]接口") public class CycleTestController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java index 9cca549c..5fb1214a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestItemExcel; import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.request.CycleTestItemSubmit; @@ -46,7 +47,7 @@ import java.util.Map; * @since 2025-11-17 */ @RestController -@RequestMapping("/QA/CycleTestItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTestItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestStandardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestStandardController.java index b11f3259..8ad1565e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestStandardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestStandardController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestStandardExcel; import org.springblade.desk.quality.pojo.entity.CycleTestStandard; import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; @@ -45,7 +46,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@RequestMapping("/QA/CycleTestStandard") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTestStandard") @Tag(name = "[周期试验标准]", description = "[周期试验标准]接口") public class CycleTestStandardController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java index 06abf31f..523b130b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java @@ -25,6 +25,7 @@ import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestTaskExcel; import org.springblade.desk.quality.pojo.entity.CycleTestTask; import org.springblade.desk.quality.pojo.vo.CycleTestTaskVO; @@ -45,7 +46,7 @@ import java.util.Map; * @since 2025-11-17 */ @RestController -@RequestMapping("/QA/CycleTestTask") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTestTask") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorMonthController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorMonthController.java index 80ff3743..29c2948f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorMonthController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorMonthController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorMonthExcel; import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import org.springblade.desk.quality.pojo.vo.IndicatorMonthVO; @@ -46,7 +47,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/IndicatorMonth") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IndicatorMonth") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java index 3814182e..f36dad20 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorYearExcel; import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import org.springblade.desk.quality.pojo.entity.IndicatorYear; @@ -51,7 +52,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/IndicatorYear") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IndicatorYear") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java index ea0a74b2..ac67fffe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorYearDetailExcel; import org.springblade.desk.quality.pojo.entity.IndicatorYearDetail; import org.springblade.desk.quality.pojo.vo.IndicatorYearDetailVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/IndicatorYearDetail") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IndicatorYearDetail") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java index a52ca47c..5ffcd56d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -24,6 +24,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionItemExcel; import org.springblade.desk.quality.pojo.entity.InspectionItem; import org.springblade.desk.quality.pojo.vo.InspectionItemVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/QA/InspectionItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/InspectionItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java index 9b3f82ae..4a6f78d0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionResultExcel; import org.springblade.desk.quality.pojo.entity.InspectionResult; import org.springblade.desk.quality.pojo.vo.InspectionResultVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/InspectionResult") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/InspectionResult") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 67fa2bce..0a5085a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; @@ -44,7 +45,7 @@ import java.util.Map; @RestController @Data @EqualsAndHashCode(callSuper = true) -@RequestMapping("/QA/InspectionTask") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/InspectionTask") @Tag(name = "[QA][检验任务]", description = "[检验任务]接口") public class InspectionTaskController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index 7e3e0404..a974f41d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -27,6 +27,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.util.RequestUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTemplateExcel; import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.InspectionTemplateAdd; @@ -52,7 +53,7 @@ import java.util.stream.Collectors; * @since 2025-12-19 */ @RestController -@RequestMapping("/QA/InspectionTemplate") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/InspectionTemplate") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java index 95d47d51..50e4d17a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IotHardnessExcel; import org.springblade.desk.quality.pojo.entity.IotHardness; import org.springblade.desk.quality.pojo.vo.IotHardnessVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/IotHardness") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IotHardness") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java index c9a18be7..070b87ee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IotThicknessExcel; import org.springblade.desk.quality.pojo.entity.IotThickness; import org.springblade.desk.quality.pojo.vo.IotThicknessVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/IotThickness") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IotThickness") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java index c97183c6..6f4889b3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java @@ -24,6 +24,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankExcel; import org.springblade.desk.quality.pojo.entity.LiquidTank; import org.springblade.desk.quality.pojo.vo.LiquidTankVO; @@ -44,7 +45,7 @@ import java.util.stream.Collectors; * @since 2025-12-16 */ @RestController -@RequestMapping("/QA/LiquidTank") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTank") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportConfigController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportConfigController.java index d761dde4..59053fe4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportConfigController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportConfigController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankReportConfigExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReportConfig; import org.springblade.desk.quality.pojo.vo.LiquidTankReportConfigVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-18 */ @RestController -@RequestMapping("/QA/LiquidTankReportConfig") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankReportConfig") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java index e0acb9bd..e4e5e6b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; @@ -45,7 +46,7 @@ import java.util.Map; * @since 2025-12-18 */ @RestController -@RequestMapping("/QA/LiquidTankReport") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankReport") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java index d3f5cdfd..f0e71fc0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.constant.LiquidTankTaskConst; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankTaskExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; @@ -46,7 +47,7 @@ import java.util.stream.Collectors; * @since 2025-12-16 */ @RestController -@RequestMapping("/QA/LiquidTankTask") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankTask") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index 2e74e410..d3be5f8b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -28,6 +28,7 @@ import org.springblade.desk.basic.util.RequestUtil; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.quality.constant.LiquidTankTaskConst; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankTaskCopyExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO; @@ -50,7 +51,7 @@ import java.util.stream.Collectors; * @since 2025-12-18 */ @RestController -@RequestMapping("/QA/LiquidTankTaskCopy") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankTaskCopy") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskHiController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskHiController.java index d8c6048e..28d9976f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskHiController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskHiController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankTaskHiExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskHi; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskHiVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-17 */ @RestController -@RequestMapping("/QA/LiquidTankTaskHi") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankTaskHi") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java index 64574e0b..e490d692 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankWaveExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankWave; import org.springblade.desk.quality.pojo.vo.LiquidTankWaveVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-19 */ @RestController -@RequestMapping("/QA/LiquidTankWave") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankWave") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 83fd7c52..03c653b0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -3,50 +3,56 @@ */ package org.springblade.desk.quality.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.common.constant.CommonConstant; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import org.springblade.desk.order.pojo.entity.YieldOrderCraft; +import org.springblade.desk.quality.constant.QAModuleConst; +import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.pojo.entity.Ng; import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import org.springblade.desk.quality.wrapper.NgWrapper; import org.springblade.desk.quality.service.INgService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; +import org.springblade.desk.quality.wrapper.NgWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.stream.Collectors; /** * [缺陷] 控制器 + * mes v1: bs_review_sheet_type * * @author Tom Shuo * @since 2026-01-04 */ @RestController -@RequestMapping("/Ng") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/Ng") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -55,184 +61,192 @@ import jakarta.servlet.http.HttpServletResponse; public class NgController extends BladeController { @Resource - private INgService service; - - /** - * [缺陷] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Ng Obj") - public R detail(Ng ng) { - QueryWrapper qw = Condition.getQueryWrapper(ng); - Ng detail = service.getOne(qw); - NgVO detailVO = NgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [缺陷] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Ng Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map ng, - Query query) { + private INgService service; + + /** + * [缺陷] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Ng Obj") + public R detail(Ng ng) { + QueryWrapper qw = Condition.getQueryWrapper(ng); + Ng detail = service.getOne(qw); + NgVO detailVO = NgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [缺陷] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Ng Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map ng, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = NgWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [缺陷] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Ng Obj") - public R> page(NgVO ng, Query query) { - IPage pagesVO = service.selectNgPage( - Condition.getPage(query), ng - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = NgWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [缺陷] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Ng Obj") + public R> page(NgVO ng, Query query) { + IPage pagesVO = service.selectNgPage( + Condition.getPage(query), ng + ); + return R.data(pagesVO); + } + + /** * [缺陷] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { - List list = service.list(); - List listVO = NgWrapper.build().listVO(list); - return R.data(listVO); + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect( + @Parameter(description = "ngType", required = true) @RequestParam Integer ngType, + @Parameter(description = "parentId", required = false) @RequestParam Integer parentId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); + qw.eq(Ng::getNgType, ngType); + if (parentId != null) { + qw.eq(Ng::getParentId, parentId); + } + qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); + List list = service.list(qw); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Ng Obj") + public R save(@Valid @RequestBody Ng addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [缺陷] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Ng Obj") - public R save(@Valid @RequestBody Ng addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [缺陷] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Ng List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [缺陷] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Ng Obj") - public R update(@Valid @RequestBody Ng updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Ng List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [缺陷] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Ng Obj") + public R update(@Valid @RequestBody Ng updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [缺陷] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Ng List") + @Operation(summary = "修改批量", description = "传入Ng List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [缺陷] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Ng Obj") - public R submit(@Valid @RequestBody Ng mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [缺陷] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Ng Obj") + public R submit(@Valid @RequestBody Ng mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [缺陷] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Ng List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [缺陷] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [缺陷] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Ng") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportNg(qw); - ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[缺陷]数据表", list, NgExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Ng List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [缺陷] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [缺陷] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Ng") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportNg(qw); + ExcelUtil.export(response, "[缺陷]数据" + DateUtil.time(), + "[缺陷]数据表", list, NgExcel.class); + } + + /** * [缺陷] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [缺陷] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, Ng.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [缺陷] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Ng.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java index 1ad92851..7054a57b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.PlanTestExcel; import org.springblade.desk.quality.pojo.entity.PlanTest; import org.springblade.desk.quality.pojo.vo.PlanTestVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-24 */ @RestController -@RequestMapping("/QA/PlanTest") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/PlanTest") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java index 8e8d86fa..a9c53265 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.ProReTemplateConst; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.pojo.entity.ProReTemplate; import org.springblade.desk.quality.pojo.vo.ProReTemplateVO; @@ -47,7 +48,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/ProReTemplate") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ProReTemplate") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java index fa86dc18..11b437f6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java @@ -20,6 +20,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -48,7 +49,7 @@ import jakarta.servlet.http.HttpServletResponse; * @since 2025-12-30 */ @RestController -@RequestMapping("/ProReTemplateDetail") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ProReTemplateDetail") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java index 905fa26d..c231dbbb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java @@ -20,6 +20,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -48,7 +49,7 @@ import jakarta.servlet.http.HttpServletResponse; * @since 2025-12-30 */ @RestController -@RequestMapping("/ProReTemplateTank") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ProReTemplateTank") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelInsTemplateItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelInsTemplateItemController.java index 68829aa4..5c17e6c8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelInsTemplateItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelInsTemplateItemController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RelInsTemplateItemExcel; import org.springblade.desk.quality.pojo.entity.RelInsTemplateItem; import org.springblade.desk.quality.pojo.vo.RelInsTemplateItemVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-19 */ @RestController -@RequestMapping("/QA/RelInsTemplateItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RelInsTemplateItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankReportItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankReportItemController.java index fbf39291..77e5cd24 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankReportItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankReportItemController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RelTankReportItemExcel; import org.springblade.desk.quality.pojo.entity.RelTankReportItem; import org.springblade.desk.quality.pojo.vo.RelTankReportItemVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-18 */ @RestController -@RequestMapping("/QA/RelTankReportItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RelTankReportItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankWaveItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankWaveItemController.java index 51ac8409..4dce9cdf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankWaveItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankWaveItemController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RelTankWaveItemExcel; import org.springblade.desk.quality.pojo.entity.RelTankWaveItem; import org.springblade.desk.quality.pojo.vo.RelTankWaveItemVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-19 */ @RestController -@RequestMapping("/QA/RelTankWaveItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RelTankWaveItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java index 91ea7233..f692d46d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RemindMsgExcel; import org.springblade.desk.quality.pojo.entity.RemindMsg; import org.springblade.desk.quality.pojo.vo.RemindMsgVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/RemindMsg") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RemindMsg") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java index 93fabbfd..84d73794 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java @@ -24,6 +24,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.StandardExcel; import org.springblade.desk.quality.pojo.entity.Standard; import org.springblade.desk.quality.pojo.vo.StandardVO; @@ -44,7 +45,7 @@ import java.util.stream.Collectors; * @since 2025-12-15 */ @RestController -@RequestMapping("/QA/Standard") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/Standard") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java index 84556b54..b42ff14f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.StandardParamExcel; import org.springblade.desk.quality.pojo.entity.StandardParam; import org.springblade.desk.quality.pojo.vo.StandardParamVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/StandardParam") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/StandardParam") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionController.java index 0a870c4a..21e4aed6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.SupplyInspectionExcel; import org.springblade.desk.quality.pojo.entity.SupplyInspection; import org.springblade.desk.quality.pojo.vo.SupplyInspectionVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/QA/SupplyInspection") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/SupplyInspection") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java index 14ec6b2a..cd708be6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.service.CycleTestTaskService2; import org.springblade.desk.quality.service.TestService; import org.springframework.web.bind.annotation.GetMapping; @@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/QA/Test") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/Test") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/NgExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/NgExcel.java index b9345bdd..b3629354 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/NgExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/NgExcel.java @@ -4,16 +4,15 @@ package org.springblade.desk.quality.excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import org.springblade.core.mp.base.BaseEntity; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java index d70d9b7b..38cd1464 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java @@ -3,13 +3,14 @@ */ package org.springblade.desk.quality.mapper; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java index efc30a87..3d094261 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.quality.pojo.dto; -import org.springblade.desk.quality.pojo.entity.Ng; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Ng; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java index b6b7f2e3..ad148988 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -3,13 +3,14 @@ */ package org.springblade.desk.quality.pojo.entity; -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; -import java.math.BigDecimal; -import org.springblade.core.mp.base.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + import java.io.Serial; +import java.math.BigDecimal; /** * [缺陷] 实体类 @@ -90,7 +91,7 @@ public class Ng extends BaseEntity { * 父级[不良原因]id */ @Schema(description = "父级[不良原因]id") - private BigDecimal parentId; + private Long parentId; /** * 排序 */ @@ -110,7 +111,7 @@ public class Ng extends BaseEntity { * [制品]id */ @Schema(description = "[制品]id") - private BigDecimal productId; + private Long productId; /** * [制品]编码 */ @@ -120,10 +121,10 @@ public class Ng extends BaseEntity { * [工序]id */ @Schema(description = "[工序]id") - private BigDecimal processId; + private Long processId; /** * [工序]编码 */ @Schema(description = "[工序]编码") - private String processCode; + private Long processCode; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java index e2a09db8..115a3654 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.quality.pojo.vo; -import org.springblade.desk.quality.pojo.entity.Ng; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Ng; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java index 6191565b..dc4418e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java @@ -4,11 +4,12 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java index b022af64..b713a1ed 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -3,22 +3,23 @@ */ package org.springblade.desk.quality.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.mapper.NgMapper; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; import org.springblade.desk.quality.service.INgService; -import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java index 6deefe1b..4149c91b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java @@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.Ng; import org.springblade.desk.quality.pojo.vo.NgVO; + import java.util.Objects; /** From c63df34f870d70dff9e383a01891458b865346be Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 5 Jan 2026 10:31:01 +0800 Subject: [PATCH 08/13] =?UTF-8?q?oem=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/feign/IAttachClient.java | 13 +- .../desk/quality/controller/NgController.java | 318 +++++++++--------- .../quality/service/impl/NgServiceImpl.java | 5 +- .../resource/feign/AttachClient.java | 6 + .../desk/basic/constant/OemConst.java | 44 +++ .../desk/basic/controller/OemController.java | 44 ++- .../desk/basic/mapper/OemMapper.java | 3 + .../desk/basic/pojo/entity/Oem.java | 2 +- .../desk/basic/pojo/request/OemSearch.java | 11 + .../desk/basic/service/IOemService.java | 5 + .../basic/service/impl/OemServiceImpl.java | 11 + .../quality/constant/LiquidTankTaskConst.java | 1 - .../controller/IndicatorYearController.java | 2 +- .../IndicatorYearDetailController.java | 2 +- .../controller/PlanTestController.java | 2 +- 15 files changed, 294 insertions(+), 175 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java index 309d29e8..8070473d 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java @@ -20,6 +20,8 @@ public interface IAttachClient { String DETAIL_BY_ID = API_PREFIX + "/detail-by-id"; + String COPY_FROM_TEMP_TO_BIZ_PREFIX = API_PREFIX + "/copy-from-temp-to-biz-prefix"; + /** * * @param attach @@ -29,10 +31,19 @@ public interface IAttachClient { R detail(@RequestBody Attach attach); /** - * todo:改成get * @param id * @return */ @GetMapping(DETAIL_BY_ID) R detailById(@RequestParam("id") Long id); + + /** + * + * @param id + * @param bizPrefix + * @return + */ + @GetMapping(COPY_FROM_TEMP_TO_BIZ_PREFIX) + R copyFromTempToBizPrefix(@RequestParam("id") Long id, + @RequestParam("bizPrefix") String bizPrefix); } diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java index 83fd7c52..bb651df9 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.pojo.entity.Ng; import org.springblade.desk.quality.pojo.vo.NgVO; import org.springblade.desk.quality.excel.NgExcel; @@ -35,8 +34,11 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; +import java.util.stream.Collectors; + import jakarta.servlet.http.HttpServletResponse; /** @@ -55,184 +57,186 @@ import jakarta.servlet.http.HttpServletResponse; public class NgController extends BladeController { @Resource - private INgService service; - - /** - * [缺陷] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Ng Obj") - public R detail(Ng ng) { - QueryWrapper qw = Condition.getQueryWrapper(ng); - Ng detail = service.getOne(qw); - NgVO detailVO = NgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [缺陷] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Ng Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map ng, - Query query) { + private INgService service; + + /** + * [缺陷] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Ng Obj") + public R detail(Ng ng) { + QueryWrapper qw = Condition.getQueryWrapper(ng); + Ng detail = service.getOne(qw); + NgVO detailVO = NgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [缺陷] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Ng Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map ng, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = NgWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [缺陷] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Ng Obj") - public R> page(NgVO ng, Query query) { - IPage pagesVO = service.selectNgPage( - Condition.getPage(query), ng - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = NgWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [缺陷] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Ng Obj") + public R> page(NgVO ng, Query query) { + IPage pagesVO = service.selectNgPage( + Condition.getPage(query), ng + ); + return R.data(pagesVO); + } + + /** * [缺陷] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = NgWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Ng Obj") + public R save(@Valid @RequestBody Ng addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [缺陷] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Ng Obj") - public R save(@Valid @RequestBody Ng addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [缺陷] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Ng List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [缺陷] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Ng Obj") - public R update(@Valid @RequestBody Ng updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Ng List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [缺陷] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Ng Obj") + public R update(@Valid @RequestBody Ng updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [缺陷] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Ng List") + @Operation(summary = "修改批量", description = "传入Ng List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [缺陷] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Ng Obj") - public R submit(@Valid @RequestBody Ng mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [缺陷] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Ng Obj") + public R submit(@Valid @RequestBody Ng mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [缺陷] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Ng List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [缺陷] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [缺陷] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Ng") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportNg(qw); - ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[缺陷]数据表", list, NgExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Ng List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [缺陷] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [缺陷] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Ng") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportNg(qw); + ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[缺陷]数据表", list, NgExcel.class); + } + + /** * [缺陷] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [缺陷] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, Ng.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { +// return ExcelExtUtil.downloadXlsTemplate( +// "Excel/QA/ImportTemplate-CycleTestItem.xls", +// "导入模版-周期试验项目.xls"); + return null; + } + + /** + * [缺陷] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { +// R checkR = ExcelExtUtil.importExcelCheck(file); +// if (checkR != null) { +// return checkR; +// } +// List importList = ExcelUtil.read( +// file, 0, 1, Ng.class +// ); +// return R.status(service.saveBatch(importList)); + return null; + } } diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java index b022af64..4fa1aaa4 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -13,7 +13,6 @@ import org.springblade.desk.quality.pojo.vo.NgVO; import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.mapper.NgMapper; import org.springblade.desk.quality.service.INgService; -import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IDictClient; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -34,8 +33,8 @@ import java.util.List; @Slf4j public class NgServiceImpl extends BaseServiceImpl implements INgService { - @Resource - private IUserClient userClient; +// @Resource +// private IUserClient userClient; @Resource private IDictClient dictClient; diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java index 2fdb059c..078bb9a5 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java @@ -30,4 +30,10 @@ public class AttachClient implements IAttachClient { Attach detail = attachService.getById(id); return R.data(detail); } + + @Override + public R copyFromTempToBizPrefix(Long id, String bizPrefix) { + // todo:有temp桶,成功以后移动到具体业务桶中. + return null; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java new file mode 100644 index 00000000..55e07c7d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java @@ -0,0 +1,44 @@ +package org.springblade.desk.basic.constant; + +public interface OemConst { + + /** + * 正常供货 + */ + Integer S_OK = 0; + /** + * 暂停供货 + */ + Integer S_STOP = 1; + /** + * 暂停新物料采购 + */ + Integer S_STOP_NEW_MAT = 2; + + + /** + * 民品&普军 + */ + Integer QUALIFICATION_0 = 0; + /** + * 军标线 + */ + Integer QUALIFICATION_1 = 1; + /** + * 民品&普军&航军 + */ + Integer QUALIFICATION_2 = 2; + /** + * 民品&普军&军标线 + */ + Integer QUALIFICATION_3 = 3; + /** + * 民品&普军&航军&军标线 + */ + Integer QUALIFICATION_4 = 4; + + + + + String DICT_QUALIFICATION = "Oem-Qualification"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index 110c701e..8231b870 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -25,8 +25,10 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; import org.springblade.desk.basic.service.IOemService; import org.springblade.desk.basic.util.ExcelExtUtil; @@ -78,16 +80,40 @@ public class OemController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 20) @Operation(summary = "list分页", description = "传入Oem Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map oem, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = OemWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); + // 构建search对象。 + OemSearch search = new OemSearch(); + +// if (map.containsKey(Oem.COL_CODE)) { +// search.setCode((Func.toStr(map.get(OemSearch.COL_CODE)))); +// } +// if (map.containsKey(Oem.COL_OC_NAME)) { +// search.setOcName((Func.toStr(map.get(OemSearch.COL_OC_NAME)))); +// } +// if (map.containsKey(Oem.COL_ABBREVIATION)) { +// search.setAbbreviation((Func.toStr(map.get(OemSearch.COL_ABBREVIATION)))); +// } +// if (map.containsKey(OemSearch.COL_QUALIFICATION)) { +// search.setQualification((Func.toInt(map.get(OemSearch.COL_QUALIFICATION)))); +// } +// if (map.containsKey(BaseCol.STATUS)) { +// search.setStatus((Integer) map.get(BaseCol.STATUS)); +// } +// if (map.containsKey(OemSearch.COL_CONTACT_MAN)) { +// search.setContactMan((Func.toStr(map.get(OemSearch.COL_CONTACT_MAN)))); +// } + + +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = OemWrapper.build().pageVO(pages); + +// pagesVO.getRecords() +// .stream() +// .peek(service::setVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); + return null; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java index 72ae9820..692c3739 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java index 3546ce73..42f66146 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -112,7 +112,7 @@ public class Oem extends BaseEntity { * 资质 */ @Schema(description = "资质") - private Short qualification; + private Integer qualification; /** * 联系人 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java new file mode 100644 index 00000000..a122effb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java @@ -0,0 +1,11 @@ +package org.springblade.desk.basic.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + +@Data +@EqualsAndHashCode(callSuper = true) +public class OemSearch extends Oem { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index df2ef9b8..71b1c508 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -9,7 +9,10 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; @@ -44,5 +47,7 @@ public interface IOemService extends BaseService { */ void setVOValue(OemVO vo); + IPage listSearch(IPage page, OemSearch search); + R setPassword(Oem updateOne); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 9361d4ea..5fa344e8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -5,16 +5,19 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; import org.springblade.desk.basic.service.IOemService; import org.springblade.system.feign.IDictClient; @@ -60,6 +63,14 @@ public class OemServiceImpl extends BaseServiceImpl implements I } + @Override + public IPage listSearch(IPage page, OemSearch search) { + // todo: + // Wrapper qw = Wrappers.query().lambda(); + // qw.lambda().eq(CycleTestItem::getTenantId, bladeUser.getTenantId()); // todo: + return null; + } + @Override public R setPassword(Oem updateOne) { Oem find = getById(updateOne.getId()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java index 79f18dd8..4dd2c0dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java @@ -9,7 +9,6 @@ public interface LiquidTankTaskConst { * 来源类型-[2]:周期自动生成; */ Integer FROM_TYPE_PERIODIC = 2; - /** * 来源类型-[3]:计算自动生成; */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java index f36dad20..1c6b2578 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; /** * [年度指标] 控制器 - * + * mes v1: qc_annual_target * @author Tom Shuo * @since 2025-12-22 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java index ac67fffe..60dec0ef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** * [年度指标明细] 控制器 - * + * mes v1: qc_annual_target_detail * @author Tom Shuo * @since 2025-12-23 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java index 7054a57b..0a0b798d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** * [转试记录] 控制器 - * mes v1: + * mes v1: pr_plan_test * @author Tom Shuo * @since 2025-12-24 */ From d7ff3c54c88c3b17da4b533b4a9608414d351b05 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 5 Jan 2026 11:27:24 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E6=97=A0=E7=94=A8=E7=B1=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/controller/NgController.java | 242 ------------------ .../desk/quality/excel/NgExcel.java | 100 -------- .../desk/quality/mapper/NgMapper.java | 39 --- .../desk/quality/mapper/NgMapper.xml | 27 -- .../desk/quality/pojo/dto/NgDTO.java | 23 -- .../desk/quality/pojo/entity/Ng.java | 129 ---------- .../desk/quality/pojo/vo/NgVO.java | 23 -- .../desk/quality/service/INgService.java | 43 ---- .../quality/service/impl/NgServiceImpl.java | 59 ----- .../desk/quality/wrapper/NgWrapper.java | 35 --- 10 files changed, 720 deletions(-) delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java deleted file mode 100644 index bb651df9..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ /dev/null @@ -1,242 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.controller; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; - -import lombok.Data; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import org.springblade.desk.quality.wrapper.NgWrapper; -import org.springblade.desk.quality.service.INgService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; - -import java.util.Map; -import java.util.List; -import java.util.stream.Collectors; - -import jakarta.servlet.http.HttpServletResponse; - -/** - * [缺陷] 控制器 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@RestController -@RequestMapping("/Ng") -@Data -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Slf4j -@Tag(name = "[缺陷]", description = "[缺陷]接口") -public class NgController extends BladeController { - - @Resource - private INgService service; - - /** - * [缺陷] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Ng Obj") - public R detail(Ng ng) { - QueryWrapper qw = Condition.getQueryWrapper(ng); - Ng detail = service.getOne(qw); - NgVO detailVO = NgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [缺陷] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Ng Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map ng, - Query query) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = NgWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [缺陷] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Ng Obj") - public R> page(NgVO ng, Query query) { - IPage pagesVO = service.selectNgPage( - Condition.getPage(query), ng - ); - return R.data(pagesVO); - } - - /** - * [缺陷] list下拉选择 - */ - @GetMapping("/listForSelect") - @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { - List list = service.list(); - List listVO = NgWrapper.build().listVO(list); - return R.data(listVO); - } - - /** - * [缺陷] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Ng Obj") - public R save(@Valid @RequestBody Ng addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** - * [缺陷] 新增批量 - */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Ng List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [缺陷] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Ng Obj") - public R update(@Valid @RequestBody Ng updateOne) { - return R.status(service.updateById(updateOne)); - } - - /** - * [缺陷] 修改批量 - */ - @PostMapping("/updateBat") - @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Ng List") - public R updateBat(@Valid @RequestBody List updateList) { - return R.status(service.updateBatchById(updateList)); - } - - /** - * [缺陷] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Ng Obj") - public R submit(@Valid @RequestBody Ng mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** - * [缺陷] 新增或修改批量 - */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Ng List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [缺陷] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [缺陷] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Ng") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportNg(qw); - ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[缺陷]数据表", list, NgExcel.class); - } - - /** - * [缺陷] 下载Excel模板 - */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { -// return ExcelExtUtil.downloadXlsTemplate( -// "Excel/QA/ImportTemplate-CycleTestItem.xls", -// "导入模版-周期试验项目.xls"); - return null; - } - - /** - * [缺陷] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { -// R checkR = ExcelExtUtil.importExcelCheck(file); -// if (checkR != null) { -// return checkR; -// } -// List importList = ExcelUtil.read( -// file, 0, 1, Ng.class -// ); -// return R.status(service.saveBatch(importList)); - return null; - } -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java deleted file mode 100644 index b9345bdd..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java +++ /dev/null @@ -1,100 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.excel; - - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import org.springblade.core.mp.base.BaseEntity; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import java.io.Serial; - - -/** - * [缺陷] Excel实体类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@Data -@ColumnWidth(25) -@HeadRowHeight(20) -@ContentRowHeight(18) -public class NgExcel implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 编码 - */ - @ColumnWidth(20) - @ExcelProperty("编码") - private String code; - /** - * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; - */ - @ColumnWidth(20) - @ExcelProperty("故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") - private Long ngType; - /** - * 名称 - */ - @ColumnWidth(20) - @ExcelProperty("名称") - private String name; - /** - * 父级[不良原因]id - */ - @ColumnWidth(20) - @ExcelProperty("父级[不良原因]id") - private BigDecimal parentId; - /** - * 排序 - */ - @ColumnWidth(20) - @ExcelProperty("排序") - private Long sort; - /** - * 备注 - */ - @ColumnWidth(20) - @ExcelProperty("备注") - private String remark; - /** - * 缺陷描述 - */ - @ColumnWidth(20) - @ExcelProperty("缺陷描述") - private String desc; - /** - * [制品]id - */ - @ColumnWidth(20) - @ExcelProperty("[制品]id") - private BigDecimal productId; - /** - * [制品]编码 - */ - @ColumnWidth(20) - @ExcelProperty("[制品]编码") - private String productCode; - /** - * [工序]id - */ - @ColumnWidth(20) - @ExcelProperty("[工序]id") - private BigDecimal processId; - /** - * [工序]编码 - */ - @ColumnWidth(20) - @ExcelProperty("[工序]编码") - private String processCode; -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java deleted file mode 100644 index d70d9b7b..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.mapper; - -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import java.util.List; - -/** - * [缺陷] Mapper 接口 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -public interface NgMapper extends BaseMapper { - - /** - * 自定义分页 - * - * @param page 分页参数 - * @param ng 查询参数 - * @return List - */ - List selectNgPage(IPage page, NgVO ng); - - /** - * 获取导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportNg(@Param("ew") Wrapper queryWrapper); -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml deleted file mode 100644 index ac77b49d..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java deleted file mode 100644 index efc30a87..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.pojo.dto; - -import org.springblade.desk.quality.pojo.entity.Ng; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -/** - * [缺陷] 数据传输对象实体类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class NgDTO extends Ng { - @Serial - private static final long serialVersionUID = 1L; - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java deleted file mode 100644 index b6b7f2e3..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java +++ /dev/null @@ -1,129 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.pojo.entity; - -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; -import com.baomidou.mybatisplus.annotation.TableName; -import java.math.BigDecimal; -import org.springblade.core.mp.base.BaseEntity; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -/** - * [缺陷] 实体类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@Data -@TableName("QA_NG") -@Schema(description = "Ng Entity对象") -@EqualsAndHashCode(callSuper = true) -public class Ng extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 编码 - */ - public static final String COL_CODE = "CODE"; - /** - * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; - */ - public static final String COL_NG_TYPE = "NG_TYPE"; - /** - * 名称 - */ - public static final String COL_NAME = "NAME"; - /** - * 父级[不良原因]id - */ - public static final String COL_PARENT_ID = "PARENT_ID"; - /** - * 排序 - */ - public static final String COL_SORT = "SORT"; - /** - * 备注 - */ - public static final String COL_REMARK = "REMARK"; - /** - * 缺陷描述 - */ - public static final String COL_DESC = "DESC"; - /** - * [制品]id - */ - public static final String COL_PRODUCT_ID = "PRODUCT_ID"; - /** - * [制品]编码 - */ - public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; - /** - * [工序]id - */ - public static final String COL_PROCESS_ID = "PROCESS_ID"; - /** - * [工序]编码 - */ - public static final String COL_PROCESS_CODE = "PROCESS_CODE"; - - /** - * 编码 - */ - @Schema(description = "编码") - private String code; - /** - * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; - */ - @Schema(description = "故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") - private Long ngType; - /** - * 名称 - */ - @Schema(description = "名称") - private String name; - /** - * 父级[不良原因]id - */ - @Schema(description = "父级[不良原因]id") - private BigDecimal parentId; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 缺陷描述 - */ - @Schema(description = "缺陷描述") - private String desc; - /** - * [制品]id - */ - @Schema(description = "[制品]id") - private BigDecimal productId; - /** - * [制品]编码 - */ - @Schema(description = "[制品]编码") - private String productCode; - /** - * [工序]id - */ - @Schema(description = "[工序]id") - private BigDecimal processId; - /** - * [工序]编码 - */ - @Schema(description = "[工序]编码") - private String processCode; -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java deleted file mode 100644 index e2a09db8..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.pojo.vo; - -import org.springblade.desk.quality.pojo.entity.Ng; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -/** - * [缺陷] 视图实体类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class NgVO extends Ng { - @Serial - private static final long serialVersionUID = 1L; - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java deleted file mode 100644 index 6191565b..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.service; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseService; -import java.util.List; - -/** - * [缺陷] 服务类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -public interface INgService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param ng 查询参数 - * @return IPage - */ - IPage selectNgPage(IPage page, NgVO ng); - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportNg(Wrapper queryWrapper); - - /** - * VO - * @param vo - */ - void setVOValue(NgVO vo); -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java deleted file mode 100644 index 4fa1aaa4..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.service.impl; - -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import org.springblade.desk.quality.mapper.NgMapper; -import org.springblade.desk.quality.service.INgService; -import org.springblade.system.feign.IDictClient; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; -import java.util.List; - -/** - * [缺陷] 服务实现类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@Service -@Data -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Slf4j -public class NgServiceImpl extends BaseServiceImpl implements INgService { - -// @Resource -// private IUserClient userClient; - @Resource - private IDictClient dictClient; - - @Override - public IPage selectNgPage(IPage page, NgVO ng) { - return page.setRecords(baseMapper.selectNgPage(page, ng)); - } - - @Override - public List exportNg(Wrapper queryWrapper) { - List ngList = baseMapper.exportNg(queryWrapper); - //ngList.forEach(ng -> { - // ng.setTypeName(DictCache.getValue(DictEnum.YES_NO, Ng.getType())); - //}); - return ngList; - } - - @Override - public void setVOValue(NgVO vo) { - - } -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java deleted file mode 100644 index 6deefe1b..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.wrapper; - -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import java.util.Objects; - -/** - * [缺陷] 包装类,返回视图层所需的字段 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -public class NgWrapper extends BaseEntityWrapper { - - public static NgWrapper build() { - return new NgWrapper(); - } - - @Override - public NgVO entityVO(Ng ng) { - NgVO VO = Objects.requireNonNull(BeanUtil.copyProperties(ng, NgVO.class)); - - //User createUser = UserCache.getUser(ng.getCreateUser()); - //User updateUser = UserCache.getUser(ng.getUpdateUser()); - //ngVO.setCreateUserName(createUser.getName()); - //ngVO.setUpdateUserName(updateUser.getName()); - - return VO; - } -} From 7db431342f41d959b3de756b93c6d6ff7c18b831 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 5 Jan 2026 16:21:31 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/PlatingController.java | 238 ++++++++++++++++ .../desk/basic/excel/PlatingExcel.java | 125 +++++++++ .../desk/basic/mapper/PlatingMapper.java | 39 +++ .../desk/basic/mapper/PlatingMapper.xml | 31 +++ .../desk/basic/pojo/dto/PlatingDTO.java | 23 ++ .../desk/basic/pojo/entity/Plating.java | 166 ++++++++++++ .../desk/basic/pojo/vo/PlatingVO.java | 23 ++ .../desk/basic/service/IPlatingService.java | 43 +++ .../service/impl/PlatingServiceImpl.java | 60 ++++ .../desk/basic/wrapper/PlatingWrapper.java | 35 +++ .../test/resources/templates/code.properties | 2 +- .../desk/basic/constant/BasicClazzConst.java | 61 +++++ .../controller/BasicClazzController.java | 256 ++++++++++++++++++ .../basic/controller/BatConfigController.java | 3 +- .../CoatingThicknessController.java | 238 ++++++++++++++++ .../basic/controller/FormulaController.java | 4 +- .../LocallyPlatedPartController.java | 238 ++++++++++++++++ .../controller/MaterialQuotaController.java | 238 ++++++++++++++++ .../desk/basic/controller/OemController.java | 20 +- .../controller/PlanAssignSteerController.java | 238 ++++++++++++++++ .../basic/controller/PlatingController.java | 238 ++++++++++++++++ .../controller/PlatingSmallController.java | 239 ++++++++++++++++ .../controller/ProcessAbilityController.java | 4 +- .../basic/controller/ProdMarkController.java | 2 +- .../basic/controller/ShiftsController.java | 238 ++++++++++++++++ .../basic/controller/TeamSetController.java | 4 +- .../controller/WorkCenterController.java | 4 +- .../basic/controller/WorkTankController.java | 4 +- .../desk/basic/excel/BasicClazzExcel.java | 62 +++++ .../basic/excel/CoatingThicknessExcel.java | 74 +++++ .../basic/excel/LocallyPlatedPartExcel.java | 62 +++++ .../desk/basic/excel/MaterialQuotaExcel.java | 87 ++++++ .../basic/excel/PlanAssignSteerExcel.java | 94 +++++++ .../desk/basic/excel/PlatingExcel.java | 123 +++++++++ .../desk/basic/excel/PlatingSmallExcel.java | 63 +++++ .../desk/basic/excel/ShiftsExcel.java | 62 +++++ .../desk/basic/mapper/BasicClazzMapper.java | 40 +++ .../desk/basic/mapper/BasicClazzMapper.xml | 21 ++ .../basic/mapper/CoatingThicknessMapper.java | 40 +++ .../basic/mapper/CoatingThicknessMapper.xml | 23 ++ .../basic/mapper/LocallyPlatedPartMapper.java | 40 +++ .../basic/mapper/LocallyPlatedPartMapper.xml | 21 ++ .../basic/mapper/MaterialQuotaMapper.java | 40 +++ .../desk/basic/mapper/MaterialQuotaMapper.xml | 25 ++ .../basic/mapper/PlanAssignSteerMapper.java | 40 +++ .../basic/mapper/PlanAssignSteerMapper.xml | 26 ++ .../desk/basic/mapper/PlatingMapper.java | 40 +++ .../desk/basic/mapper/PlatingMapper.xml | 31 +++ .../desk/basic/mapper/PlatingSmallMapper.java | 40 +++ .../desk/basic/mapper/PlatingSmallMapper.xml | 21 ++ .../desk/basic/mapper/ShiftsMapper.java | 40 +++ .../desk/basic/mapper/ShiftsMapper.xml | 21 ++ .../desk/basic/pojo/dto/BasicClazzDTO.java | 24 ++ .../basic/pojo/dto/CoatingThicknessDTO.java | 24 ++ .../basic/pojo/dto/LocallyPlatedPartDTO.java | 24 ++ .../desk/basic/pojo/dto/MaterialQuotaDTO.java | 24 ++ .../basic/pojo/dto/PlanAssignSteerDTO.java | 24 ++ .../desk/basic/pojo/dto/PlatingDTO.java | 24 ++ .../desk/basic/pojo/dto/PlatingSmallDTO.java | 24 ++ .../desk/basic/pojo/dto/ShiftsDTO.java | 24 ++ .../desk/basic/pojo/entity/BasicClazz.java | 78 ++++++ .../desk/basic/pojo/entity/BatConfig.java | 9 +- .../basic/pojo/entity/CoatingThickness.java | 93 +++++++ .../basic/pojo/entity/LocallyPlatedPart.java | 75 +++++ .../desk/basic/pojo/entity/MaterialQuota.java | 111 ++++++++ .../basic/pojo/entity/PlanAssignSteer.java | 121 +++++++++ .../desk/basic/pojo/entity/Plating.java | 166 ++++++++++++ .../desk/basic/pojo/entity/PlatingSmall.java | 76 ++++++ .../basic/pojo/entity/ProcessAbility.java | 5 +- .../desk/basic/pojo/entity/ProdMark.java | 2 +- .../desk/basic/pojo/entity/Shifts.java | 75 +++++ .../desk/basic/pojo/vo/BasicClazzVO.java | 24 ++ .../basic/pojo/vo/CoatingThicknessVO.java | 24 ++ .../basic/pojo/vo/LocallyPlatedPartVO.java | 24 ++ .../desk/basic/pojo/vo/MaterialQuotaVO.java | 24 ++ .../desk/basic/pojo/vo/PlanAssignSteerVO.java | 24 ++ .../desk/basic/pojo/vo/PlatingSmallVO.java | 24 ++ .../desk/basic/pojo/vo/PlatingVO.java | 24 ++ .../desk/basic/pojo/vo/ShiftsVO.java | 24 ++ .../basic/service/IBasicClazzService.java | 44 +++ .../service/ICoatingThicknessService.java | 44 +++ .../service/ILocallyPlatedPartService.java | 44 +++ .../basic/service/IMaterialQuotaService.java | 44 +++ .../service/IPlanAssignSteerService.java | 44 +++ .../desk/basic/service/IPlatingService.java | 44 +++ .../basic/service/IPlatingSmallService.java | 44 +++ .../desk/basic/service/IShiftsService.java | 44 +++ .../service/impl/BasicClazzServiceImpl.java | 61 +++++ .../impl/CoatingThicknessServiceImpl.java | 61 +++++ .../impl/LocallyPlatedPartServiceImpl.java | 61 +++++ .../impl/MaterialQuotaServiceImpl.java | 61 +++++ .../impl/PlanAssignSteerServiceImpl.java | 61 +++++ .../service/impl/PlatingServiceImpl.java | 61 +++++ .../service/impl/PlatingSmallServiceImpl.java | 61 +++++ .../basic/service/impl/ShiftsServiceImpl.java | 61 +++++ .../desk/basic/wrapper/BasicClazzWrapper.java | 36 +++ .../wrapper/CoatingThicknessWrapper.java | 36 +++ .../wrapper/LocallyPlatedPartWrapper.java | 36 +++ .../basic/wrapper/MaterialQuotaWrapper.java | 36 +++ .../basic/wrapper/PlanAssignSteerWrapper.java | 36 +++ .../basic/wrapper/PlatingSmallWrapper.java | 36 +++ .../desk/basic/wrapper/PlatingWrapper.java | 36 +++ .../desk/basic/wrapper/ShiftsWrapper.java | 36 +++ 103 files changed, 6241 insertions(+), 32 deletions(-) create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BasicClazzConst.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/BasicClazzExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/LocallyPlatedPartExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/ShiftsExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IBasicClazzService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICoatingThicknessService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlanAssignSteerService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingSmallService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IShiftsService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BasicClazzServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CoatingThicknessServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ShiftsServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/BasicClazzWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/CoatingThicknessWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/LocallyPlatedPartWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/MaterialQuotaWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlanAssignSteerWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingSmallWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/ShiftsWrapper.java diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java new file mode 100644 index 00000000..8fc3b0f7 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; + +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.wrapper.PlatingWrapper; +import org.springblade.desk.basic.service.IPlatingService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import java.util.Map; +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + +/** + * [镀种] 控制器 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping("/Plating") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[镀种]", description = "[镀种]接口") +public class PlatingController extends BladeController { + + @Resource + private IPlatingService service; + + /** + * [镀种] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Plating Obj") + public R detail(Plating plating) { + QueryWrapper qw = Condition.getQueryWrapper(plating); + Plating detail = service.getOne(qw); + PlatingVO detailVO = PlatingWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀种] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Plating Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map plating, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlatingWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀种] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Plating Obj") + public R> page(PlatingVO plating, Query query) { + IPage pagesVO = service.selectPlatingPage( + Condition.getPage(query), plating + ); + return R.data(pagesVO); + } + + /** + * [镀种] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = PlatingWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀种] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Plating Obj") + public R save(@Valid @RequestBody Plating addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [镀种] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Plating List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [镀种] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Plating Obj") + public R update(@Valid @RequestBody Plating updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [镀种] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Plating List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [镀种] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Plating Obj") + public R submit(@Valid @RequestBody Plating mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [镀种] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Plating List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [镀种] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [镀种] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Plating") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map plating, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Plating::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlatingEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlating(qw); + ExcelUtil.export(response, "[镀种]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[镀种]数据表", list, PlatingExcel.class); + } + + /** + * [镀种] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [镀种] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Plating.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java new file mode 100644 index 00000000..6bfa41ab --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java @@ -0,0 +1,125 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import lombok.Data; + +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import java.math.BigDecimal; +import org.springblade.core.mp.base.BaseEntity; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serial; + + +/** + * [镀种] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlatingExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + @ColumnWidth(20) + @ExcelProperty("流水号") + private BigDecimal platId; + /** + * 配置码 + */ + @ColumnWidth(20) + @ExcelProperty("配置码") + private String configNo; + /** + * [镀种分类]id + */ + @ColumnWidth(20) + @ExcelProperty("[镀种分类]id") + private BigDecimal bcId; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plating; + /** + * 材料 + */ + @ColumnWidth(20) + @ExcelProperty("材料") + private String material; + /** + * 硬度 + */ + @ColumnWidth(20) + @ExcelProperty("硬度") + private String hardness; + /** + * 镀层编码 + */ + @ColumnWidth(20) + @ExcelProperty("镀层编码") + private String matCode; + /** + * 材料状态 + */ + @ColumnWidth(20) + @ExcelProperty("材料状态") + private String matState; + /** + * 镀种小类 + */ + @ColumnWidth(20) + @ExcelProperty("镀种小类") + private Long subClass; + /** + * 其他要求 + */ + @ColumnWidth(20) + @ExcelProperty("其他要求") + private String memo; + /** + * 镀层代号 + */ + @ColumnWidth(20) + @ExcelProperty("镀层代号") + private String plateCode; + /** + * 镀层物料 + */ + @ColumnWidth(20) + @ExcelProperty("镀层物料") + private String plateGoodsCode; + /** + * 镀层厚度 + */ + @ColumnWidth(20) + @ExcelProperty("镀层厚度") + private String plateThickness; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java new file mode 100644 index 00000000..686edde4 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.excel.PlatingExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * [镀种] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface PlatingMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param plating 查询参数 + * @return List + */ + List selectPlatingPage(IPage page, PlatingVO plating); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlating(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml new file mode 100644 index 00000000..a384c9bb --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java new file mode 100644 index 00000000..3afc59f0 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import org.springblade.desk.basic.pojo.entity.Plating; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [镀种] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingDTO extends Plating { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java new file mode 100644 index 00000000..b4ca3b67 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java @@ -0,0 +1,166 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import org.springblade.core.mp.base.BaseEntity; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [镀种] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_PLATING") +@Schema(description = "Plating Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Plating extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + public static final String COL_PLAT_ID = "PLAT_ID"; + /** + * 配置码 + */ + public static final String COL_CONFIG_NO = "CONFIG_NO"; + /** + * [镀种分类]id + */ + public static final String COL_BC_ID = "BC_ID"; + /** + * 镀种 + */ + public static final String COL_PLATING = "PLATING"; + /** + * 材料 + */ + public static final String COL_MATERIAL = "MATERIAL"; + /** + * 硬度 + */ + public static final String COL_HARDNESS = "HARDNESS"; + /** + * 镀层编码 + */ + public static final String COL_MAT_CODE = "MAT_CODE"; + /** + * 材料状态 + */ + public static final String COL_MAT_STATE = "MAT_STATE"; + /** + * 镀种小类 + */ + public static final String COL_SUB_CLASS = "SUB_CLASS"; + /** + * 其他要求 + */ + public static final String COL_MEMO = "MEMO"; + /** + * 镀层代号 + */ + public static final String COL_PLATE_CODE = "PLATE_CODE"; + /** + * 镀层物料 + */ + public static final String COL_PLATE_GOODS_CODE = "PLATE_GOODS_CODE"; + /** + * 镀层厚度 + */ + public static final String COL_PLATE_THICKNESS = "PLATE_THICKNESS"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 流水号 + */ + @Schema(description = "流水号") + private BigDecimal platId; + /** + * 配置码 + */ + @Schema(description = "配置码") + private String configNo; + /** + * [镀种分类]id + */ + @Schema(description = "[镀种分类]id") + private BigDecimal bcId; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plating; + /** + * 材料 + */ + @Schema(description = "材料") + private String material; + /** + * 硬度 + */ + @Schema(description = "硬度") + private String hardness; + /** + * 镀层编码 + */ + @Schema(description = "镀层编码") + private String matCode; + /** + * 材料状态 + */ + @Schema(description = "材料状态") + private String matState; + /** + * 镀种小类 + */ + @Schema(description = "镀种小类") + private Long subClass; + /** + * 其他要求 + */ + @Schema(description = "其他要求") + private String memo; + /** + * 镀层代号 + */ + @Schema(description = "镀层代号") + private String plateCode; + /** + * 镀层物料 + */ + @Schema(description = "镀层物料") + private String plateGoodsCode; + /** + * 镀层厚度 + */ + @Schema(description = "镀层厚度") + private String plateThickness; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java new file mode 100644 index 00000000..c7ab1b7a --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import org.springblade.desk.basic.pojo.entity.Plating; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [镀种] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingVO extends Plating { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java new file mode 100644 index 00000000..4d3842af --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.excel.PlatingExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [镀种] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IPlatingService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param plating 查询参数 + * @return IPage + */ + IPage selectPlatingPage(IPage page, PlatingVO plating); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlating(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(PlatingVO vo); +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java new file mode 100644 index 00000000..52b4fd87 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.mapper.PlatingMapper; +import org.springblade.desk.basic.service.IPlatingService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.feign.IDictClient; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * [镀种] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class PlatingServiceImpl extends BaseServiceImpl implements IPlatingService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectPlatingPage(IPage page, PlatingVO plating) { + return page.setRecords(baseMapper.selectPlatingPage(page, plating)); + } + + @Override + public List exportPlating(Wrapper queryWrapper) { + List platingList = baseMapper.exportPlating(queryWrapper); + //platingList.forEach(plating -> { + // plating.setTypeName(DictCache.getValue(DictEnum.YES_NO, Plating.getType())); + //}); + return platingList; + } + + @Override + public void setVOValue(PlatingVO vo) { + + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java new file mode 100644 index 00000000..92b27fff --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java @@ -0,0 +1,35 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import java.util.Objects; + +/** + * [镀种] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class PlatingWrapper extends BaseEntityWrapper { + + public static PlatingWrapper build() { + return new PlatingWrapper(); + } + + @Override + public PlatingVO entityVO(Plating plating) { + PlatingVO VO = Objects.requireNonNull(BeanUtil.copyProperties(plating, PlatingVO.class)); + + //User createUser = UserCache.getUser(plating.getCreateUser()); + //User updateUser = UserCache.getUser(plating.getUpdateUser()); + //platingVO.setCreateUserName(createUser.getName()); + //platingVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/code.properties b/blade-ops/blade-develop/src/test/resources/templates/code.properties index 0f392d89..dbbe261a 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/code.properties +++ b/blade-ops/blade-develop/src/test/resources/templates/code.properties @@ -6,7 +6,7 @@ # CodeGenerator spring.datasource.driver-class-name=oracle.jdbc.OracleDriver -spring.datasource.url=jdbc:oracle:thin:@192.168.0.221:1521/orcl +spring.datasource.url=jdbc:oracle:thin:@172.31.31.31:1521/orcl #spring.datasource.url=jdbc:oracle:thin:@172.18.80.50:1521/orcl spring.datasource.username=JONHON_MES spring.datasource.password=oracle123456 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BasicClazzConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BasicClazzConst.java new file mode 100644 index 00000000..0dd50467 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BasicClazzConst.java @@ -0,0 +1,61 @@ +package org.springblade.desk.basic.constant; + +public interface BasicClazzConst { + + /** + * 物料标记 + */ + Integer TYPE_FLAG = 1; + /** + * 出库原因 + */ + Integer TYPE_OUT_STORE = 2; + /** + * 退库原因 + */ + Integer TYPE_TK_STORE = 3; + /** + * 简单原因 + */ + Integer TYPE_POOR_REASON = 4; + /** + * 镀种分类 + */ + Integer TYPE_PLATING_ASSORT = 5; + /** + * IOT获取挂次号接口保存 + */ + Integer TYPE_SUSPENSION_NO = 6; + /** + * 外协匹配规则 + */ + Integer TYPE_RULE = 7; + /** + * 排除部门 + */ + Integer TYPE_EXCLUDE_DIVISION = 8; + /** + * 异常配置 + */ + Integer TYPE_ABNORMAL_CONFIG = 9; + /** + * 成本类型 + */ + Integer TYPE_COST_TYPE = 10; + /** + * 烧结转试验计划 + */ + Integer TYPE_TEST_TYPE = 11; + /** + * 绩效模板 + */ + Integer TYPE_JXMB = 12; + /** + * 重点工作类型 + */ + Integer TYPE_ZDGZLX = 13; + /** + * 绩效模板 + */ + Integer TYPE_NOTICE = 14; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java new file mode 100644 index 00000000..d13d0e08 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java @@ -0,0 +1,256 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.constant.BasicClazzConst; +import org.springblade.desk.basic.excel.BasicClazzExcel; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; +import org.springblade.desk.basic.service.IBasicClazzService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.BasicClazzWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [基础分类] 控制器 + * mes v1: bs_basic_class + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/BasicClazz") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][基础分类]", description = "[基础分类]接口") +public class BasicClazzController extends BladeController { + + @Resource + private IBasicClazzService service; + + /** + * [基础分类] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入BasicClazz Obj") + public R detail(BasicClazz basicClazz) { + QueryWrapper qw = Condition.getQueryWrapper(basicClazz); + BasicClazz detail = service.getOne(qw); + BasicClazzVO detailVO = BasicClazzWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [基础分类] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入BasicClazz Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map basicClazz, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(basicClazz, BasicClazz.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = BasicClazzWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [基础分类] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入BasicClazz Obj") + public R> page(BasicClazzVO basicClazz, Query query) { + IPage pagesVO = service.selectBasicClazzPage( + Condition.getPage(query), basicClazz + ); + return R.data(pagesVO); + } + + /** + * [基础分类] list下拉选择 镀种分类 + */ + @GetMapping("/listForSelectPlatingAssort") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择 镀种分类", description = "") + public R> listForSelectPlatingAssort() { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(BasicClazz::getBizType, BasicClazzConst.TYPE_PLATING_ASSORT); + List list = service.list(qw); + List listVO = BasicClazzWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [基础分类] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = BasicClazzWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [基础分类] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入BasicClazz Obj") + public R save(@Valid @RequestBody BasicClazz addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [基础分类] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入BasicClazz List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [基础分类] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入BasicClazz Obj") + public R update(@Valid @RequestBody BasicClazz updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [基础分类] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入BasicClazz List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [基础分类] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入BasicClazz Obj") + public R submit(@Valid @RequestBody BasicClazz mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [基础分类] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入BasicClazz List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [基础分类] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [基础分类] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入BasicClazz") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map basicClazz, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(basicClazz, BasicClazz.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicClazz::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BasicClazzEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportBasicClazz(qw); + ExcelUtil.export(response, "[基础分类]数据" + DateUtil.time(), + "[基础分类]数据表", list, BasicClazzExcel.class); + } + + /** + * [基础分类] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [基础分类] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BasicClazz.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java index 50043f69..1a021cd2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; /** * [批量配置] 控制器 + * mes v1: bs_craft_set * * @author Tom Shuo * @since 2025-12-22 @@ -51,7 +52,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[批量配置]", description = "[批量配置]接口") +@Tag(name = "[BA][批量配置]", description = "[批量配置]接口") public class BatConfigController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java new file mode 100644 index 00000000..cf4366b9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; +import org.springblade.desk.basic.service.ICoatingThicknessService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.CoatingThicknessWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [镀层厚度对应] 控制器 + * mes v1: 新加 + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/CoatingThickness") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][镀层厚度对应]", description = "[镀层厚度对应]接口") +public class CoatingThicknessController extends BladeController { + + @Resource + private ICoatingThicknessService service; + + /** + * [镀层厚度对应] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入CoatingThickness Obj") + public R detail(CoatingThickness coatingThickness) { + QueryWrapper qw = Condition.getQueryWrapper(coatingThickness); + CoatingThickness detail = service.getOne(qw); + CoatingThicknessVO detailVO = CoatingThicknessWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀层厚度对应] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入CoatingThickness Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map coatingThickness, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(coatingThickness, CoatingThickness.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = CoatingThicknessWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀层厚度对应] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入CoatingThickness Obj") + public R> page(CoatingThicknessVO coatingThickness, Query query) { + IPage pagesVO = service.selectCoatingThicknessPage( + Condition.getPage(query), coatingThickness + ); + return R.data(pagesVO); + } + + /** + * [镀层厚度对应] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = CoatingThicknessWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀层厚度对应] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入CoatingThickness Obj") + public R save(@Valid @RequestBody CoatingThickness addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [镀层厚度对应] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入CoatingThickness List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [镀层厚度对应] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入CoatingThickness Obj") + public R update(@Valid @RequestBody CoatingThickness updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [镀层厚度对应] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入CoatingThickness List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [镀层厚度对应] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入CoatingThickness Obj") + public R submit(@Valid @RequestBody CoatingThickness mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [镀层厚度对应] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入CoatingThickness List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [镀层厚度对应] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [镀层厚度对应] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入CoatingThickness") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map coatingThickness, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(coatingThickness, CoatingThickness.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CoatingThickness::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CoatingThicknessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportCoatingThickness(qw); + ExcelUtil.export(response, "[镀层厚度对应]数据" + DateUtil.time(), + "[镀层厚度对应]数据表", list, CoatingThicknessExcel.class); + } + + /** + * [镀层厚度对应] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [镀层厚度对应] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, CoatingThickness.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index 1422781a..68d055a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -39,7 +39,7 @@ import java.util.Map; /** * [计算公式] 控制器 - * + * mes v1: 新加 * @author Tom Shuo * @since 2025-12-16 */ @@ -48,7 +48,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Tag(name = "[计算公式]", description = "[计算公式]接口") +@Tag(name = "[BA][计算公式]", description = "[计算公式]接口") public class FormulaController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java new file mode 100644 index 00000000..a19ab08a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; +import org.springblade.desk.basic.service.ILocallyPlatedPartService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.LocallyPlatedPartWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [局部镀零件] 控制器 + * mes v1: 新加 + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/LocallyPlatedPart") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][局部镀零件]", description = "[局部镀零件]接口") +public class LocallyPlatedPartController extends BladeController { + + @Resource + private ILocallyPlatedPartService service; + + /** + * [局部镀零件] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入LocallyPlatedPart Obj") + public R detail(LocallyPlatedPart locallyPlatedPart) { + QueryWrapper qw = Condition.getQueryWrapper(locallyPlatedPart); + LocallyPlatedPart detail = service.getOne(qw); + LocallyPlatedPartVO detailVO = LocallyPlatedPartWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [局部镀零件] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入LocallyPlatedPart Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map locallyPlatedPart, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(locallyPlatedPart, LocallyPlatedPart.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = LocallyPlatedPartWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [局部镀零件] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入LocallyPlatedPart Obj") + public R> page(LocallyPlatedPartVO locallyPlatedPart, Query query) { + IPage pagesVO = service.selectLocallyPlatedPartPage( + Condition.getPage(query), locallyPlatedPart + ); + return R.data(pagesVO); + } + + /** + * [局部镀零件] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = LocallyPlatedPartWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [局部镀零件] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入LocallyPlatedPart Obj") + public R save(@Valid @RequestBody LocallyPlatedPart addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [局部镀零件] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入LocallyPlatedPart List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [局部镀零件] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入LocallyPlatedPart Obj") + public R update(@Valid @RequestBody LocallyPlatedPart updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [局部镀零件] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入LocallyPlatedPart List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [局部镀零件] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入LocallyPlatedPart Obj") + public R submit(@Valid @RequestBody LocallyPlatedPart mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [局部镀零件] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入LocallyPlatedPart List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [局部镀零件] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [局部镀零件] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入LocallyPlatedPart") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map locallyPlatedPart, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(locallyPlatedPart, LocallyPlatedPart.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(LocallyPlatedPart::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(LocallyPlatedPartEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportLocallyPlatedPart(qw); + ExcelUtil.export(response, "[局部镀零件]数据" + DateUtil.time(), + "[局部镀零件]数据表", list, LocallyPlatedPartExcel.class); + } + + /** + * [局部镀零件] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [局部镀零件] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, LocallyPlatedPart.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java new file mode 100644 index 00000000..1c4139a0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; +import org.springblade.desk.basic.service.IMaterialQuotaService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.MaterialQuotaWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [物料定额] 控制器 + * mes v1: 新加 + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/MaterialQuota") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][物料定额]", description = "[物料定额]接口") +public class MaterialQuotaController extends BladeController { + + @Resource + private IMaterialQuotaService service; + + /** + * [物料定额] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入MaterialQuota Obj") + public R detail(MaterialQuota materialQuota) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota); + MaterialQuota detail = service.getOne(qw); + MaterialQuotaVO detailVO = MaterialQuotaWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [物料定额] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入MaterialQuota Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map materialQuota, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = MaterialQuotaWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [物料定额] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入MaterialQuota Obj") + public R> page(MaterialQuotaVO materialQuota, Query query) { + IPage pagesVO = service.selectMaterialQuotaPage( + Condition.getPage(query), materialQuota + ); + return R.data(pagesVO); + } + + /** + * [物料定额] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = MaterialQuotaWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [物料定额] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入MaterialQuota Obj") + public R save(@Valid @RequestBody MaterialQuota addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [物料定额] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入MaterialQuota List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [物料定额] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入MaterialQuota Obj") + public R update(@Valid @RequestBody MaterialQuota updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [物料定额] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入MaterialQuota List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [物料定额] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入MaterialQuota Obj") + public R submit(@Valid @RequestBody MaterialQuota mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [物料定额] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入MaterialQuota List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [物料定额] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [物料定额] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入MaterialQuota") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map materialQuota, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(MaterialQuota::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(MaterialQuotaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportMaterialQuota(qw); + ExcelUtil.export(response, "[物料定额]数据" + DateUtil.time(), + "[物料定额]数据表", list, MaterialQuotaExcel.class); + } + + /** + * [物料定额] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [物料定额] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, MaterialQuota.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index 8231b870..2382e0ff 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -27,6 +27,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; @@ -54,7 +55,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[外协厂家]", description = "[外协厂家]接口") +@Tag(name = "[BA][外协厂家]", description = "[外协厂家]接口") public class OemController extends BladeController { @Resource @@ -104,16 +105,15 @@ public class OemController extends BladeController { // search.setContactMan((Func.toStr(map.get(OemSearch.COL_CONTACT_MAN)))); // } + QueryWrapper qw = Condition.getQueryWrapper(map, Oem.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = OemWrapper.build().pageVO(pages); -// IPage pages = service.page(Condition.getPage(query), qw); -// IPage pagesVO = OemWrapper.build().pageVO(pages); - -// pagesVO.getRecords() -// .stream() -// .peek(service::setVOValue) -// .collect(Collectors.toList()); -// return R.data(pagesVO); - return null; + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java new file mode 100644 index 00000000..22da8b08 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; +import org.springblade.desk.basic.service.IPlanAssignSteerService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.PlanAssignSteerWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [外协分派] 控制器 + * mes v1: bs_plan_assign_steer + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/PlanAssignSteer") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][外协分派]", description = "[外协分派]接口") +public class PlanAssignSteerController extends BladeController { + + @Resource + private IPlanAssignSteerService service; + + /** + * [外协分派] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入PlanAssignSteer Obj") + public R detail(PlanAssignSteer planAssignSteer) { + QueryWrapper qw = Condition.getQueryWrapper(planAssignSteer); + PlanAssignSteer detail = service.getOne(qw); + PlanAssignSteerVO detailVO = PlanAssignSteerWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [外协分派] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入PlanAssignSteer Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map planAssignSteer, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(planAssignSteer, PlanAssignSteer.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlanAssignSteerWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [外协分派] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入PlanAssignSteer Obj") + public R> page(PlanAssignSteerVO planAssignSteer, Query query) { + IPage pagesVO = service.selectPlanAssignSteerPage( + Condition.getPage(query), planAssignSteer + ); + return R.data(pagesVO); + } + + /** + * [外协分派] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = PlanAssignSteerWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [外协分派] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入PlanAssignSteer Obj") + public R save(@Valid @RequestBody PlanAssignSteer addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [外协分派] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入PlanAssignSteer List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [外协分派] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入PlanAssignSteer Obj") + public R update(@Valid @RequestBody PlanAssignSteer updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [外协分派] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入PlanAssignSteer List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [外协分派] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入PlanAssignSteer Obj") + public R submit(@Valid @RequestBody PlanAssignSteer mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [外协分派] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入PlanAssignSteer List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [外协分派] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [外协分派] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入PlanAssignSteer") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map planAssignSteer, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(planAssignSteer, PlanAssignSteer.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(PlanAssignSteer::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlanAssignSteerEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlanAssignSteer(qw); + ExcelUtil.export(response, "[外协分派]数据" + DateUtil.time(), + "[外协分派]数据表", list, PlanAssignSteerExcel.class); + } + + /** + * [外协分派] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [外协分派] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, PlanAssignSteer.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java new file mode 100644 index 00000000..bdbdf420 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.service.IPlatingService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.PlatingWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [镀种] 控制器 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Plating") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][镀种]", description = "[镀种]接口") +public class PlatingController extends BladeController { + + @Resource + private IPlatingService service; + + /** + * [镀种] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Plating Obj") + public R detail(Plating plating) { + QueryWrapper qw = Condition.getQueryWrapper(plating); + Plating detail = service.getOne(qw); + PlatingVO detailVO = PlatingWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀种] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Plating Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map plating, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlatingWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀种] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Plating Obj") + public R> page(PlatingVO plating, Query query) { + IPage pagesVO = service.selectPlatingPage( + Condition.getPage(query), plating + ); + return R.data(pagesVO); + } + + /** + * [镀种] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = PlatingWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀种] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Plating Obj") + public R save(@Valid @RequestBody Plating addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [镀种] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Plating List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [镀种] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Plating Obj") + public R update(@Valid @RequestBody Plating updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [镀种] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Plating List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [镀种] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Plating Obj") + public R submit(@Valid @RequestBody Plating mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [镀种] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Plating List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [镀种] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [镀种] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Plating") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map plating, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Plating::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlatingEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlating(qw); + ExcelUtil.export(response, "[镀种]数据" + DateUtil.time(), + "[镀种]数据表", list, PlatingExcel.class); + } + + /** + * [镀种] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [镀种] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Plating.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java new file mode 100644 index 00000000..265bb16d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java @@ -0,0 +1,239 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; +import org.springblade.desk.basic.service.IPlatingSmallService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.PlatingSmallWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [镀种小类] 控制器 + * mes v1: bs_plating_small + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/PlatingSmall") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][镀种小类]", description = "[镀种小类]接口") +public class PlatingSmallController extends BladeController { + + @Resource + private IPlatingSmallService service; + + /** + * [镀种小类] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入PlatingSmall Obj") + public R detail(PlatingSmall platingSmall) { + QueryWrapper qw = Condition.getQueryWrapper(platingSmall); + PlatingSmall detail = service.getOne(qw); + PlatingSmallVO detailVO = PlatingSmallWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀种小类] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入PlatingSmall Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map platingSmall, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlatingSmallWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀种小类] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入PlatingSmall Obj") + public R> page(PlatingSmallVO platingSmall, Query query) { + IPage pagesVO = service.selectPlatingSmallPage( + Condition.getPage(query), platingSmall + ); + return R.data(pagesVO); + } + + /** + * [镀种小类] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = PlatingSmallWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀种小类] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入PlatingSmall Obj") + public R save(@Valid @RequestBody PlatingSmall addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [镀种小类] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入PlatingSmall List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [镀种小类] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入PlatingSmall Obj") + public R update(@Valid @RequestBody PlatingSmall updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [镀种小类] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入PlatingSmall List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [镀种小类] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入PlatingSmall Obj") + public R submit(@Valid @RequestBody PlatingSmall mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [镀种小类] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入PlatingSmall List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [镀种小类] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [镀种小类] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入PlatingSmall") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map platingSmall, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(PlatingSmall::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlatingSmallEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlatingSmall(qw); + ExcelUtil.export(response, "[镀种小类]数据" + DateUtil.time(), + "[镀种小类]数据表", list, PlatingSmallExcel.class); + } + + /** + * [镀种小类] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [镀种小类] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, PlatingSmall.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java index e8d9d8aa..233e8d10 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** * [工艺能力] 控制器 - * + * mes v1: bs_craft_ability * @author Tom Shuo * @since 2025-12-22 */ @@ -51,7 +51,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[工艺能力]", description = "[工艺能力]接口") +@Tag(name = "[BA][工艺能力]", description = "[工艺能力]接口") public class ProcessAbilityController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java index 7b8be809..8b5289ab 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java @@ -51,7 +51,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[生产标识]", description = "[生产标识]接口") +@Tag(name = "[BA][生产标识]", description = "[生产标识]接口") public class ProdMarkController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java new file mode 100644 index 00000000..d3f9f2ed --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; +import org.springblade.desk.basic.service.IShiftsService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.ShiftsWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [班次] 控制器 + * mes v1: bs_classes_set + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Shifts") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][班次]", description = "[班次]接口") +public class ShiftsController extends BladeController { + + @Resource + private IShiftsService service; + + /** + * [班次] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Shifts Obj") + public R detail(Shifts shifts) { + QueryWrapper qw = Condition.getQueryWrapper(shifts); + Shifts detail = service.getOne(qw); + ShiftsVO detailVO = ShiftsWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [班次] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Shifts Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map shifts, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ShiftsWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [班次] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Shifts Obj") + public R> page(ShiftsVO shifts, Query query) { + IPage pagesVO = service.selectShiftsPage( + Condition.getPage(query), shifts + ); + return R.data(pagesVO); + } + + /** + * [班次] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = ShiftsWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [班次] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Shifts Obj") + public R save(@Valid @RequestBody Shifts addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [班次] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Shifts List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [班次] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Shifts Obj") + public R update(@Valid @RequestBody Shifts updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [班次] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Shifts List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [班次] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Shifts Obj") + public R submit(@Valid @RequestBody Shifts mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [班次] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Shifts List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [班次] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [班次] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Shifts") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map shifts, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Shifts::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ShiftsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportShifts(qw); + ExcelUtil.export(response, "[班次]数据" + DateUtil.time(), + "[班次]数据表", list, ShiftsExcel.class); + } + + /** + * [班次] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [班次] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Shifts.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index a1aa3505..b73ef998 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -39,7 +39,7 @@ import java.util.Map; /** * [班组] 控制器 - * + * mes v1: bs_team_set * @author Tom Shuo * @since 2025-12-16 */ @@ -48,7 +48,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Tag(name = "[班组]", description = "[班组]接口") +@Tag(name = "[BA][班组]", description = "[班组]接口") public class TeamSetController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index 4256df39..c8a1030a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -39,7 +39,7 @@ import java.util.Map; /** * [作业中心] 控制器 - * + * mes v1: bs_work_center * @author Tom Shuo * @since 2025-12-16 */ @@ -48,7 +48,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Tag(name = "[作业中心]", description = "[作业中心]接口") +@Tag(name = "[BA][作业中心]", description = "[作业中心]接口") public class WorkCenterController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index 0a9fab13..c8a0ccd5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -39,7 +39,7 @@ import java.util.Map; /** * [作业槽] 控制器 - * + * mes v1: * @author Tom Shuo * @since 2025-12-16 */ @@ -48,7 +48,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Tag(name = "[作业槽]", description = "[作业槽]接口") +@Tag(name = "[BA][作业槽]", description = "[作业槽]接口") public class WorkTankController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/BasicClazzExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/BasicClazzExcel.java new file mode 100644 index 00000000..1e431879 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/BasicClazzExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [基础分类] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicClazzExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 业务类别 + */ + @ColumnWidth(20) + @ExcelProperty("业务类别") + private Short bizType; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java new file mode 100644 index 00000000..45eb845f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java @@ -0,0 +1,74 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [镀层厚度对应] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CoatingThicknessExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 镀层代号 + */ + @ColumnWidth(20) + @ExcelProperty("镀层代号") + private String thicknessCode; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 质量等级 + */ + @ColumnWidth(20) + @ExcelProperty("质量等级") + private Long level; + /** + * 是否以21E8-210开头 + */ + @ColumnWidth(20) + @ExcelProperty("是否以21E8-210开头") + private Short startF21e8; + /** + * 厚度 + */ + @ColumnWidth(20) + @ExcelProperty("厚度") + private Long thickness; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/LocallyPlatedPartExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/LocallyPlatedPartExcel.java new file mode 100644 index 00000000..5002745f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/LocallyPlatedPartExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [局部镀零件] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class LocallyPlatedPartExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 零件编号 + */ + @ColumnWidth(20) + @ExcelProperty("零件编号") + private String partCode; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long partType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java new file mode 100644 index 00000000..8087c103 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java @@ -0,0 +1,87 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [物料定额] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class MaterialQuotaExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 类型-[1]:金押定额;[2]:银板定额; + */ + @ColumnWidth(20) + @ExcelProperty("类型-[1]:金押定额;[2]:银板定额;") + private Long quotaType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [工艺能力]id + */ + @ColumnWidth(20) + @ExcelProperty("[工艺能力]id") + private BigDecimal processAbilityId; + /** + * 镀层厚度 + */ + @ColumnWidth(20) + @ExcelProperty("镀层厚度") + private Long thickness; + /** + * 定额 + */ + @ColumnWidth(20) + @ExcelProperty("定额") + private Long quota; + /** + * 小批量定额 + */ + @ColumnWidth(20) + @ExcelProperty("小批量定额") + private Long smallBatQuota; + /** + * 大批量定额 + */ + @ColumnWidth(20) + @ExcelProperty("大批量定额") + private Long bigBatQuota; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java new file mode 100644 index 00000000..8684b9e0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java @@ -0,0 +1,94 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [外协分派] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlanAssignSteerExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [外协厂家]id + */ + @ColumnWidth(20) + @ExcelProperty("[外协厂家]id") + private BigDecimal oemId; + /** + * [工艺能力]id + */ + @ColumnWidth(20) + @ExcelProperty("[工艺能力]id") + private BigDecimal platingId; + /** + * 零件;外键(dsPart) + */ + @ColumnWidth(20) + @ExcelProperty("零件;外键(dsPart)") + private Long dsPart; + /** + * 分派比例 + */ + @ColumnWidth(20) + @ExcelProperty("分派比例") + private BigDecimal assignScale; + /** + * 厂家周累计分派量 + */ + @ColumnWidth(20) + @ExcelProperty("厂家周累计分派量") + private BigDecimal weekAssign; + /** + * 分类周累计分派量 + */ + @ColumnWidth(20) + @ExcelProperty("分类周累计分派量") + private BigDecimal classifyAssign; + /** + * 比例偏差因子 + */ + @ColumnWidth(20) + @ExcelProperty("比例偏差因子") + private BigDecimal factor; + /** + * 维护人 + */ + @ColumnWidth(20) + @ExcelProperty("维护人") + private Long maintainMan; + /** + * 维护时间 + */ + @ColumnWidth(20) + @ExcelProperty("维护时间") + private LocalDateTime maintainTime; + /** + * 日分派量 + */ + @ColumnWidth(20) + @ExcelProperty("日分派量") + private String assign; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java new file mode 100644 index 00000000..bb991417 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java @@ -0,0 +1,123 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [镀种] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlatingExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + @ColumnWidth(20) + @ExcelProperty("流水号") + private BigDecimal platId; + /** + * 配置码 + */ + @ColumnWidth(20) + @ExcelProperty("配置码") + private String configNo; + /** + * [镀种分类]id + */ + @ColumnWidth(20) + @ExcelProperty("[镀种分类]id") + private BigDecimal bcId; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plating; + /** + * 材料 + */ + @ColumnWidth(20) + @ExcelProperty("材料") + private String material; + /** + * 硬度 + */ + @ColumnWidth(20) + @ExcelProperty("硬度") + private String hardness; + /** + * 镀层编码 + */ + @ColumnWidth(20) + @ExcelProperty("镀层编码") + private String matCode; + /** + * 材料状态 + */ + @ColumnWidth(20) + @ExcelProperty("材料状态") + private String matState; + /** + * 镀种小类 + */ + @ColumnWidth(20) + @ExcelProperty("镀种小类") + private Long subClass; + /** + * 其他要求 + */ + @ColumnWidth(20) + @ExcelProperty("其他要求") + private String memo; + /** + * 镀层代号 + */ + @ColumnWidth(20) + @ExcelProperty("镀层代号") + private String plateCode; + /** + * 镀层物料 + */ + @ColumnWidth(20) + @ExcelProperty("镀层物料") + private String plateGoodsCode; + /** + * 镀层厚度 + */ + @ColumnWidth(20) + @ExcelProperty("镀层厚度") + private String plateThickness; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java new file mode 100644 index 00000000..60f76b5e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java @@ -0,0 +1,63 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [镀种小类] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlatingSmallExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String bpsName; + /** + * 日常规生产能力 + */ + @ColumnWidth(20) + @ExcelProperty("日常规生产能力") + private BigDecimal capacity; + /** + * [作业中心]id + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]id") + private BigDecimal wcId; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/ShiftsExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/ShiftsExcel.java new file mode 100644 index 00000000..2d574db5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/ShiftsExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [班次] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ShiftsExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班次]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]编码") + private String shiftCode; + /** + * [班次]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]类型") + private Long shiftType; + /** + * [班次]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]名称") + private String name; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.java new file mode 100644 index 00000000..798590ea --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.BasicClazzExcel; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; + +import java.util.List; + +/** + * [基础分类] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface BasicClazzMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param basicClazz 查询参数 + * @return List + */ + List selectBasicClazzPage(IPage page, BasicClazzVO basicClazz); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBasicClazz(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.xml new file mode 100644 index 00000000..2382e46d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.java new file mode 100644 index 00000000..0f1d7da3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; + +import java.util.List; + +/** + * [镀层厚度对应] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface CoatingThicknessMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param coatingThickness 查询参数 + * @return List + */ + List selectCoatingThicknessPage(IPage page, CoatingThicknessVO coatingThickness); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCoatingThickness(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.xml new file mode 100644 index 00000000..7545a49e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.java new file mode 100644 index 00000000..2ed1bb7d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; + +import java.util.List; + +/** + * [局部镀零件] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface LocallyPlatedPartMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param locallyPlatedPart 查询参数 + * @return List + */ + List selectLocallyPlatedPartPage(IPage page, LocallyPlatedPartVO locallyPlatedPart); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLocallyPlatedPart(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml new file mode 100644 index 00000000..94cbd242 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java new file mode 100644 index 00000000..3be67637 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; + +import java.util.List; + +/** + * [物料定额] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface MaterialQuotaMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param materialQuota 查询参数 + * @return List + */ + List selectMaterialQuotaPage(IPage page, MaterialQuotaVO materialQuota); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportMaterialQuota(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml new file mode 100644 index 00000000..6cbf0ca6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.java new file mode 100644 index 00000000..7878b9a3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; + +import java.util.List; + +/** + * [外协分派] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface PlanAssignSteerMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param planAssignSteer 查询参数 + * @return List + */ + List selectPlanAssignSteerPage(IPage page, PlanAssignSteerVO planAssignSteer); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlanAssignSteer(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml new file mode 100644 index 00000000..2359cbe0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java new file mode 100644 index 00000000..efa83ef8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; + +import java.util.List; + +/** + * [镀种] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface PlatingMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param plating 查询参数 + * @return List + */ + List selectPlatingPage(IPage page, PlatingVO plating); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlating(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml new file mode 100644 index 00000000..a384c9bb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.java new file mode 100644 index 00000000..d31beb31 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; + +import java.util.List; + +/** + * [镀种小类] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface PlatingSmallMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param platingSmall 查询参数 + * @return List + */ + List selectPlatingSmallPage(IPage page, PlatingSmallVO platingSmall); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlatingSmall(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.xml new file mode 100644 index 00000000..f0b7f558 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.java new file mode 100644 index 00000000..88ab774c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; + +import java.util.List; + +/** + * [班次] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface ShiftsMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param shifts 查询参数 + * @return List + */ + List selectShiftsPage(IPage page, ShiftsVO shifts); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportShifts(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.xml new file mode 100644 index 00000000..05b4b20f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java new file mode 100644 index 00000000..edc119f5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.BasicClazz; + +import java.io.Serial; + +/** + * [基础分类] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicClazzDTO extends BasicClazz { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java new file mode 100644 index 00000000..52b885d5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; + +import java.io.Serial; + +/** + * [镀层厚度对应] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CoatingThicknessDTO extends CoatingThickness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java new file mode 100644 index 00000000..29193b22 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; + +import java.io.Serial; + +/** + * [局部镀零件] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LocallyPlatedPartDTO extends LocallyPlatedPart { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java new file mode 100644 index 00000000..1a70b992 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; + +import java.io.Serial; + +/** + * [物料定额] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MaterialQuotaDTO extends MaterialQuota { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java new file mode 100644 index 00000000..54b447db --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; + +import java.io.Serial; + +/** + * [外协分派] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlanAssignSteerDTO extends PlanAssignSteer { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java new file mode 100644 index 00000000..aae42cbf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Plating; + +import java.io.Serial; + +/** + * [镀种] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingDTO extends Plating { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java new file mode 100644 index 00000000..f1a05401 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; + +import java.io.Serial; + +/** + * [镀种小类] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingSmallDTO extends PlatingSmall { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java new file mode 100644 index 00000000..e99a0e95 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Shifts; + +import java.io.Serial; + +/** + * [班次] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ShiftsDTO extends Shifts { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java new file mode 100644 index 00000000..3be73f2e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java @@ -0,0 +1,78 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [基础分类] 实体类 + * todo: + * 没有插入，单独处理 + * '302007' + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_BASIC_CLAZZ") +@Schema(description = "BasicClazz Entity对象") +@EqualsAndHashCode(callSuper = true) +public class BasicClazz extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 业务类别 + */ + public static final String COL_BIZ_TYPE = "BIZ_TYPE"; + /** + * 备注 + */ + public static final String COL_MEMO = "MEMO"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 业务类别 + */ + @Schema(description = "业务类别") + private Integer bizType; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java index 8fc19c43..3bbec3ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; -import java.math.BigDecimal; /** * [批量配置] 实体类 @@ -91,22 +90,22 @@ public class BatConfig extends BaseEntity { * [工艺能力]id */ @Schema(description = "[工艺能力]id") - private BigDecimal caId; + private Long caId; /** * 面积 */ @Schema(description = "面积") - private BigDecimal area; + private Long area; /** * 单件面积 */ @Schema(description = "单件面积") - private BigDecimal singletonArea; + private Long singletonArea; /** * [零件]id */ @Schema(description = "[零件]id") - private BigDecimal partId; + private Long partId; /** * [零件]编码 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java new file mode 100644 index 00000000..beef0dc0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java @@ -0,0 +1,93 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [镀层厚度对应] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_COATING_THICKNESS") +@Schema(description = "CoatingThickness Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CoatingThickness extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 镀层代号 + */ + public static final String COL_THICKNESS_CODE = "THICKNESS_CODE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 质量等级 + */ + public static final String COL_LEVEL = "LEVEL"; + /** + * 是否以21E8-210开头 + */ + public static final String COL_START_F21E8 = "START_F21E8"; + /** + * 厚度 + */ + public static final String COL_THICKNESS = "THICKNESS"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 镀层代号 + */ + @Schema(description = "镀层代号") + private String thicknessCode; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 质量等级 + */ + @Schema(description = "质量等级") + private Integer level; + /** + * 是否以21E8-210开头 + */ + @Schema(description = "是否以21E8-210开头") + private Short startF21e8; + /** + * 厚度 + */ + @Schema(description = "厚度") + private Long thickness; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java new file mode 100644 index 00000000..8b774f58 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [局部镀零件] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_LOCALLY_PLATED_PART") +@Schema(description = "LocallyPlatedPart Entity对象") +@EqualsAndHashCode(callSuper = true) +public class LocallyPlatedPart extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 零件编号 + */ + public static final String COL_PART_CODE = "PART_CODE"; + /** + * 类型 + */ + public static final String COL_PART_TYPE = "PART_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 零件编号 + */ + @Schema(description = "零件编号") + private String partCode; + /** + * 类型 + */ + @Schema(description = "类型") + private Long partType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java new file mode 100644 index 00000000..af3a8ed8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java @@ -0,0 +1,111 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [物料定额] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_MATERIAL_QUOTA") +@Schema(description = "MaterialQuota Entity对象") +@EqualsAndHashCode(callSuper = true) +public class MaterialQuota extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 类型-[1]:金押定额;[2]:银板定额; + */ + public static final String COL_QUOTA_TYPE = "QUOTA_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [工艺能力]id + */ + public static final String COL_PROCESS_ABILITY_ID = "PROCESS_ABILITY_ID"; + /** + * 镀层厚度 + */ + public static final String COL_THICKNESS = "THICKNESS"; + /** + * 定额 + */ + public static final String COL_QUOTA = "QUOTA"; + /** + * 小批量定额 + */ + public static final String COL_SMALL_BAT_QUOTA = "SMALL_BAT_QUOTA"; + /** + * 大批量定额 + */ + public static final String COL_BIG_BAT_QUOTA = "BIG_BAT_QUOTA"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 类型-[1]:金押定额;[2]:银板定额; + */ + @Schema(description = "类型-[1]:金押定额;[2]:银板定额;") + private Long quotaType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [工艺能力]id + */ + @Schema(description = "[工艺能力]id") + private Long processAbilityId; + /** + * 镀层厚度 + */ + @Schema(description = "镀层厚度") + private Long thickness; + /** + * 定额 + */ + @Schema(description = "定额") + private Long quota; + /** + * 小批量定额 + */ + @Schema(description = "小批量定额") + private Long smallBatQuota; + /** + * 大批量定额 + */ + @Schema(description = "大批量定额") + private Long bigBatQuota; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java new file mode 100644 index 00000000..7d8f9e31 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java @@ -0,0 +1,121 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * [外协分派] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_PLAN_ASSIGN_STEER") +@Schema(description = "PlanAssignSteer Entity对象") +@EqualsAndHashCode(callSuper = true) +public class PlanAssignSteer extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [外协厂家]id + */ + public static final String COL_OEM_ID = "OEM_ID"; + /** + * [工艺能力]id + */ + public static final String COL_PLATING_ID = "PLATING_ID"; + /** + * 零件;外键(dsPart) + */ + public static final String COL_DS_PART = "DS_PART"; + /** + * 分派比例 + */ + public static final String COL_ASSIGN_SCALE = "ASSIGN_SCALE"; + /** + * 厂家周累计分派量 + */ + public static final String COL_WEEK_ASSIGN = "WEEK_ASSIGN"; + /** + * 分类周累计分派量 + */ + public static final String COL_CLASSIFY_ASSIGN = "CLASSIFY_ASSIGN"; + /** + * 比例偏差因子 + */ + public static final String COL_FACTOR = "FACTOR"; + /** + * 维护人 + */ + public static final String COL_MAINTAIN_MAN = "MAINTAIN_MAN"; + /** + * 维护时间 + */ + public static final String COL_MAINTAIN_TIME = "MAINTAIN_TIME"; + /** + * 日分派量 + */ + public static final String COL_ASSIGN = "ASSIGN"; + + /** + * [外协厂家]id + */ + @Schema(description = "[外协厂家]id") + private Long oemId; + /** + * [工艺能力]id + */ + @Schema(description = "[工艺能力]id") + private Long platingId; + /** + * 零件;外键(dsPart) + */ + @Schema(description = "零件;外键(dsPart)") + private Long dsPart; + /** + * 分派比例 + */ + @Schema(description = "分派比例") + private Long assignScale; + /** + * 厂家周累计分派量 + */ + @Schema(description = "厂家周累计分派量") + private Long weekAssign; + /** + * 分类周累计分派量 + */ + @Schema(description = "分类周累计分派量") + private Long classifyAssign; + /** + * 比例偏差因子 + */ + @Schema(description = "比例偏差因子") + private Long factor; + /** + * 维护人 + */ + @Schema(description = "维护人") + private Long maintainMan; + /** + * 维护时间 + */ + @Schema(description = "维护时间") + private LocalDateTime maintainTime; + /** + * 日分派量 + */ + @Schema(description = "日分派量") + private String assign; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java new file mode 100644 index 00000000..d7e7faa3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java @@ -0,0 +1,166 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [镀种] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_PLATING") +@Schema(description = "Plating Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Plating extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + public static final String COL_PLAT_ID = "PLAT_ID"; + /** + * 配置码 + */ + public static final String COL_CONFIG_NO = "CONFIG_NO"; + /** + * [镀种分类]id + */ + public static final String COL_BC_ID = "BC_ID"; + /** + * 镀种 + */ + public static final String COL_PLATING = "PLATING"; + /** + * 材料 + */ + public static final String COL_MATERIAL = "MATERIAL"; + /** + * 硬度 + */ + public static final String COL_HARDNESS = "HARDNESS"; + /** + * 镀层编码 + */ + public static final String COL_MAT_CODE = "MAT_CODE"; + /** + * 材料状态 + */ + public static final String COL_MAT_STATE = "MAT_STATE"; + /** + * 镀种小类 + */ + public static final String COL_SUB_CLASS = "SUB_CLASS"; + /** + * 其他要求 + */ + public static final String COL_MEMO = "MEMO"; + /** + * 镀层代号 + */ + public static final String COL_PLATE_CODE = "PLATE_CODE"; + /** + * 镀层物料 + */ + public static final String COL_PLATE_GOODS_CODE = "PLATE_GOODS_CODE"; + /** + * 镀层厚度 + */ + public static final String COL_PLATE_THICKNESS = "PLATE_THICKNESS"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 流水号 + */ + @Schema(description = "流水号") + private BigDecimal platId; + /** + * 配置码 + */ + @Schema(description = "配置码") + private String configNo; + /** + * [镀种分类]id + */ + @Schema(description = "[镀种分类]id") + private BigDecimal bcId; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plating; + /** + * 材料 + */ + @Schema(description = "材料") + private String material; + /** + * 硬度 + */ + @Schema(description = "硬度") + private String hardness; + /** + * 镀层编码 + */ + @Schema(description = "镀层编码") + private String matCode; + /** + * 材料状态 + */ + @Schema(description = "材料状态") + private String matState; + /** + * 镀种小类 + */ + @Schema(description = "镀种小类") + private Long subClass; + /** + * 其他要求 + */ + @Schema(description = "其他要求") + private String memo; + /** + * 镀层代号 + */ + @Schema(description = "镀层代号") + private String plateCode; + /** + * 镀层物料 + */ + @Schema(description = "镀层物料") + private String plateGoodsCode; + /** + * 镀层厚度 + */ + @Schema(description = "镀层厚度") + private String plateThickness; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java new file mode 100644 index 00000000..58aee23b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java @@ -0,0 +1,76 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [镀种小类] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_PLATING_SMALL") +@Schema(description = "PlatingSmall Entity对象") +@EqualsAndHashCode(callSuper = true) +public class PlatingSmall extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + public static final String COL_BPS_NAME = "BPS_NAME"; + /** + * 日常规生产能力 + */ + public static final String COL_CAPACITY = "CAPACITY"; + /** + * [作业中心]id + */ + public static final String COL_WC_ID = "WC_ID"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 名称 + */ + @Schema(description = "名称") + private String bpsName; + /** + * 日常规生产能力 + */ + @Schema(description = "日常规生产能力") + private BigDecimal capacity; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + private Long wcId; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java index 4331a726..d331e851 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; -import java.math.BigDecimal; /** * [工艺能力] 实体类 @@ -66,12 +65,12 @@ public class ProcessAbility extends BaseEntity { * 能力分类 */ @Schema(description = "能力分类") - private BigDecimal wtId; + private Long wtId; /** * [镀种小类]id */ @Schema(description = "[镀种小类]id") - private BigDecimal bpsId; + private Long bpsId; /** * 排序 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java index 10c45cc6..f0153ada 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java @@ -13,7 +13,7 @@ import java.io.Serial; /** * [生产标识] 实体类 - * + * mes v1: bs_procedure_qua * @author Tom Shuo * @since 2025-12-22 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java new file mode 100644 index 00000000..8f9e00bb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [班次] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_SHIFTS") +@Schema(description = "Shifts Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Shifts extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班次]编码 + */ + public static final String COL_SHIFT_CODE = "SHIFT_CODE"; + /** + * [班次]类型 + */ + public static final String COL_SHIFT_TYPE = "SHIFT_TYPE"; + /** + * [班次]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * [班次]编码 + */ + @Schema(description = "[班次]编码") + private String shiftCode; + /** + * [班次]类型 + */ + @Schema(description = "[班次]类型") + private Long shiftType; + /** + * [班次]名称 + */ + @Schema(description = "[班次]名称") + private String name; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java new file mode 100644 index 00000000..6c183616 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.BasicClazz; + +import java.io.Serial; + +/** + * [基础分类] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicClazzVO extends BasicClazz { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java new file mode 100644 index 00000000..42877ab0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; + +import java.io.Serial; + +/** + * [镀层厚度对应] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CoatingThicknessVO extends CoatingThickness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java new file mode 100644 index 00000000..7f32aca3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; + +import java.io.Serial; + +/** + * [局部镀零件] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LocallyPlatedPartVO extends LocallyPlatedPart { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java new file mode 100644 index 00000000..942d7f90 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; + +import java.io.Serial; + +/** + * [物料定额] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MaterialQuotaVO extends MaterialQuota { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java new file mode 100644 index 00000000..885409b9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; + +import java.io.Serial; + +/** + * [外协分派] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlanAssignSteerVO extends PlanAssignSteer { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java new file mode 100644 index 00000000..617337d7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; + +import java.io.Serial; + +/** + * [镀种小类] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingSmallVO extends PlatingSmall { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java new file mode 100644 index 00000000..e7cb10ea --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Plating; + +import java.io.Serial; + +/** + * [镀种] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingVO extends Plating { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java new file mode 100644 index 00000000..9c487437 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Shifts; + +import java.io.Serial; + +/** + * [班次] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ShiftsVO extends Shifts { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IBasicClazzService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IBasicClazzService.java new file mode 100644 index 00000000..05466550 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IBasicClazzService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.BasicClazzExcel; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; + +import java.util.List; + +/** + * [基础分类] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IBasicClazzService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param basicClazz 查询参数 + * @return IPage + */ + IPage selectBasicClazzPage(IPage page, BasicClazzVO basicClazz); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBasicClazz(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(BasicClazzVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICoatingThicknessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICoatingThicknessService.java new file mode 100644 index 00000000..752edc04 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICoatingThicknessService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; + +import java.util.List; + +/** + * [镀层厚度对应] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface ICoatingThicknessService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param coatingThickness 查询参数 + * @return IPage + */ + IPage selectCoatingThicknessPage(IPage page, CoatingThicknessVO coatingThickness); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCoatingThickness(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(CoatingThicknessVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java new file mode 100644 index 00000000..b0ad62b5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; + +import java.util.List; + +/** + * [局部镀零件] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface ILocallyPlatedPartService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param locallyPlatedPart 查询参数 + * @return IPage + */ + IPage selectLocallyPlatedPartPage(IPage page, LocallyPlatedPartVO locallyPlatedPart); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLocallyPlatedPart(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(LocallyPlatedPartVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java new file mode 100644 index 00000000..933e83db --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; + +import java.util.List; + +/** + * [物料定额] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IMaterialQuotaService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param materialQuota 查询参数 + * @return IPage + */ + IPage selectMaterialQuotaPage(IPage page, MaterialQuotaVO materialQuota); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportMaterialQuota(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(MaterialQuotaVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlanAssignSteerService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlanAssignSteerService.java new file mode 100644 index 00000000..42fb91c1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlanAssignSteerService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; + +import java.util.List; + +/** + * [外协分派] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IPlanAssignSteerService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param planAssignSteer 查询参数 + * @return IPage + */ + IPage selectPlanAssignSteerPage(IPage page, PlanAssignSteerVO planAssignSteer); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlanAssignSteer(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(PlanAssignSteerVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java new file mode 100644 index 00000000..d3da4f4c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; + +import java.util.List; + +/** + * [镀种] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IPlatingService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param plating 查询参数 + * @return IPage + */ + IPage selectPlatingPage(IPage page, PlatingVO plating); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlating(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(PlatingVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingSmallService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingSmallService.java new file mode 100644 index 00000000..f72556d2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingSmallService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; + +import java.util.List; + +/** + * [镀种小类] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IPlatingSmallService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param platingSmall 查询参数 + * @return IPage + */ + IPage selectPlatingSmallPage(IPage page, PlatingSmallVO platingSmall); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlatingSmall(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(PlatingSmallVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IShiftsService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IShiftsService.java new file mode 100644 index 00000000..c05361cd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IShiftsService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; + +import java.util.List; + +/** + * [班次] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IShiftsService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param shifts 查询参数 + * @return IPage + */ + IPage selectShiftsPage(IPage page, ShiftsVO shifts); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportShifts(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(ShiftsVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BasicClazzServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BasicClazzServiceImpl.java new file mode 100644 index 00000000..67dee254 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BasicClazzServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.BasicClazzExcel; +import org.springblade.desk.basic.mapper.BasicClazzMapper; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; +import org.springblade.desk.basic.service.IBasicClazzService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [基础分类] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class BasicClazzServiceImpl extends BaseServiceImpl implements IBasicClazzService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectBasicClazzPage(IPage page, BasicClazzVO basicClazz) { + return page.setRecords(baseMapper.selectBasicClazzPage(page, basicClazz)); + } + + @Override + public List exportBasicClazz(Wrapper queryWrapper) { + List basicClazzList = baseMapper.exportBasicClazz(queryWrapper); + //basicClazzList.forEach(basicClazz -> { + // basicClazz.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicClazz.getType())); + //}); + return basicClazzList; + } + + @Override + public void setVOValue(BasicClazzVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CoatingThicknessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CoatingThicknessServiceImpl.java new file mode 100644 index 00000000..ff336567 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CoatingThicknessServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.mapper.CoatingThicknessMapper; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; +import org.springblade.desk.basic.service.ICoatingThicknessService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [镀层厚度对应] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class CoatingThicknessServiceImpl extends BaseServiceImpl implements ICoatingThicknessService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectCoatingThicknessPage(IPage page, CoatingThicknessVO coatingThickness) { + return page.setRecords(baseMapper.selectCoatingThicknessPage(page, coatingThickness)); + } + + @Override + public List exportCoatingThickness(Wrapper queryWrapper) { + List coatingThicknessList = baseMapper.exportCoatingThickness(queryWrapper); + //coatingThicknessList.forEach(coatingThickness -> { + // coatingThickness.setTypeName(DictCache.getValue(DictEnum.YES_NO, CoatingThickness.getType())); + //}); + return coatingThicknessList; + } + + @Override + public void setVOValue(CoatingThicknessVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java new file mode 100644 index 00000000..f7265131 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.mapper.LocallyPlatedPartMapper; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; +import org.springblade.desk.basic.service.ILocallyPlatedPartService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [局部镀零件] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class LocallyPlatedPartServiceImpl extends BaseServiceImpl implements ILocallyPlatedPartService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectLocallyPlatedPartPage(IPage page, LocallyPlatedPartVO locallyPlatedPart) { + return page.setRecords(baseMapper.selectLocallyPlatedPartPage(page, locallyPlatedPart)); + } + + @Override + public List exportLocallyPlatedPart(Wrapper queryWrapper) { + List locallyPlatedPartList = baseMapper.exportLocallyPlatedPart(queryWrapper); + //locallyPlatedPartList.forEach(locallyPlatedPart -> { + // locallyPlatedPart.setTypeName(DictCache.getValue(DictEnum.YES_NO, LocallyPlatedPart.getType())); + //}); + return locallyPlatedPartList; + } + + @Override + public void setVOValue(LocallyPlatedPartVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java new file mode 100644 index 00000000..6d281ff5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.mapper.MaterialQuotaMapper; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; +import org.springblade.desk.basic.service.IMaterialQuotaService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [物料定额] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class MaterialQuotaServiceImpl extends BaseServiceImpl implements IMaterialQuotaService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectMaterialQuotaPage(IPage page, MaterialQuotaVO materialQuota) { + return page.setRecords(baseMapper.selectMaterialQuotaPage(page, materialQuota)); + } + + @Override + public List exportMaterialQuota(Wrapper queryWrapper) { + List materialQuotaList = baseMapper.exportMaterialQuota(queryWrapper); + //materialQuotaList.forEach(materialQuota -> { + // materialQuota.setTypeName(DictCache.getValue(DictEnum.YES_NO, MaterialQuota.getType())); + //}); + return materialQuotaList; + } + + @Override + public void setVOValue(MaterialQuotaVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerServiceImpl.java new file mode 100644 index 00000000..8b8879e0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.mapper.PlanAssignSteerMapper; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; +import org.springblade.desk.basic.service.IPlanAssignSteerService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [外协分派] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class PlanAssignSteerServiceImpl extends BaseServiceImpl implements IPlanAssignSteerService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectPlanAssignSteerPage(IPage page, PlanAssignSteerVO planAssignSteer) { + return page.setRecords(baseMapper.selectPlanAssignSteerPage(page, planAssignSteer)); + } + + @Override + public List exportPlanAssignSteer(Wrapper queryWrapper) { + List planAssignSteerList = baseMapper.exportPlanAssignSteer(queryWrapper); + //planAssignSteerList.forEach(planAssignSteer -> { + // planAssignSteer.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlanAssignSteer.getType())); + //}); + return planAssignSteerList; + } + + @Override + public void setVOValue(PlanAssignSteerVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java new file mode 100644 index 00000000..ffb7dc1c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.mapper.PlatingMapper; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.service.IPlatingService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [镀种] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class PlatingServiceImpl extends BaseServiceImpl implements IPlatingService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectPlatingPage(IPage page, PlatingVO plating) { + return page.setRecords(baseMapper.selectPlatingPage(page, plating)); + } + + @Override + public List exportPlating(Wrapper queryWrapper) { + List platingList = baseMapper.exportPlating(queryWrapper); + //platingList.forEach(plating -> { + // plating.setTypeName(DictCache.getValue(DictEnum.YES_NO, Plating.getType())); + //}); + return platingList; + } + + @Override + public void setVOValue(PlatingVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java new file mode 100644 index 00000000..0df8ee85 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.mapper.PlatingSmallMapper; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; +import org.springblade.desk.basic.service.IPlatingSmallService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [镀种小类] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class PlatingSmallServiceImpl extends BaseServiceImpl implements IPlatingSmallService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectPlatingSmallPage(IPage page, PlatingSmallVO platingSmall) { + return page.setRecords(baseMapper.selectPlatingSmallPage(page, platingSmall)); + } + + @Override + public List exportPlatingSmall(Wrapper queryWrapper) { + List platingSmallList = baseMapper.exportPlatingSmall(queryWrapper); + //platingSmallList.forEach(platingSmall -> { + // platingSmall.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlatingSmall.getType())); + //}); + return platingSmallList; + } + + @Override + public void setVOValue(PlatingSmallVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ShiftsServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ShiftsServiceImpl.java new file mode 100644 index 00000000..dee1ba69 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ShiftsServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.mapper.ShiftsMapper; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; +import org.springblade.desk.basic.service.IShiftsService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [班次] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class ShiftsServiceImpl extends BaseServiceImpl implements IShiftsService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectShiftsPage(IPage page, ShiftsVO shifts) { + return page.setRecords(baseMapper.selectShiftsPage(page, shifts)); + } + + @Override + public List exportShifts(Wrapper queryWrapper) { + List shiftsList = baseMapper.exportShifts(queryWrapper); + //shiftsList.forEach(shifts -> { + // shifts.setTypeName(DictCache.getValue(DictEnum.YES_NO, Shifts.getType())); + //}); + return shiftsList; + } + + @Override + public void setVOValue(ShiftsVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/BasicClazzWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/BasicClazzWrapper.java new file mode 100644 index 00000000..8423ca15 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/BasicClazzWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; + +import java.util.Objects; + +/** + * [基础分类] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class BasicClazzWrapper extends BaseEntityWrapper { + + public static BasicClazzWrapper build() { + return new BasicClazzWrapper(); + } + + @Override + public BasicClazzVO entityVO(BasicClazz basicClazz) { + BasicClazzVO VO = Objects.requireNonNull(BeanUtil.copyProperties(basicClazz, BasicClazzVO.class)); + + //User createUser = UserCache.getUser(basicClazz.getCreateUser()); + //User updateUser = UserCache.getUser(basicClazz.getUpdateUser()); + //basicClazzVO.setCreateUserName(createUser.getName()); + //basicClazzVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/CoatingThicknessWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/CoatingThicknessWrapper.java new file mode 100644 index 00000000..b49283b4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/CoatingThicknessWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; + +import java.util.Objects; + +/** + * [镀层厚度对应] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class CoatingThicknessWrapper extends BaseEntityWrapper { + + public static CoatingThicknessWrapper build() { + return new CoatingThicknessWrapper(); + } + + @Override + public CoatingThicknessVO entityVO(CoatingThickness coatingThickness) { + CoatingThicknessVO VO = Objects.requireNonNull(BeanUtil.copyProperties(coatingThickness, CoatingThicknessVO.class)); + + //User createUser = UserCache.getUser(coatingThickness.getCreateUser()); + //User updateUser = UserCache.getUser(coatingThickness.getUpdateUser()); + //coatingThicknessVO.setCreateUserName(createUser.getName()); + //coatingThicknessVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/LocallyPlatedPartWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/LocallyPlatedPartWrapper.java new file mode 100644 index 00000000..620d58a4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/LocallyPlatedPartWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; + +import java.util.Objects; + +/** + * [局部镀零件] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class LocallyPlatedPartWrapper extends BaseEntityWrapper { + + public static LocallyPlatedPartWrapper build() { + return new LocallyPlatedPartWrapper(); + } + + @Override + public LocallyPlatedPartVO entityVO(LocallyPlatedPart locallyPlatedPart) { + LocallyPlatedPartVO VO = Objects.requireNonNull(BeanUtil.copyProperties(locallyPlatedPart, LocallyPlatedPartVO.class)); + + //User createUser = UserCache.getUser(locallyPlatedPart.getCreateUser()); + //User updateUser = UserCache.getUser(locallyPlatedPart.getUpdateUser()); + //locallyPlatedPartVO.setCreateUserName(createUser.getName()); + //locallyPlatedPartVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/MaterialQuotaWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/MaterialQuotaWrapper.java new file mode 100644 index 00000000..6b179a5d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/MaterialQuotaWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; + +import java.util.Objects; + +/** + * [物料定额] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class MaterialQuotaWrapper extends BaseEntityWrapper { + + public static MaterialQuotaWrapper build() { + return new MaterialQuotaWrapper(); + } + + @Override + public MaterialQuotaVO entityVO(MaterialQuota materialQuota) { + MaterialQuotaVO VO = Objects.requireNonNull(BeanUtil.copyProperties(materialQuota, MaterialQuotaVO.class)); + + //User createUser = UserCache.getUser(materialQuota.getCreateUser()); + //User updateUser = UserCache.getUser(materialQuota.getUpdateUser()); + //materialQuotaVO.setCreateUserName(createUser.getName()); + //materialQuotaVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlanAssignSteerWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlanAssignSteerWrapper.java new file mode 100644 index 00000000..532d66dd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlanAssignSteerWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; + +import java.util.Objects; + +/** + * [外协分派] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class PlanAssignSteerWrapper extends BaseEntityWrapper { + + public static PlanAssignSteerWrapper build() { + return new PlanAssignSteerWrapper(); + } + + @Override + public PlanAssignSteerVO entityVO(PlanAssignSteer planAssignSteer) { + PlanAssignSteerVO VO = Objects.requireNonNull(BeanUtil.copyProperties(planAssignSteer, PlanAssignSteerVO.class)); + + //User createUser = UserCache.getUser(planAssignSteer.getCreateUser()); + //User updateUser = UserCache.getUser(planAssignSteer.getUpdateUser()); + //planAssignSteerVO.setCreateUserName(createUser.getName()); + //planAssignSteerVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingSmallWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingSmallWrapper.java new file mode 100644 index 00000000..2819582c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingSmallWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; + +import java.util.Objects; + +/** + * [镀种小类] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class PlatingSmallWrapper extends BaseEntityWrapper { + + public static PlatingSmallWrapper build() { + return new PlatingSmallWrapper(); + } + + @Override + public PlatingSmallVO entityVO(PlatingSmall platingSmall) { + PlatingSmallVO VO = Objects.requireNonNull(BeanUtil.copyProperties(platingSmall, PlatingSmallVO.class)); + + //User createUser = UserCache.getUser(platingSmall.getCreateUser()); + //User updateUser = UserCache.getUser(platingSmall.getUpdateUser()); + //platingSmallVO.setCreateUserName(createUser.getName()); + //platingSmallVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java new file mode 100644 index 00000000..9083b553 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; + +import java.util.Objects; + +/** + * [镀种] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class PlatingWrapper extends BaseEntityWrapper { + + public static PlatingWrapper build() { + return new PlatingWrapper(); + } + + @Override + public PlatingVO entityVO(Plating plating) { + PlatingVO VO = Objects.requireNonNull(BeanUtil.copyProperties(plating, PlatingVO.class)); + + //User createUser = UserCache.getUser(plating.getCreateUser()); + //User updateUser = UserCache.getUser(plating.getUpdateUser()); + //platingVO.setCreateUserName(createUser.getName()); + //platingVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/ShiftsWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/ShiftsWrapper.java new file mode 100644 index 00000000..9c341dd2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/ShiftsWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; + +import java.util.Objects; + +/** + * [班次] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class ShiftsWrapper extends BaseEntityWrapper { + + public static ShiftsWrapper build() { + return new ShiftsWrapper(); + } + + @Override + public ShiftsVO entityVO(Shifts shifts) { + ShiftsVO VO = Objects.requireNonNull(BeanUtil.copyProperties(shifts, ShiftsVO.class)); + + //User createUser = UserCache.getUser(shifts.getCreateUser()); + //User updateUser = UserCache.getUser(shifts.getUpdateUser()); + //shiftsVO.setCreateUserName(createUser.getName()); + //shiftsVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} From abcfdc64a7e1af7f749c427df857dafffe4ddf6b Mon Sep 17 00:00:00 2001 From: Tom Li Date: Tue, 6 Jan 2026 17:29:15 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=EF=BC=8C=E5=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/excel/PlatingExcel.java | 125 ----- .../desk/basic/mapper/PlatingMapper.java | 39 -- .../desk/basic/mapper/PlatingMapper.xml | 31 -- .../desk/basic/pojo/entity/Plating.java | 166 ------ .../desk/basic/service/IPlatingService.java | 43 -- .../service/impl/PlatingServiceImpl.java | 60 --- .../desk/basic/wrapper/PlatingWrapper.java | 35 -- .../basic/controller/FormulaController.java | 17 +- .../controller/MaterialQuotaController.java | 321 ++++++------ .../desk/basic/controller/OemController.java | 31 +- .../basic/controller/ShiftsController.java | 320 ++++++------ .../basic/controller/TeamSetController.java | 10 +- .../desk/basic/mapper/TeamSetMapper.xml | 2 +- .../basic/pojo/entity/CoatingThickness.java | 4 +- .../desk/basic/pojo/entity/Plating.java | 11 +- .../desk/basic/pojo/entity/TeamSet.java | 9 - .../quality/constant/InspectionTaskConst.java | 13 + .../controller/InspectionItemController.java | 307 +++++------ .../controller/InspectionTaskController.java | 11 +- .../InspectionTemplateController.java | 2 +- .../controller/ReviewDutyController.java | 237 +++++++++ .../controller/ReviewFaultController.java | 237 +++++++++ .../controller/ReviewSheetController.java | 159 +++--- .../controller/StandardController.java | 3 + .../controller/WorkPlanItemController.java | 237 +++++++++ .../WorkPlanItemDetailController.java | 237 +++++++++ .../desk/quality/excel/ReviewDutyExcel.java | 81 +++ .../desk/quality/excel/ReviewFaultExcel.java | 75 +++ .../desk/quality/excel/ReviewSheetExcel.java | 256 +++++++++ .../excel/WorkPlanItemDetailExcel.java | 111 ++++ .../desk/quality/excel/WorkPlanItemExcel.java | 136 +++++ .../quality/mapper/InspectionTaskMapper.java | 4 +- .../quality/mapper/InspectionTaskMapper.xml | 17 +- .../desk/quality/mapper/ReviewDutyMapper.java | 40 ++ .../desk/quality/mapper/ReviewDutyMapper.xml | 24 + .../quality/mapper/ReviewFaultMapper.java | 40 ++ .../desk/quality/mapper/ReviewFaultMapper.xml | 23 + .../quality/mapper/ReviewSheetMapper.java | 40 ++ .../desk/quality/mapper/ReviewSheetMapper.xml | 53 ++ .../mapper/WorkPlanItemDetailMapper.java | 40 ++ .../mapper/WorkPlanItemDetailMapper.xml | 29 + .../quality/mapper/WorkPlanItemMapper.java | 40 ++ .../quality/mapper/WorkPlanItemMapper.xml | 33 ++ .../desk/quality/pojo/dto/ReviewDutyDTO.java | 24 + .../desk/quality/pojo/dto/ReviewFaultDTO.java | 24 + .../desk/quality/pojo/dto/ReviewSheetDTO.java | 24 + .../quality/pojo/dto/WorkPlanItemDTO.java | 24 + .../pojo/dto/WorkPlanItemDetailDTO.java | 24 + .../quality/pojo/entity/InspectionItem.java | 2 +- .../quality/pojo/entity/InspectionTask.java | 494 +++++++++--------- .../pojo/entity/RelInsTemplateItem.java | 2 +- .../desk/quality/pojo/entity/ReviewDuty.java | 102 ++++ .../desk/quality/pojo/entity/ReviewFault.java | 94 ++++ .../desk/quality/pojo/entity/ReviewSheet.java | 364 +++++++++++++ .../quality/pojo/entity/WorkPlanItem.java | 184 +++++++ .../pojo/entity/WorkPlanItemDetail.java | 147 ++++++ .../pojo/request/InspectionTaskSearch.java | 33 +- .../pojo/vo/InspectionTaskDetailVO.java | 29 + .../quality/pojo/vo/InspectionTaskListVO.java | 71 +++ .../desk/quality/pojo/vo/QAPrWorkOrderVO.java | 15 + .../desk/quality/pojo/vo/QAPrWorkPlanVO.java | 17 + .../desk/quality/pojo/vo/ReviewDutyVO.java | 11 +- .../desk/quality/pojo/vo/ReviewFaultVO.java | 24 + ...spectionTaskVO.java => ReviewSheetVO.java} | 8 +- .../quality/pojo/vo/WorkPlanItemDetailVO.java | 24 + .../desk/quality/pojo/vo/WorkPlanItemVO.java | 11 +- .../service/IInspectionTaskService.java | 6 +- .../quality/service/IReviewDutyService.java | 44 ++ .../quality/service/IReviewFaultService.java | 44 ++ .../quality/service/IReviewSheetService.java | 44 ++ .../service/IWorkPlanItemDetailService.java | 44 ++ .../quality/service/IWorkPlanItemService.java | 44 ++ .../impl/InspectionTaskServiceImpl.java | 6 +- .../service/impl/ReviewDutyServiceImpl.java | 61 +++ .../service/impl/ReviewFaultServiceImpl.java | 61 +++ .../service/impl/ReviewSheetServiceImpl.java | 61 +++ .../impl/WorkPlanItemDetailServiceImpl.java | 61 +++ .../service/impl/WorkPlanItemServiceImpl.java | 61 +++ .../wrapper/InspectionTaskWrapper.java | 8 +- .../quality/wrapper/ReviewDutyWrapper.java | 36 ++ .../quality/wrapper/ReviewFaultWrapper.java | 36 ++ .../quality/wrapper/ReviewSheetWrapper.java | 36 ++ .../wrapper/WorkPlanItemDetailWrapper.java | 36 ++ .../quality/wrapper/WorkPlanItemWrapper.java | 36 ++ 84 files changed, 4805 insertions(+), 1381 deletions(-) delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java rename blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java => blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java (54%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewDutyExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewFaultExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewSheetExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java rename blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java => blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java (51%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/{InspectionTaskVO.java => ReviewSheetVO.java} (62%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java rename blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java => blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java (52%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewDutyWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewFaultWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemDetailWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemWrapper.java diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java deleted file mode 100644 index 6bfa41ab..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.excel; - - -import lombok.Data; - -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import java.math.BigDecimal; -import org.springblade.core.mp.base.BaseEntity; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import java.io.Serial; - - -/** - * [镀种] Excel实体类 - * - * @author Tom Shuo - * @since 2026-01-05 - */ -@Data -@ColumnWidth(25) -@HeadRowHeight(20) -@ContentRowHeight(18) -public class PlatingExcel implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流水号 - */ - @ColumnWidth(20) - @ExcelProperty("流水号") - private BigDecimal platId; - /** - * 配置码 - */ - @ColumnWidth(20) - @ExcelProperty("配置码") - private String configNo; - /** - * [镀种分类]id - */ - @ColumnWidth(20) - @ExcelProperty("[镀种分类]id") - private BigDecimal bcId; - /** - * 镀种 - */ - @ColumnWidth(20) - @ExcelProperty("镀种") - private String plating; - /** - * 材料 - */ - @ColumnWidth(20) - @ExcelProperty("材料") - private String material; - /** - * 硬度 - */ - @ColumnWidth(20) - @ExcelProperty("硬度") - private String hardness; - /** - * 镀层编码 - */ - @ColumnWidth(20) - @ExcelProperty("镀层编码") - private String matCode; - /** - * 材料状态 - */ - @ColumnWidth(20) - @ExcelProperty("材料状态") - private String matState; - /** - * 镀种小类 - */ - @ColumnWidth(20) - @ExcelProperty("镀种小类") - private Long subClass; - /** - * 其他要求 - */ - @ColumnWidth(20) - @ExcelProperty("其他要求") - private String memo; - /** - * 镀层代号 - */ - @ColumnWidth(20) - @ExcelProperty("镀层代号") - private String plateCode; - /** - * 镀层物料 - */ - @ColumnWidth(20) - @ExcelProperty("镀层物料") - private String plateGoodsCode; - /** - * 镀层厚度 - */ - @ColumnWidth(20) - @ExcelProperty("镀层厚度") - private String plateThickness; - /** - * 排序 - */ - @ColumnWidth(20) - @ExcelProperty("排序") - private Long sort; - /** - * 备注 - */ - @ColumnWidth(20) - @ExcelProperty("备注") - private String remark; -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java deleted file mode 100644 index 686edde4..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.mapper; - -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import org.springblade.desk.basic.excel.PlatingExcel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; -import java.util.List; - -/** - * [镀种] Mapper 接口 - * - * @author Tom Shuo - * @since 2026-01-05 - */ -public interface PlatingMapper extends BaseMapper { - - /** - * 自定义分页 - * - * @param page 分页参数 - * @param plating 查询参数 - * @return List - */ - List selectPlatingPage(IPage page, PlatingVO plating); - - /** - * 获取导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportPlating(@Param("ew") Wrapper queryWrapper); -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml deleted file mode 100644 index a384c9bb..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java deleted file mode 100644 index b4ca3b67..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java +++ /dev/null @@ -1,166 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.pojo.entity; - -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.math.BigDecimal; -import org.springblade.core.mp.base.BaseEntity; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -/** - * [镀种] 实体类 - * - * @author Tom Shuo - * @since 2026-01-05 - */ -@Data -@TableName("BA_PLATING") -@Schema(description = "Plating Entity对象") -@EqualsAndHashCode(callSuper = true) -public class Plating extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流水号 - */ - public static final String COL_PLAT_ID = "PLAT_ID"; - /** - * 配置码 - */ - public static final String COL_CONFIG_NO = "CONFIG_NO"; - /** - * [镀种分类]id - */ - public static final String COL_BC_ID = "BC_ID"; - /** - * 镀种 - */ - public static final String COL_PLATING = "PLATING"; - /** - * 材料 - */ - public static final String COL_MATERIAL = "MATERIAL"; - /** - * 硬度 - */ - public static final String COL_HARDNESS = "HARDNESS"; - /** - * 镀层编码 - */ - public static final String COL_MAT_CODE = "MAT_CODE"; - /** - * 材料状态 - */ - public static final String COL_MAT_STATE = "MAT_STATE"; - /** - * 镀种小类 - */ - public static final String COL_SUB_CLASS = "SUB_CLASS"; - /** - * 其他要求 - */ - public static final String COL_MEMO = "MEMO"; - /** - * 镀层代号 - */ - public static final String COL_PLATE_CODE = "PLATE_CODE"; - /** - * 镀层物料 - */ - public static final String COL_PLATE_GOODS_CODE = "PLATE_GOODS_CODE"; - /** - * 镀层厚度 - */ - public static final String COL_PLATE_THICKNESS = "PLATE_THICKNESS"; - /** - * 排序 - */ - public static final String COL_SORT = "SORT"; - /** - * 备注 - */ - public static final String COL_REMARK = "REMARK"; - - /** - * 流水号 - */ - @Schema(description = "流水号") - private BigDecimal platId; - /** - * 配置码 - */ - @Schema(description = "配置码") - private String configNo; - /** - * [镀种分类]id - */ - @Schema(description = "[镀种分类]id") - private BigDecimal bcId; - /** - * 镀种 - */ - @Schema(description = "镀种") - private String plating; - /** - * 材料 - */ - @Schema(description = "材料") - private String material; - /** - * 硬度 - */ - @Schema(description = "硬度") - private String hardness; - /** - * 镀层编码 - */ - @Schema(description = "镀层编码") - private String matCode; - /** - * 材料状态 - */ - @Schema(description = "材料状态") - private String matState; - /** - * 镀种小类 - */ - @Schema(description = "镀种小类") - private Long subClass; - /** - * 其他要求 - */ - @Schema(description = "其他要求") - private String memo; - /** - * 镀层代号 - */ - @Schema(description = "镀层代号") - private String plateCode; - /** - * 镀层物料 - */ - @Schema(description = "镀层物料") - private String plateGoodsCode; - /** - * 镀层厚度 - */ - @Schema(description = "镀层厚度") - private String plateThickness; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java deleted file mode 100644 index 4d3842af..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.service; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import org.springblade.desk.basic.excel.PlatingExcel; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseService; -import java.util.List; - -/** - * [镀种] 服务类 - * - * @author Tom Shuo - * @since 2026-01-05 - */ -public interface IPlatingService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param plating 查询参数 - * @return IPage - */ - IPage selectPlatingPage(IPage page, PlatingVO plating); - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportPlating(Wrapper queryWrapper); - - /** - * VO - * @param vo - */ - void setVOValue(PlatingVO vo); -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java deleted file mode 100644 index 52b4fd87..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.service.impl; - -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import org.springblade.desk.basic.excel.PlatingExcel; -import org.springblade.desk.basic.mapper.PlatingMapper; -import org.springblade.desk.basic.service.IPlatingService; -import org.springblade.system.feign.IUserClient; -import org.springblade.system.feign.IDictClient; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; -import java.util.List; - -/** - * [镀种] 服务实现类 - * - * @author Tom Shuo - * @since 2026-01-05 - */ -@Service -@Data -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Slf4j -public class PlatingServiceImpl extends BaseServiceImpl implements IPlatingService { - - @Resource - private IUserClient userClient; - @Resource - private IDictClient dictClient; - - @Override - public IPage selectPlatingPage(IPage page, PlatingVO plating) { - return page.setRecords(baseMapper.selectPlatingPage(page, plating)); - } - - @Override - public List exportPlating(Wrapper queryWrapper) { - List platingList = baseMapper.exportPlating(queryWrapper); - //platingList.forEach(plating -> { - // plating.setTypeName(DictCache.getValue(DictEnum.YES_NO, Plating.getType())); - //}); - return platingList; - } - - @Override - public void setVOValue(PlatingVO vo) { - - } -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java deleted file mode 100644 index 92b27fff..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.wrapper; - -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import java.util.Objects; - -/** - * [镀种] 包装类,返回视图层所需的字段 - * - * @author Tom Shuo - * @since 2026-01-05 - */ -public class PlatingWrapper extends BaseEntityWrapper { - - public static PlatingWrapper build() { - return new PlatingWrapper(); - } - - @Override - public PlatingVO entityVO(Plating plating) { - PlatingVO VO = Objects.requireNonNull(BeanUtil.copyProperties(plating, PlatingVO.class)); - - //User createUser = UserCache.getUser(plating.getCreateUser()); - //User updateUser = UserCache.getUser(plating.getUpdateUser()); - //platingVO.setCreateUserName(createUser.getName()); - //platingVO.setUpdateUserName(updateUser.getName()); - - return VO; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index 68d055a4..93f13d1b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -3,8 +3,10 @@ */ package org.springblade.desk.basic.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -24,7 +26,9 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.constant.BasicClazzConst; import org.springblade.desk.basic.excel.FormulaExcel; +import org.springblade.desk.basic.pojo.entity.BasicClazz; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.vo.FormulaVO; import org.springblade.desk.basic.service.IFormulaService; @@ -40,6 +44,7 @@ import java.util.Map; /** * [计算公式] 控制器 * mes v1: 新加 + * * @author Tom Shuo * @since 2025-12-16 */ @@ -88,9 +93,7 @@ public class FormulaController extends BladeController { @ApiOperationSupport(order = 21) @Operation(summary = "page分页", description = "传入Formula Obj") public R> page(FormulaVO formula, Query query) { - IPage pagesVO = service.selectFormulaPage( - Condition.getPage(query), formula - ); + IPage pagesVO = service.selectFormulaPage(Condition.getPage(query), formula); return R.data(pagesVO); } @@ -101,10 +104,10 @@ public class FormulaController extends BladeController { @ApiOperationSupport(order = 22) @Operation(summary = "list下拉选择", description = "") public R> listForSelect( - @Parameter(description = "formulaType", required = true) @RequestParam Integer formulaType) { - List list = service.list( - new QueryWrapper().eq(Formula.COL_FORMULA_TYPE, formulaType) - ); + @Parameter(description = "formulaType 公式类型", required = true) @RequestParam Integer formulaType) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(Formula::getFormulaType, formulaType); + List list = service.list(qw); List listVO = FormulaWrapper.build().listVO(list); return R.data(listVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java index 1c4139a0..2a33e127 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -3,8 +3,10 @@ */ package org.springblade.desk.basic.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -26,6 +28,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; import org.springblade.desk.basic.service.IMaterialQuotaService; @@ -42,6 +45,7 @@ import java.util.stream.Collectors; /** * [物料定额] 控制器 * mes v1: 新加 + * * @author Tom Shuo * @since 2026-01-05 */ @@ -55,184 +59,187 @@ import java.util.stream.Collectors; public class MaterialQuotaController extends BladeController { @Resource - private IMaterialQuotaService service; - - /** - * [物料定额] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入MaterialQuota Obj") - public R detail(MaterialQuota materialQuota) { - QueryWrapper qw = Condition.getQueryWrapper(materialQuota); - MaterialQuota detail = service.getOne(qw); - MaterialQuotaVO detailVO = MaterialQuotaWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [物料定额] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入MaterialQuota Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map materialQuota, - Query query) { + private IMaterialQuotaService service; + + /** + * [物料定额] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入MaterialQuota Obj") + public R detail(MaterialQuota materialQuota) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota); + MaterialQuota detail = service.getOne(qw); + MaterialQuotaVO detailVO = MaterialQuotaWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [物料定额] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入MaterialQuota Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map materialQuota, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = MaterialQuotaWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [物料定额] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入MaterialQuota Obj") - public R> page(MaterialQuotaVO materialQuota, Query query) { - IPage pagesVO = service.selectMaterialQuotaPage( - Condition.getPage(query), materialQuota - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = MaterialQuotaWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [物料定额] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入MaterialQuota Obj") + public R> page(MaterialQuotaVO materialQuota, Query query) { + IPage pagesVO = service.selectMaterialQuotaPage( + Condition.getPage(query), materialQuota + ); + return R.data(pagesVO); + } + + /** * [物料定额] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { - List list = service.list(); - List listVO = MaterialQuotaWrapper.build().listVO(list); - return R.data(listVO); + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect( + @Parameter(description = "quotaType 定额类型", required = true) @RequestParam Integer quotaType) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(MaterialQuota::getQuotaType, quotaType); + List list = service.list(qw); + List listVO = MaterialQuotaWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [物料定额] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入MaterialQuota Obj") + public R save(@Valid @RequestBody MaterialQuota addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [物料定额] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入MaterialQuota Obj") - public R save(@Valid @RequestBody MaterialQuota addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [物料定额] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入MaterialQuota List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [物料定额] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入MaterialQuota Obj") - public R update(@Valid @RequestBody MaterialQuota updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入MaterialQuota List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [物料定额] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入MaterialQuota Obj") + public R update(@Valid @RequestBody MaterialQuota updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [物料定额] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入MaterialQuota List") + @Operation(summary = "修改批量", description = "传入MaterialQuota List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [物料定额] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入MaterialQuota Obj") - public R submit(@Valid @RequestBody MaterialQuota mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [物料定额] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入MaterialQuota Obj") + public R submit(@Valid @RequestBody MaterialQuota mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [物料定额] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入MaterialQuota List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [物料定额] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [物料定额] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入MaterialQuota") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map materialQuota, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(MaterialQuota::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(MaterialQuotaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportMaterialQuota(qw); - ExcelUtil.export(response, "[物料定额]数据" + DateUtil.time(), - "[物料定额]数据表", list, MaterialQuotaExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入MaterialQuota List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [物料定额] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [物料定额] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入MaterialQuota") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map materialQuota, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(MaterialQuota::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(MaterialQuotaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportMaterialQuota(qw); + ExcelUtil.export(response, "[物料定额]数据" + DateUtil.time(), + "[物料定额]数据表", list, MaterialQuotaExcel.class); + } + + /** * [物料定额] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [物料定额] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, MaterialQuota.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [物料定额] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, MaterialQuota.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index 2382e0ff..be4e8032 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -83,32 +83,17 @@ public class OemController extends BladeController { @Operation(summary = "list分页", description = "传入Oem Obj") public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - // 构建search对象。 - OemSearch search = new OemSearch(); - -// if (map.containsKey(Oem.COL_CODE)) { -// search.setCode((Func.toStr(map.get(OemSearch.COL_CODE)))); -// } -// if (map.containsKey(Oem.COL_OC_NAME)) { -// search.setOcName((Func.toStr(map.get(OemSearch.COL_OC_NAME)))); -// } -// if (map.containsKey(Oem.COL_ABBREVIATION)) { -// search.setAbbreviation((Func.toStr(map.get(OemSearch.COL_ABBREVIATION)))); -// } -// if (map.containsKey(OemSearch.COL_QUALIFICATION)) { -// search.setQualification((Func.toInt(map.get(OemSearch.COL_QUALIFICATION)))); -// } -// if (map.containsKey(BaseCol.STATUS)) { -// search.setStatus((Integer) map.get(BaseCol.STATUS)); -// } -// if (map.containsKey(OemSearch.COL_CONTACT_MAN)) { -// search.setContactMan((Func.toStr(map.get(OemSearch.COL_CONTACT_MAN)))); -// } - + // build QueryWrapper QueryWrapper qw = Condition.getQueryWrapper(map, Oem.class); + qw.eq(map.containsKey(Oem.COL_CODE), Oem.COL_CODE, (Func.toStr(map.get(OemSearch.COL_CODE)))); + qw.like(map.containsKey(Oem.COL_OC_NAME), Oem.COL_OC_NAME, (Func.toStr(map.get(OemSearch.COL_OC_NAME)))); + qw.like(map.containsKey(Oem.COL_ABBREVIATION), Oem.COL_ABBREVIATION, (Func.toStr(map.get(OemSearch.COL_ABBREVIATION)))); + qw.eq(map.containsKey(Oem.COL_QUALIFICATION), Oem.COL_QUALIFICATION, (Func.toInt(map.get(OemSearch.COL_QUALIFICATION)))); + qw.eq(map.containsKey(BaseCol.STATUS), BaseCol.STATUS, (Func.toInt(map.get(BaseCol.STATUS)))); + qw.like(map.containsKey(Oem.COL_CONTACT_MAN), Oem.COL_CONTACT_MAN, (Func.toStr(map.get(Oem.COL_CONTACT_MAN)))); + // page IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = OemWrapper.build().pageVO(pages); - pagesVO.getRecords() .stream() .peek(service::setVOValue) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java index d3f9f2ed..2cbca935 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java @@ -26,7 +26,9 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.ShiftsVO; import org.springblade.desk.basic.service.IShiftsService; import org.springblade.desk.basic.util.ExcelExtUtil; @@ -42,6 +44,7 @@ import java.util.stream.Collectors; /** * [班次] 控制器 * mes v1: bs_classes_set + * * @author Tom Shuo * @since 2026-01-05 */ @@ -55,184 +58,187 @@ import java.util.stream.Collectors; public class ShiftsController extends BladeController { @Resource - private IShiftsService service; - - /** - * [班次] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Shifts Obj") - public R detail(Shifts shifts) { - QueryWrapper qw = Condition.getQueryWrapper(shifts); - Shifts detail = service.getOne(qw); - ShiftsVO detailVO = ShiftsWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [班次] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Shifts Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map shifts, - Query query) { - QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ShiftsWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [班次] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Shifts Obj") - public R> page(ShiftsVO shifts, Query query) { - IPage pagesVO = service.selectShiftsPage( - Condition.getPage(query), shifts - ); - return R.data(pagesVO); - } - - /** + private IShiftsService service; + + /** + * [班次] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Shifts Obj") + public R detail(Shifts shifts) { + QueryWrapper qw = Condition.getQueryWrapper(shifts); + Shifts detail = service.getOne(qw); + ShiftsVO detailVO = ShiftsWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [班次] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Shifts Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map map, + Query query) { + // build QueryWrapper + QueryWrapper qw = Condition.getQueryWrapper(map, Shifts.class); + qw.like(map.containsKey(Shifts.COL_NAME), Shifts.COL_NAME, (Func.toStr(map.get(Shifts.COL_NAME)))); + // page + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ShiftsWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [班次] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Shifts Obj") + public R> page(ShiftsVO shifts, Query query) { + IPage pagesVO = service.selectShiftsPage( + Condition.getPage(query), shifts + ); + return R.data(pagesVO); + } + + /** * [班次] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = ShiftsWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = ShiftsWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [班次] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Shifts Obj") + public R save(@Valid @RequestBody Shifts addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [班次] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Shifts Obj") - public R save(@Valid @RequestBody Shifts addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [班次] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Shifts List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [班次] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Shifts Obj") - public R update(@Valid @RequestBody Shifts updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Shifts List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [班次] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Shifts Obj") + public R update(@Valid @RequestBody Shifts updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [班次] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Shifts List") + @Operation(summary = "修改批量", description = "传入Shifts List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [班次] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Shifts Obj") - public R submit(@Valid @RequestBody Shifts mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [班次] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Shifts Obj") + public R submit(@Valid @RequestBody Shifts mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [班次] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Shifts List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [班次] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [班次] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Shifts") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map shifts, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Shifts::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ShiftsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportShifts(qw); - ExcelUtil.export(response, "[班次]数据" + DateUtil.time(), - "[班次]数据表", list, ShiftsExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Shifts List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [班次] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [班次] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Shifts") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map shifts, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Shifts::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ShiftsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportShifts(qw); + ExcelUtil.export(response, "[班次]数据" + DateUtil.time(), + "[班次]数据表", list, ShiftsExcel.class); + } + + /** * [班次] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [班次] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, Shifts.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [班次] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Shifts.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index b73ef998..e342e074 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.TeamSetExcel; +import org.springblade.desk.basic.pojo.entity.Shifts; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; import org.springblade.desk.basic.service.ITeamSetService; @@ -73,9 +74,14 @@ public class TeamSetController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 20) @Operation(summary = "list分页", description = "传入TeamSet Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map teamSet, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(teamSet, TeamSet.class); + // build QueryWrapper + QueryWrapper qw = Condition.getQueryWrapper(map, TeamSet.class); + qw.like(map.containsKey(TeamSet.COL_TS_CODE), TeamSet.COL_TS_CODE, (Func.toStr(map.get(TeamSet.COL_TS_CODE)))); + qw.like(map.containsKey(TeamSet.COL_TS_NAME), TeamSet.COL_TS_NAME, (Func.toStr(map.get(TeamSet.COL_TS_NAME)))); + qw.eq(map.containsKey(TeamSet.COL_DISPATCHER), TeamSet.COL_DISPATCHER, (Func.toLong(map.get(TeamSet.COL_DISPATCHER)))); + // page IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = TeamSetWrapper.build().pageVO(pages); return R.data(pagesVO); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml index 44f9744e..73b0f2c5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml @@ -11,7 +11,7 @@ - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java index beef0dc0..22cb92fb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java @@ -37,7 +37,7 @@ public class CoatingThickness extends BaseEntity { /** * 质量等级 */ - public static final String COL_LEVEL = "LEVEL"; + public static final String COL_LEVEL_NUM = "LEVEL_NUM"; /** * 是否以21E8-210开头 */ @@ -69,7 +69,7 @@ public class CoatingThickness extends BaseEntity { * 质量等级 */ @Schema(description = "质量等级") - private Integer level; + private Integer levelNum; /** * 是否以21E8-210开头 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java index d7e7faa3..05912651 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java @@ -27,10 +27,6 @@ public class Plating extends BaseEntity { @Serial private static final long serialVersionUID = 1L; - /** - * 流水号 - */ - public static final String COL_PLAT_ID = "PLAT_ID"; /** * 配置码 */ @@ -88,11 +84,6 @@ public class Plating extends BaseEntity { */ public static final String COL_REMARK = "REMARK"; - /** - * 流水号 - */ - @Schema(description = "流水号") - private BigDecimal platId; /** * 配置码 */ @@ -102,7 +93,7 @@ public class Plating extends BaseEntity { * [镀种分类]id */ @Schema(description = "[镀种分类]id") - private BigDecimal bcId; + private Long bcId; /** * 镀种 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java index 792f3c47..05015429 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java @@ -54,10 +54,6 @@ public class TeamSet extends BaseEntity { * 创建人;外键（人员） */ public static final String COL_CREATE_MAN = "CREATE_MAN"; - /** - * 删除标记;1:删除，0:正常 - */ - public static final String COL_DELETED = "DELETED"; /** * 作业中心 */ @@ -126,11 +122,6 @@ public class TeamSet extends BaseEntity { */ @Schema(description = "创建人;外键（人员）") private Long createMan; - /** - * 删除标记;1:删除，0:正常 - */ - @Schema(description = "删除标记;1:删除，0:正常") - private String deleted; /** * 作业中心 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java index 86e212c4..9b1f1a9a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java @@ -11,4 +11,17 @@ public interface InspectionTaskConst { * 烧结 */ Integer TYPE_SJ = 2; + + /** + * 未检验 + */ + Integer CHECK_RESULT_NOT = -1; + /** + * 合格 + */ + Integer CHECK_RESULT_OK = 1; + /** + * 不合格 + */ + Integer CHECK_RESULT_NO = 2; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java index 5ffcd56d..a9dfb050 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -39,6 +39,11 @@ import java.util.Map; /** * [检验项目] 控制器 + * mes v1: + * + *

+ * SELECT * FROM "RB_BS_ADDITIONAL_MESS" WHERE TYPE = 2 ORDER BY ONE_DATA ASC + *

* * @author Tom Shuo * @since 2025-12-16 @@ -52,179 +57,179 @@ import java.util.Map; public class InspectionItemController extends BladeController { @Resource - private IInspectionItemService service; - - /** - * [检验项目] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入InspectionItem Obj") - public R detail(InspectionItem inspectionItem) { - QueryWrapper qw = Condition.getQueryWrapper(inspectionItem); - InspectionItem detail = service.getOne(qw); - InspectionItemVO detailVO = InspectionItemWrapper.build().entityVO(detail); - return R.data(detailVO); - } - - /** - * [检验项目] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入InspectionItem Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map inspectionItem, - Query query) { + private IInspectionItemService service; + + /** + * [检验项目] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入InspectionItem Obj") + public R detail(InspectionItem inspectionItem) { + QueryWrapper qw = Condition.getQueryWrapper(inspectionItem); + InspectionItem detail = service.getOne(qw); + InspectionItemVO detailVO = InspectionItemWrapper.build().entityVO(detail); + return R.data(detailVO); + } + + /** + * [检验项目] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入InspectionItem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map inspectionItem, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(inspectionItem, InspectionItem.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = InspectionItemWrapper.build().pageVO(pages); - return R.data(pagesVO); - } - - - /** - * [检验项目] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入InspectionItem Obj") - public R> page(InspectionItemVO inspectionItem, Query query) { - IPage pagesVO = service.selectInspectionItemPage( - Condition.getPage(query), inspectionItem - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = InspectionItemWrapper.build().pageVO(pages); + return R.data(pagesVO); + } + + + /** + * [检验项目] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入InspectionItem Obj") + public R> page(InspectionItemVO inspectionItem, Query query) { + IPage pagesVO = service.selectInspectionItemPage( + Condition.getPage(query), inspectionItem + ); + return R.data(pagesVO); + } + + /** * [检验项目] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = InspectionItemWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = InspectionItemWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [检验项目] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入InspectionItem Obj") + public R save(@Valid @RequestBody InspectionItem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [检验项目] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入InspectionItem Obj") - public R save(@Valid @RequestBody InspectionItem addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [检验项目] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入InspectionItem List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [检验项目] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入InspectionItem Obj") - public R update(@Valid @RequestBody InspectionItem updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入InspectionItem List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [检验项目] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入InspectionItem Obj") + public R update(@Valid @RequestBody InspectionItem updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [检验项目] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入InspectionItem List") + @Operation(summary = "修改批量", description = "传入InspectionItem List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [检验项目] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入InspectionItem Obj") - public R submit(@Valid @RequestBody InspectionItem mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [检验项目] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入InspectionItem Obj") + public R submit(@Valid @RequestBody InspectionItem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [检验项目] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入InspectionItem List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [检验项目] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [检验项目] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入InspectionItem") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map inspectionItem, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(inspectionItem, InspectionItem.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(InspectionItem::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(InspectionItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportInspectionItem(qw); - ExcelUtil.export(response, "[检验项目]数据" + DateUtil.time(), - "[检验项目]数据表", list, InspectionItemExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入InspectionItem List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [检验项目] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [检验项目] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入InspectionItem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map inspectionItem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(inspectionItem, InspectionItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(InspectionItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(InspectionItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportInspectionItem(qw); + ExcelUtil.export(response, "[检验项目]数据" + DateUtil.time(), + "[检验项目]数据表", list, InspectionItemExcel.class); + } + + /** * [检验项目] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [检验项目] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, InspectionItem.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [检验项目] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, InspectionItem.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 0a5085a4..fe866737 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -27,7 +27,7 @@ import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.InspectionTaskService2; import org.springblade.desk.quality.wrapper.InspectionTaskWrapper; @@ -38,6 +38,7 @@ import java.util.Map; /** * [检验任务] 控制器 + * mes v1: rb_pr_work_check * * @author Tom Shuo * @since 2025-11-14 @@ -60,7 +61,7 @@ public class InspectionTaskController extends BladeController { @GetMapping("/detail") @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入inspectionTask") - public R detail(InspectionTask inspectionTask) { + public R detail(InspectionTask inspectionTask) { InspectionTask detail = inspectionTaskGenService.getOne(Condition.getQueryWrapper(inspectionTask)); return R.data(InspectionTaskWrapper.build().entityVO(detail)); } @@ -71,7 +72,7 @@ public class InspectionTaskController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") - public R> list(@Parameter(hidden = true) @RequestParam Map inspectionTask, Query query) { + public R> list(@Parameter(hidden = true) @RequestParam Map inspectionTask, Query query) { IPage pages = inspectionTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTask, InspectionTask.class)); return R.data(InspectionTaskWrapper.build().pageVO(pages)); } @@ -83,8 +84,8 @@ public class InspectionTaskController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入inspectionTask") - public R> page(InspectionTaskVO inspectionTask, Query query) { - IPage pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); + public R> page(InspectionTaskDetailVO inspectionTask, Query query) { + IPage pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); return R.data(pages); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index a974f41d..2e5b06d8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; /** * [检验模板] 控制器 - * + * mes v1: ds_trialItem_model DsTrialitemModel 试验项目 * @author Tom Shuo * @since 2025-12-19 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java new file mode 100644 index 00000000..4a01a98e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java @@ -0,0 +1,237 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.ReviewDutyExcel; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; +import org.springblade.desk.quality.service.IReviewDutyService; +import org.springblade.desk.quality.wrapper.ReviewDutyWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [生产处置单-责任零件] 控制器 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@RestController +@RequestMapping("/ReviewDuty") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[生产处置单-责任零件]", description = "[生产处置单-责任零件]接口") +public class ReviewDutyController extends BladeController { + + @Resource + private IReviewDutyService service; + + /** + * [生产处置单-责任零件] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ReviewDuty Obj") + public R detail(ReviewDuty reviewDuty) { + QueryWrapper qw = Condition.getQueryWrapper(reviewDuty); + ReviewDuty detail = service.getOne(qw); + ReviewDutyVO detailVO = ReviewDutyWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [生产处置单-责任零件] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ReviewDuty Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map reviewDuty, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(reviewDuty, ReviewDuty.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewDutyWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [生产处置单-责任零件] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ReviewDuty Obj") + public R> page(ReviewDutyVO reviewDuty, Query query) { + IPage pagesVO = service.selectReviewDutyPage( + Condition.getPage(query), reviewDuty + ); + return R.data(pagesVO); + } + + /** + * [生产处置单-责任零件] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = ReviewDutyWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [生产处置单-责任零件] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ReviewDuty Obj") + public R save(@Valid @RequestBody ReviewDuty addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [生产处置单-责任零件] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ReviewDuty List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [生产处置单-责任零件] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ReviewDuty Obj") + public R update(@Valid @RequestBody ReviewDuty updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [生产处置单-责任零件] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入ReviewDuty List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [生产处置单-责任零件] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ReviewDuty Obj") + public R submit(@Valid @RequestBody ReviewDuty mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [生产处置单-责任零件] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ReviewDuty List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [生产处置单-责任零件] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [生产处置单-责任零件] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ReviewDuty") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map reviewDuty, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(reviewDuty, ReviewDuty.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ReviewDuty::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ReviewDutyEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportReviewDuty(qw); + ExcelUtil.export(response, "[生产处置单-责任零件]数据" + DateUtil.time(), + "[生产处置单-责任零件]数据表", list, ReviewDutyExcel.class); + } + + /** + * [生产处置单-责任零件] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [生产处置单-责任零件] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ReviewDuty.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java new file mode 100644 index 00000000..582675bf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java @@ -0,0 +1,237 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.ReviewFaultExcel; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; +import org.springblade.desk.quality.service.IReviewFaultService; +import org.springblade.desk.quality.wrapper.ReviewFaultWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [生产处置单-问题故障] 控制器 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@RestController +@RequestMapping("/ReviewFault") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[生产处置单-问题故障]", description = "[生产处置单-问题故障]接口") +public class ReviewFaultController extends BladeController { + + @Resource + private IReviewFaultService service; + + /** + * [生产处置单-问题故障] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ReviewFault Obj") + public R detail(ReviewFault reviewFault) { + QueryWrapper qw = Condition.getQueryWrapper(reviewFault); + ReviewFault detail = service.getOne(qw); + ReviewFaultVO detailVO = ReviewFaultWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [生产处置单-问题故障] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ReviewFault Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map reviewFault, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(reviewFault, ReviewFault.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewFaultWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [生产处置单-问题故障] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ReviewFault Obj") + public R> page(ReviewFaultVO reviewFault, Query query) { + IPage pagesVO = service.selectReviewFaultPage( + Condition.getPage(query), reviewFault + ); + return R.data(pagesVO); + } + + /** + * [生产处置单-问题故障] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = ReviewFaultWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [生产处置单-问题故障] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ReviewFault Obj") + public R save(@Valid @RequestBody ReviewFault addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [生产处置单-问题故障] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ReviewFault List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [生产处置单-问题故障] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ReviewFault Obj") + public R update(@Valid @RequestBody ReviewFault updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [生产处置单-问题故障] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入ReviewFault List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [生产处置单-问题故障] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ReviewFault Obj") + public R submit(@Valid @RequestBody ReviewFault mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [生产处置单-问题故障] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ReviewFault List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [生产处置单-问题故障] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [生产处置单-问题故障] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ReviewFault") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map reviewFault, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(reviewFault, ReviewFault.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ReviewFault::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ReviewFaultEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportReviewFault(qw); + ExcelUtil.export(response, "[生产处置单-问题故障]数据" + DateUtil.time(), + "[生产处置单-问题故障]数据表", list, ReviewFaultExcel.class); + } + + /** + * [生产处置单-问题故障] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [生产处置单-问题故障] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ReviewFault.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java similarity index 54% rename from blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index 8fc3b0f7..c4af8c40 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -1,87 +1,86 @@ /** * Author: Tom Shuo */ -package org.springblade.desk.basic.controller; +package org.springblade.desk.quality.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.ReviewSheetExcel; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.service.IReviewSheetService; +import org.springblade.desk.quality.wrapper.ReviewSheetWrapper; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import org.springblade.desk.basic.excel.PlatingExcel; -import org.springblade.desk.basic.wrapper.PlatingWrapper; -import org.springblade.desk.basic.service.IPlatingService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.stream.Collectors; /** - * [镀种] 控制器 + * [生产处置单] 控制器 * * @author Tom Shuo - * @since 2026-01-05 + * @since 2026-01-06 */ @RestController -@RequestMapping("/Plating") +@RequestMapping("/ReviewSheet") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[镀种]", description = "[镀种]接口") -public class PlatingController extends BladeController { +@Tag(name = "[生产处置单]", description = "[生产处置单]接口") +public class ReviewSheetController extends BladeController { @Resource - private IPlatingService service; + private IReviewSheetService service; /** - * [镀种] 详情 + * [生产处置单] 详情 */ @GetMapping("/detail") @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Plating Obj") - public R detail(Plating plating) { - QueryWrapper qw = Condition.getQueryWrapper(plating); - Plating detail = service.getOne(qw); - PlatingVO detailVO = PlatingWrapper.build().entityVO(detail); + @Operation(summary = "详情", description = "传入ReviewSheet Obj") + public R detail(ReviewSheet reviewSheet) { + QueryWrapper qw = Condition.getQueryWrapper(reviewSheet); + ReviewSheet detail = service.getOne(qw); + ReviewSheetVO detailVO = ReviewSheetWrapper.build().entityVO(detail); service.setVOValue(detailVO); return R.data(detailVO); } /** - * [镀种] list分页 + * [生产处置单] list分页 */ @GetMapping("/list") @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Plating Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map plating, + @Operation(summary = "list分页", description = "传入ReviewSheet Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map reviewSheet, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = PlatingWrapper.build().pageVO(pages); + QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() .peek(service::setVOValue) @@ -91,48 +90,48 @@ public class PlatingController extends BladeController { /** - * [镀种] page分页 + * [生产处置单] page分页 */ @GetMapping("/page") @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Plating Obj") - public R> page(PlatingVO plating, Query query) { - IPage pagesVO = service.selectPlatingPage( - Condition.getPage(query), plating + @Operation(summary = "page分页", description = "传入ReviewSheet Obj") + public R> page(ReviewSheetVO reviewSheet, Query query) { + IPage pagesVO = service.selectReviewSheetPage( + Condition.getPage(query), reviewSheet ); return R.data(pagesVO); } /** - * [镀种] list下拉选择 + * [生产处置单] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { - List list = service.list(); - List listVO = PlatingWrapper.build().listVO(list); + public R> listForSelect() { + List list = service.list(); + List listVO = ReviewSheetWrapper.build().listVO(list); return R.data(listVO); } /** - * [镀种] 新增一条 + * [生产处置单] 新增一条 */ @PostMapping("/save") @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Plating Obj") - public R save(@Valid @RequestBody Plating addOne) { + @Operation(summary = "新增一条", description = "传入ReviewSheet Obj") + public R save(@Valid @RequestBody ReviewSheet addOne) { addOne.setId(null); return R.status(service.save(addOne)); } /** - * [镀种] 新增批量 + * [生产处置单] 新增批量 */ @PostMapping("/saveBat") @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Plating List") - public R saveBat(@Valid @RequestBody List addList) { + @Operation(summary = "新增批量", description = "传入ReviewSheet List") + public R saveBat(@Valid @RequestBody List addList) { addList.forEach(one -> { one.setId(null); }); @@ -140,47 +139,47 @@ public class PlatingController extends BladeController { } /** - * [镀种] 修改一条 + * [生产处置单] 修改一条 */ @PostMapping("/update") @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Plating Obj") - public R update(@Valid @RequestBody Plating updateOne) { + @Operation(summary = "修改一条", description = "传入ReviewSheet Obj") + public R update(@Valid @RequestBody ReviewSheet updateOne) { return R.status(service.updateById(updateOne)); } /** - * [镀种] 修改批量 + * [生产处置单] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Plating List") - public R updateBat(@Valid @RequestBody List updateList) { + @Operation(summary = "修改批量", description = "传入ReviewSheet List") + public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } /** - * [镀种] 新增或修改一条 + * [生产处置单] 新增或修改一条 */ @PostMapping("/submit") @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Plating Obj") - public R submit(@Valid @RequestBody Plating mergeOne) { + @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") + public R submit(@Valid @RequestBody ReviewSheet mergeOne) { return R.status(service.saveOrUpdate(mergeOne)); } /** - * [镀种] 新增或修改批量 + * [生产处置单] 新增或修改批量 */ @PostMapping("/submitBat") @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Plating List") - public R submitBat(@Valid @RequestBody List mergeList) { + @Operation(summary = "新增或修改批量", description = "传入ReviewSheet List") + public R submitBat(@Valid @RequestBody List mergeList) { return R.status(service.saveOrUpdateBatch(mergeList)); } /** - * [镀种] 逻辑删除 + * [生产处置单] 逻辑删除 */ @PostMapping("/remove") @ApiOperationSupport(order = 61) @@ -190,25 +189,25 @@ public class PlatingController extends BladeController { } /** - * [镀种] 导出Excel + * [生产处置单] 导出Excel */ @GetMapping("/exportExcel") @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Plating") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map plating, + @Operation(summary = "导出Excel", description = "传入ReviewSheet") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map reviewSheet, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Plating::getTenantId, bladeUser.getTenantId()); + // queryWrapper.lambda().eq(ReviewSheet::getTenantId, bladeUser.getTenantId()); //} - //queryWrapper.lambda().eq(PlatingEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportPlating(qw); - ExcelUtil.export(response, "[镀种]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[镀种]数据表", list, PlatingExcel.class); + //queryWrapper.lambda().eq(ReviewSheetEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportReviewSheet(qw); + ExcelUtil.export(response, "[生产处置单]数据" + DateUtil.time(), + "[生产处置单]数据表", list, ReviewSheetExcel.class); } /** - * [镀种] 下载Excel模板 + * [生产处置单] 下载Excel模板 */ @GetMapping("/downloadExcelTemplate") @ApiOperationSupport(order = 71) @@ -220,7 +219,7 @@ public class PlatingController extends BladeController { } /** - * [镀种] 导入Excel + * [生产处置单] 导入Excel */ @PostMapping("/importExcel") @ApiOperationSupport(order = 72) @@ -230,8 +229,8 @@ public class PlatingController extends BladeController { if (checkR != null) { return checkR; } - List importList = ExcelUtil.read( - file, 0, 1, Plating.class + List importList = ExcelUtil.read( + file, 0, 1, ReviewSheet.class ); return R.status(service.saveBatch(importList)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java index 84d73794..534fa5df 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java @@ -40,6 +40,9 @@ import java.util.stream.Collectors; /** * [质量标准] 控制器 + * mes v1: 新加 + * + * SELECT * FROM "RB_BS_ADDITIONAL_MESS" WHERE TYPE = 3 ORDER BY ONE_DATA ASC * * @author Tom Shuo * @since 2025-12-15 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java new file mode 100644 index 00000000..851db1d0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java @@ -0,0 +1,237 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.WorkPlanItemExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; +import org.springblade.desk.quality.service.IWorkPlanItemService; +import org.springblade.desk.quality.wrapper.WorkPlanItemWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [工序检验项] 控制器 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@RestController +@RequestMapping("/WorkPlanItem") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[工序检验项]", description = "[工序检验项]接口") +public class WorkPlanItemController extends BladeController { + + @Resource + private IWorkPlanItemService service; + + /** + * [工序检验项] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入WorkPlanItem Obj") + public R detail(WorkPlanItem workPlanItem) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItem); + WorkPlanItem detail = service.getOne(qw); + WorkPlanItemVO detailVO = WorkPlanItemWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工序检验项] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入WorkPlanItem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map workPlanItem, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItem, WorkPlanItem.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = WorkPlanItemWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [工序检验项] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入WorkPlanItem Obj") + public R> page(WorkPlanItemVO workPlanItem, Query query) { + IPage pagesVO = service.selectWorkPlanItemPage( + Condition.getPage(query), workPlanItem + ); + return R.data(pagesVO); + } + + /** + * [工序检验项] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = WorkPlanItemWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工序检验项] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入WorkPlanItem Obj") + public R save(@Valid @RequestBody WorkPlanItem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [工序检验项] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入WorkPlanItem List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [工序检验项] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入WorkPlanItem Obj") + public R update(@Valid @RequestBody WorkPlanItem updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [工序检验项] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入WorkPlanItem List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [工序检验项] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入WorkPlanItem Obj") + public R submit(@Valid @RequestBody WorkPlanItem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [工序检验项] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入WorkPlanItem List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [工序检验项] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [工序检验项] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入WorkPlanItem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map workPlanItem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItem, WorkPlanItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(WorkPlanItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(WorkPlanItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportWorkPlanItem(qw); + ExcelUtil.export(response, "[工序检验项]数据" + DateUtil.time(), + "[工序检验项]数据表", list, WorkPlanItemExcel.class); + } + + /** + * [工序检验项] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [工序检验项] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, WorkPlanItem.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java new file mode 100644 index 00000000..c9123893 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java @@ -0,0 +1,237 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.service.IWorkPlanItemDetailService; +import org.springblade.desk.quality.wrapper.WorkPlanItemDetailWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [工序检验项明细] 控制器 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@RestController +@RequestMapping("/WorkPlanItemDetail") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[工序检验项明细]", description = "[工序检验项明细]接口") +public class WorkPlanItemDetailController extends BladeController { + + @Resource + private IWorkPlanItemDetailService service; + + /** + * [工序检验项明细] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入WorkPlanItemDetail Obj") + public R detail(WorkPlanItemDetail workPlanItemDetail) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItemDetail); + WorkPlanItemDetail detail = service.getOne(qw); + WorkPlanItemDetailVO detailVO = WorkPlanItemDetailWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工序检验项明细] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入WorkPlanItemDetail Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map workPlanItemDetail, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItemDetail, WorkPlanItemDetail.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = WorkPlanItemDetailWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [工序检验项明细] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入WorkPlanItemDetail Obj") + public R> page(WorkPlanItemDetailVO workPlanItemDetail, Query query) { + IPage pagesVO = service.selectWorkPlanItemDetailPage( + Condition.getPage(query), workPlanItemDetail + ); + return R.data(pagesVO); + } + + /** + * [工序检验项明细] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = WorkPlanItemDetailWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工序检验项明细] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入WorkPlanItemDetail Obj") + public R save(@Valid @RequestBody WorkPlanItemDetail addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [工序检验项明细] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入WorkPlanItemDetail List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [工序检验项明细] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入WorkPlanItemDetail Obj") + public R update(@Valid @RequestBody WorkPlanItemDetail updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [工序检验项明细] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入WorkPlanItemDetail List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [工序检验项明细] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入WorkPlanItemDetail Obj") + public R submit(@Valid @RequestBody WorkPlanItemDetail mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [工序检验项明细] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入WorkPlanItemDetail List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [工序检验项明细] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [工序检验项明细] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入WorkPlanItemDetail") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map workPlanItemDetail, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItemDetail, WorkPlanItemDetail.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(WorkPlanItemDetail::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(WorkPlanItemDetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportWorkPlanItemDetail(qw); + ExcelUtil.export(response, "[工序检验项明细]数据" + DateUtil.time(), + "[工序检验项明细]数据表", list, WorkPlanItemDetailExcel.class); + } + + /** + * [工序检验项明细] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [工序检验项明细] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, WorkPlanItemDetail.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewDutyExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewDutyExcel.java new file mode 100644 index 00000000..8019de11 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewDutyExcel.java @@ -0,0 +1,81 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [生产处置单-责任零件] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ReviewDutyExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]id + */ + @ColumnWidth(20) + @ExcelProperty("[生产处置单]id") + private BigDecimal reviewSheetId; + /** + * 责任零件 + */ + @ColumnWidth(20) + @ExcelProperty("责任零件") + private String dutyPart; + /** + * 责任批号 + */ + @ColumnWidth(20) + @ExcelProperty("责任批号") + private String dutyBatch; + /** + * 相关零件 + */ + @ColumnWidth(20) + @ExcelProperty("相关零件") + private String relevantPart; + /** + * 相关批号 + */ + @ColumnWidth(20) + @ExcelProperty("相关批号") + private String relevantBatch; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Short qty; + /** + * 单位 + */ + @ColumnWidth(20) + @ExcelProperty("单位") + private String unit; + /** + * 描述 + */ + @ColumnWidth(20) + @ExcelProperty("描述") + private String memo; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewFaultExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewFaultExcel.java new file mode 100644 index 00000000..d3e765fb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewFaultExcel.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [生产处置单-问题故障] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ReviewFaultExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]id + */ + @ColumnWidth(20) + @ExcelProperty("[生产处置单]id") + private BigDecimal reviewSheetId; + /** + * 故障类别[缺陷]id + */ + @ColumnWidth(20) + @ExcelProperty("故障类别[缺陷]id") + private BigDecimal ngType2Id; + /** + * 问题大类[缺陷]id + */ + @ColumnWidth(20) + @ExcelProperty("问题大类[缺陷]id") + private BigDecimal ngType3Id; + /** + * 问题小类[缺陷]id + */ + @ColumnWidth(20) + @ExcelProperty("问题小类[缺陷]id") + private BigDecimal ngType4Id; + /** + * 比例 + */ + @ColumnWidth(20) + @ExcelProperty("比例") + private BigDecimal scale; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Long qty; + /** + * 描述 + */ + @ColumnWidth(20) + @ExcelProperty("描述") + private String memo; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewSheetExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewSheetExcel.java new file mode 100644 index 00000000..02a890f6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewSheetExcel.java @@ -0,0 +1,256 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [生产处置单] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ReviewSheetExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[生产处置单]编码") + private String reviewOrderCode; + /** + * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; + */ + @ColumnWidth(20) + @ExcelProperty("[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;") + private Long reviewOrderMode; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [检验任务]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验任务]id") + private BigDecimal taskId; + /** + * 打回[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("打回[用户]id") + private BigDecimal backUserId; + /** + * 审理[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("审理[用户]id") + private BigDecimal reviewUserId; + /** + * [部门]id + */ + @ColumnWidth(20) + @ExcelProperty("[部门]id") + private BigDecimal deptId; + /** + * 比例 + */ + @ColumnWidth(20) + @ExcelProperty("比例") + private BigDecimal scale; + /** + * 不合格数量 + */ + @ColumnWidth(20) + @ExcelProperty("不合格数量") + private Short unqualifiedQty; + /** + * 上级编号 + */ + @ColumnWidth(20) + @ExcelProperty("上级编号") + private String upCode; + /** + * 审理意见/审理结论 + */ + @ColumnWidth(20) + @ExcelProperty("审理意见/审理结论") + private String memo; + /** + * 打回原因 + */ + @ColumnWidth(20) + @ExcelProperty("打回原因") + private String backReason; + /** + * 打回时间 + */ + @ColumnWidth(20) + @ExcelProperty("打回时间") + private LocalDateTime backDate; + /** + * 新ERP返回审理单主键 + */ + @ColumnWidth(20) + @ExcelProperty("新ERP返回审理单主键") + private String erpId; + /** + * 审理时间 + */ + @ColumnWidth(20) + @ExcelProperty("审理时间") + private LocalDateTime reviewDate; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 是否批次性问题-[1]:是;[0]否; + */ + @ColumnWidth(20) + @ExcelProperty("是否批次性问题-[1]:是;[0]否;") + private Long isBatProblem; + /** + * 是否经典问题-[1]:是;[0]否; + */ + @ColumnWidth(20) + @ExcelProperty("是否经典问题-[1]:是;[0]否;") + private Long isClassicProblem; + /** + * 是否低级错误-[1]:是;[0]否; + */ + @ColumnWidth(20) + @ExcelProperty("是否低级错误-[1]:是;[0]否;") + private Long isLowError; + /** + * 是否质量问题-[1]:是;[0]否; + */ + @ColumnWidth(20) + @ExcelProperty("是否质量问题-[1]:是;[0]否;") + private Long isQualityProblem; + /** + * 审理单号 + */ + @ColumnWidth(20) + @ExcelProperty("审理单号") + private String rsCode; + /** + * 审理状态 + */ + @ColumnWidth(20) + @ExcelProperty("审理状态") + private Long reviewStatus; + /** + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; + */ + @ColumnWidth(20) + @ExcelProperty("业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废;") + private Short bizType; + /** + * 物料号 + */ + @ColumnWidth(20) + @ExcelProperty("物料号") + private String partCode; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchNo; + /** + * [外协厂家]id + */ + @ColumnWidth(20) + @ExcelProperty("[外协厂家]id") + private BigDecimal oemId; + /** + * 生产标识 + */ + @ColumnWidth(20) + @ExcelProperty("生产标识") + private String prodIdent; + /** + * 故障类别 + */ + @ColumnWidth(20) + @ExcelProperty("故障类别") + private String faultType; + /** + * [车间订单]id + */ + @ColumnWidth(20) + @ExcelProperty("[车间订单]id") + private BigDecimal woId; + /** + * [车间订单]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[车间订单]编码") + private String woCode; + /** + * [车间作业计划]id + */ + @ColumnWidth(20) + @ExcelProperty("[车间作业计划]id") + private BigDecimal wpId; + /** + * 总数量 + */ + @ColumnWidth(20) + @ExcelProperty("总数量") + private Short num; + /** + * 返修数量 + */ + @ColumnWidth(20) + @ExcelProperty("返修数量") + private Short reDoNum; + /** + * 返修原因 + */ + @ColumnWidth(20) + @ExcelProperty("返修原因") + private String reDoReason; + /** + * 返修建议 + */ + @ColumnWidth(20) + @ExcelProperty("返修建议") + private String reDoSuggest; + /** + * 返修路线 + */ + @ColumnWidth(20) + @ExcelProperty("返修路线") + private String reDoPath; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java new file mode 100644 index 00000000..0f4bcad6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java @@ -0,0 +1,111 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [工序检验项明细] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class WorkPlanItemDetailExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [工序检验项]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序检验项]id") + private BigDecimal workPlanItemId; + /** + * 测量类型-[1]镀前;[2]:镀后; + */ + @ColumnWidth(20) + @ExcelProperty("测量类型-[1]镀前;[2]:镀后;") + private String testType; + /** + * 尺寸 + */ + @ColumnWidth(20) + @ExcelProperty("尺寸") + private String ruleSize; + /** + * 量具 + */ + @ColumnWidth(20) + @ExcelProperty("量具") + private String tools; + /** + * 测量值1 + */ + @ColumnWidth(20) + @ExcelProperty("测量值1") + private String gaugeValue1; + /** + * 测量值2 + */ + @ColumnWidth(20) + @ExcelProperty("测量值2") + private String gaugeValue2; + /** + * 测量值3 + */ + @ColumnWidth(20) + @ExcelProperty("测量值3") + private String gaugeValue3; + /** + * 测量值4 + */ + @ColumnWidth(20) + @ExcelProperty("测量值4") + private String gaugeValue4; + /** + * 测量值5 + */ + @ColumnWidth(20) + @ExcelProperty("测量值5") + private String gaugeValue5; + /** + * 测量值6 + */ + @ColumnWidth(20) + @ExcelProperty("测量值6") + private String gaugeValue6; + /** + * 测量值7 + */ + @ColumnWidth(20) + @ExcelProperty("测量值7") + private String gaugeValue7; + /** + * 测量值8 + */ + @ColumnWidth(20) + @ExcelProperty("测量值8") + private String gaugeValue8; + /** + * [量具]id + */ + @ColumnWidth(20) + @ExcelProperty("[量具]id") + private BigDecimal mtId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemExcel.java new file mode 100644 index 00000000..33d02b43 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemExcel.java @@ -0,0 +1,136 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [工序检验项] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class WorkPlanItemExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业计划]id + */ + @ColumnWidth(20) + @ExcelProperty("[作业计划]id") + private BigDecimal wpId; + /** + * 检验数 + */ + @ColumnWidth(20) + @ExcelProperty("检验数") + private Short checkQty; + /** + * 试验数量 + */ + @ColumnWidth(20) + @ExcelProperty("试验数量") + private Short testQty; + /** + * 消耗数量 + */ + @ColumnWidth(20) + @ExcelProperty("消耗数量") + private Short lossQty; + /** + * [检验项目]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[检验项目]编码") + private String itemCode; + /** + * [检验项目]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[检验项目]名称") + private String itemName; + /** + * [质量标准]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[质量标准]名称") + private String standardName; + /** + * 检验员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("检验员[用户]id") + private BigDecimal checkUserId; + /** + * 检验值 + */ + @ColumnWidth(20) + @ExcelProperty("检验值") + private String checkValue; + /** + * 检验日期 + */ + @ColumnWidth(20) + @ExcelProperty("检验日期") + private LocalDateTime checkDate; + /** + * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + */ + @ColumnWidth(20) + @ExcelProperty("检验结果-[1]:合格;[2]:不合格;[-1]:NA") + private Short checkResult; + /** + * 工时定额 + */ + @ColumnWidth(20) + @ExcelProperty("工时定额") + private Short hourQuota; + /** + * 准备工时 + */ + @ColumnWidth(20) + @ExcelProperty("准备工时") + private Short hourPrepare; + /** + * [检验任务]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验任务]id") + private BigDecimal taskId; + /** + * [检验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验项目]id") + private BigDecimal itemId; + /** + * [质量标准]id + */ + @ColumnWidth(20) + @ExcelProperty("[质量标准]id") + private BigDecimal standardId; + /** + * [检验模板]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验模板]id") + private BigDecimal templateId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java index 23042bb5..7b12f30f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import java.util.List; @@ -28,7 +28,7 @@ public interface InspectionTaskMapper extends BaseMapper { * @param inspectionTask 查询参数 * @return List */ - List selectInspectionTaskPage(IPage page, InspectionTaskVO inspectionTask); + List selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); /** * 获取导出数据 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index af60ba5f..54405acb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -34,13 +36,18 @@ + - + SELECT * + FROM QA_INSPECTION_TASK ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.java new file mode 100644 index 00000000..0a3c5a2c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.ReviewDutyExcel; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; + +import java.util.List; + +/** + * [生产处置单-责任零件] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface ReviewDutyMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewDuty 查询参数 + * @return List + */ + List selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewDuty(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml new file mode 100644 index 00000000..6af5e14f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.java new file mode 100644 index 00000000..246a778d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.ReviewFaultExcel; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; + +import java.util.List; + +/** + * [生产处置单-问题故障] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface ReviewFaultMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewFault 查询参数 + * @return List + */ + List selectReviewFaultPage(IPage page, ReviewFaultVO reviewFault); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewFault(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml new file mode 100644 index 00000000..852c6f50 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java new file mode 100644 index 00000000..6681b62c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.ReviewSheetExcel; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; + +import java.util.List; + +/** + * [生产处置单] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface ReviewSheetMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewSheet 查询参数 + * @return List + */ + List selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewSheet(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml new file mode 100644 index 00000000..bf15a0bc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.java new file mode 100644 index 00000000..c9337cff --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; + +import java.util.List; + +/** + * [工序检验项明细] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface WorkPlanItemDetailMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItemDetail 查询参数 + * @return List + */ + List selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItemDetail(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml new file mode 100644 index 00000000..36f7cb91 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java new file mode 100644 index 00000000..bf6632f5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.WorkPlanItemExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; + +import java.util.List; + +/** + * [工序检验项] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface WorkPlanItemMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItem 查询参数 + * @return List + */ + List selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItem(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml new file mode 100644 index 00000000..8abe8903 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java new file mode 100644 index 00000000..07966acf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; + +import java.io.Serial; + +/** + * [生产处置单-责任零件] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewDutyDTO extends ReviewDuty { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java new file mode 100644 index 00000000..c321096d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewFault; + +import java.io.Serial; + +/** + * [生产处置单-问题故障] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewFaultDTO extends ReviewFault { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java new file mode 100644 index 00000000..8524efe0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +import java.io.Serial; + +/** + * [生产处置单] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewSheetDTO extends ReviewSheet { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java new file mode 100644 index 00000000..f2968c99 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; + +import java.io.Serial; + +/** + * [工序检验项] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemDTO extends WorkPlanItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java new file mode 100644 index 00000000..00003c72 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; + +import java.io.Serial; + +/** + * [工序检验项明细] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemDetailDTO extends WorkPlanItemDetail { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java index 0c82e351..a1dd0d2a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * [检验项目] 实体类 - * + * mes v1 : bs_text_project BsTextProject 试验项目 * @author Tom Shuo * @since 2025-12-16 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java index c2831fe9..6961090a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; -import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -25,278 +24,287 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class InspectionTask extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * [检验任务]编码 - */ + /** + * [检验任务]编码 + */ public static final String COL_CODE = "CODE"; - /** - * [检验任务]类型 - */ + /** + * [检验任务]类型 + */ public static final String COL_INSPECTION_TASK_TYPE = "INSPECTION_TASK_TYPE"; - /** - * [检验任务] - */ + /** + * [检验任务] + */ public static final String COL_NAME = "NAME"; - /** - * [工单]id - */ + /** + * [工单]id + */ public static final String COL_WORK_ORDER_ID = "WORK_ORDER_ID"; - /** - * [制品]id - */ + /** + * [制品]id + */ public static final String COL_PRODUCT_ID = "PRODUCT_ID"; - /** - * [工序]id - */ + /** + * [工序]id + */ public static final String COL_PROCESS_ID = "PROCESS_ID"; - /** - * 质检员[用户]id - */ + /** + * 质检员[用户]id + */ public static final String COL_CHECK_USER_ID = "CHECK_USER_ID"; - /** - * [制品]编码 - */ + /** + * [制品]编码 + */ public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; - /** - * [制品]序列号 - */ + /** + * [制品]序列号 + */ public static final String COL_PRODUCT_SN = "PRODUCT_SN"; - /** - * 生产批次号 - */ + /** + * 生产批次号 + */ public static final String COL_BATCH_NUMBER = "BATCH_NUMBER"; - /** - * [工单]编码 - */ + /** + * [工单]编码 + */ public static final String COL_WORK_ORDER_CODE = "WORK_ORDER_CODE"; - /** - * [工序]编码 - */ + /** + * [工序]编码 + */ public static final String COL_PROCESS_CODE = "PROCESS_CODE"; - /** - * 备注 - */ + /** + * 备注 + */ public static final String COL_REMARK = "REMARK"; - /** - * 计划开始时间 - */ + /** + * 计划开始时间 + */ public static final String COL_PLANNED_START_DATE = "PLANNED_START_DATE"; - /** - * 计划结束时间 - */ + /** + * 计划结束时间 + */ public static final String COL_PLANNED_END_DATE = "PLANNED_END_DATE"; - /** - * 实际开始时间 - */ + /** + * 实际开始时间 + */ public static final String COL_ACTUAL_START_DATE = "ACTUAL_START_DATE"; - /** - * 实际结束时间 - */ + /** + * 实际结束时间 + */ public static final String COL_ACTUAL_END_DATE = "ACTUAL_END_DATE"; - /** - * 检验样本数量 - */ + /** + * 检验样本数量 + */ public static final String COL_SIMPLE_COUNT = "SIMPLE_COUNT"; - /** - * 检验结果-[1]:合格;[2]:不合格;[3]:NA - */ + /** + * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + */ public static final String COL_CHECK_RESULT = "CHECK_RESULT"; - /** - * 检验数量 - */ + /** + * 检验数量 + */ public static final String COL_CHECK_QTY = "CHECK_QTY"; - /** - * 消耗数量 - */ + /** + * 消耗数量 + */ public static final String COL_LOSS_QTY = "LOSS_QTY"; - /** - * 合格数量 - */ + /** + * 合格数量 + */ public static final String COL_QUALIFIED_QTY = "QUALIFIED_QTY"; - /** - * 报废数量 - */ + /** + * 报废数量 + */ public static final String COL_SCRAP_QTY = "SCRAP_QTY"; - /** - * 不合格数量 - */ + /** + * 不合格数量 + */ public static final String COL_UNQUALIFIED_QTY = "UNQUALIFIED_QTY"; - /** - * 不良原因 - */ + /** + * 不良原因 + */ public static final String COL_POOR_REASON = "POOR_REASON"; - /** - * 不良描述 - */ + /** + * 不良描述 + */ public static final String COL_POOR_MEMO = "POOR_MEMO"; - /** - * 检验日期 - */ + /** + * 检验日期 + */ public static final String COL_CHECK_DATE = "CHECK_DATE"; - /** - * 审理单状态 - */ + /** + * 审理单状态 + */ public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; - /** - * 检验备注 - */ + /** + * 检验备注 + */ public static final String COL_CHECK_MEMO = "CHECK_MEMO"; - /** - * 返工数 - */ + /** + * 返工数 + */ public static final String COL_REWORK_QTY = "REWORK_QTY"; + /** + * [作业计划]id + */ + public static final String COL_WP_ID = "WP_ID"; - /** - * [检验任务]编码 - */ - @Schema(description = "[检验任务]编码") - private String code; - /** - * [检验任务]类型 - */ - @Schema(description = "[检验任务]类型") - private Long inspectionTaskType; - /** - * [检验任务] - */ - @Schema(description = "[检验任务]") - private String name; - /** - * [工单]id - */ - @Schema(description = "[工单]id") - private BigDecimal workOrderId; - /** - * [制品]id - */ - @Schema(description = "[制品]id") - private BigDecimal productId; - /** - * [工序]id - */ - @Schema(description = "[工序]id") - private BigDecimal processId; - /** - * 质检员[用户]id - */ - @Schema(description = "质检员[用户]id") - private BigDecimal checkUserId; - /** - * [制品]编码 - */ - @Schema(description = "[制品]编码") - private Long productCode; - /** - * [制品]序列号 - */ - @Schema(description = "[制品]序列号") - private Long productSn; - /** - * 生产批次号 - */ - @Schema(description = "生产批次号") - private Long batchNumber; - /** - * [工单]编码 - */ - @Schema(description = "[工单]编码") - private String workOrderCode; - /** - * [工序]编码 - */ - @Schema(description = "[工序]编码") - private String processCode; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 计划开始时间 - */ - @Schema(description = "计划开始时间") - private LocalDateTime plannedStartDate; - /** - * 计划结束时间 - */ - @Schema(description = "计划结束时间") - private LocalDateTime plannedEndDate; - /** - * 实际开始时间 - */ - @Schema(description = "实际开始时间") - private LocalDateTime actualStartDate; - /** - * 实际结束时间 - */ - @Schema(description = "实际结束时间") - private LocalDateTime actualEndDate; - /** - * 检验样本数量 - */ - @Schema(description = "检验样本数量") - private BigDecimal simpleCount; - /** - * 检验结果-[1]:合格;[2]:不合格;[3]:NA - */ - @Schema(description = "检验结果-[1]:合格;[2]:不合格;[3]:NA") - private Short checkResult; - /** - * 检验数量 - */ - @Schema(description = "检验数量") - private Short checkQty; - /** - * 消耗数量 - */ - @Schema(description = "消耗数量") - private Short lossQty; - /** - * 合格数量 - */ - @Schema(description = "合格数量") - private Short qualifiedQty; - /** - * 报废数量 - */ - @Schema(description = "报废数量") - private Short scrapQty; - /** - * 不合格数量 - */ - @Schema(description = "不合格数量") - private Short unqualifiedQty; - /** - * 不良原因 - */ - @Schema(description = "不良原因") - private String poorReason; - /** - * 不良描述 - */ - @Schema(description = "不良描述") - private String poorMemo; - /** - * 检验日期 - */ - @Schema(description = "检验日期") - private LocalDateTime checkDate; - /** - * 审理单状态 - */ - @Schema(description = "审理单状态") - private Short reviewStatus; - /** - * 检验备注 - */ - @Schema(description = "检验备注") - private String checkMemo; - /** - * 返工数 - */ - @Schema(description = "返工数") - private Short reworkQty; + /** + * [检验任务]编码 + */ + @Schema(description = "[检验任务]编码") + private String code; + /** + * [检验任务]类型 + */ + @Schema(description = "[检验任务]类型") + private Long inspectionTaskType; + /** + * [检验任务] + */ + @Schema(description = "[检验任务]") + private String name; + /** + * [工单]id + */ + @Schema(description = "[工单]id") + private Long workOrderId; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private Long productId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private Long processId; + /** + * 质检员[用户]id + */ + @Schema(description = "质检员[用户]id") + private Long checkUserId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private Long productCode; + /** + * [制品]序列号 + */ + @Schema(description = "[制品]序列号") + private Long productSn; + /** + * 生产批次号 + */ + @Schema(description = "生产批次号") + private Long batchNumber; + /** + * [工单]编码 + */ + @Schema(description = "[工单]编码") + private String workOrderCode; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 计划开始时间 + */ + @Schema(description = "计划开始时间") + private LocalDateTime plannedStartDate; + /** + * 计划结束时间 + */ + @Schema(description = "计划结束时间") + private LocalDateTime plannedEndDate; + /** + * 实际开始时间 + */ + @Schema(description = "实际开始时间") + private LocalDateTime actualStartDate; + /** + * 实际结束时间 + */ + @Schema(description = "实际结束时间") + private LocalDateTime actualEndDate; + /** + * 检验样本数量 + */ + @Schema(description = "检验样本数量") + private Long simpleCount; + /** + * 检验结果-[1]:合格;[2]:不合格;[3]:NA + */ + @Schema(description = "检验结果-[1]:合格;[2]:不合格;[-1]:NA") + private Integer checkResult; + /** + * 检验数量 + */ + @Schema(description = "检验数量") + private Short checkQty; + /** + * 消耗数量 + */ + @Schema(description = "消耗数量") + private Short lossQty; + /** + * 合格数量 + */ + @Schema(description = "合格数量") + private Short qualifiedQty; + /** + * 报废数量 + */ + @Schema(description = "报废数量") + private Short scrapQty; + /** + * 不合格数量 + */ + @Schema(description = "不合格数量") + private Short unqualifiedQty; + /** + * 不良原因 + */ + @Schema(description = "不良原因") + private String poorReason; + /** + * 不良描述 + */ + @Schema(description = "不良描述") + private String poorMemo; + /** + * 检验日期 + */ + @Schema(description = "检验日期") + private LocalDateTime checkDate; + /** + * 审理单状态 + */ + @Schema(description = "审理单状态") + private Short reviewStatus; + /** + * 检验备注 + */ + @Schema(description = "检验备注") + private String checkMemo; + /** + * 返工数 + */ + @Schema(description = "返工数") + private Long reworkQty; + /** + * [作业计划]id + */ + @Schema(description = "[作业计划]id") + private Long wpId; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java index 03526087..143df500 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * [检验模板明细关联] 实体类 - * + * mes v1: * @author Tom Shuo * @since 2025-12-19 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java new file mode 100644 index 00000000..aa8241c7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java @@ -0,0 +1,102 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [生产处置单-责任零件] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_REVIEW_DUTY") +@Schema(description = "ReviewDuty Entity对象") +@EqualsAndHashCode(callSuper = true) +public class ReviewDuty extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]id + */ + public static final String COL_REVIEW_SHEET_ID = "REVIEW_SHEET_ID"; + /** + * 责任零件 + */ + public static final String COL_DUTY_PART = "DUTY_PART"; + /** + * 责任批号 + */ + public static final String COL_DUTY_BATCH = "DUTY_BATCH"; + /** + * 相关零件 + */ + public static final String COL_RELEVANT_PART = "RELEVANT_PART"; + /** + * 相关批号 + */ + public static final String COL_RELEVANT_BATCH = "RELEVANT_BATCH"; + /** + * 数量 + */ + public static final String COL_QTY = "QTY"; + /** + * 单位 + */ + public static final String COL_UNIT = "UNIT"; + /** + * 描述 + */ + public static final String COL_MEMO = "MEMO"; + + /** + * [生产处置单]id + */ + @Schema(description = "[生产处置单]id") + private Long reviewSheetId; + /** + * 责任零件 + */ + @Schema(description = "责任零件") + private String dutyPart; + /** + * 责任批号 + */ + @Schema(description = "责任批号") + private String dutyBatch; + /** + * 相关零件 + */ + @Schema(description = "相关零件") + private String relevantPart; + /** + * 相关批号 + */ + @Schema(description = "相关批号") + private String relevantBatch; + /** + * 数量 + */ + @Schema(description = "数量") + private Short qty; + /** + * 单位 + */ + @Schema(description = "单位") + private String unit; + /** + * 描述 + */ + @Schema(description = "描述") + private String memo; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java new file mode 100644 index 00000000..c993bc75 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java @@ -0,0 +1,94 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [生产处置单-问题故障] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_REVIEW_FAULT") +@Schema(description = "ReviewFault Entity对象") +@EqualsAndHashCode(callSuper = true) +public class ReviewFault extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]id + */ + public static final String COL_REVIEW_SHEET_ID = "REVIEW_SHEET_ID"; + /** + * 故障类别[缺陷]id + */ + public static final String COL_NG_TYPE2_ID = "NG_TYPE2_ID"; + /** + * 问题大类[缺陷]id + */ + public static final String COL_NG_TYPE3_ID = "NG_TYPE3_ID"; + /** + * 问题小类[缺陷]id + */ + public static final String COL_NG_TYPE4_ID = "NG_TYPE4_ID"; + /** + * 比例 + */ + public static final String COL_SCALE = "SCALE"; + /** + * 数量 + */ + public static final String COL_QTY = "QTY"; + /** + * 描述 + */ + public static final String COL_MEMO = "MEMO"; + + /** + * [生产处置单]id + */ + @Schema(description = "[生产处置单]id") + private Long reviewSheetId; + /** + * 故障类别[缺陷]id + */ + @Schema(description = "故障类别[缺陷]id") + private Long ngType2Id; + /** + * 问题大类[缺陷]id + */ + @Schema(description = "问题大类[缺陷]id") + private Long ngType3Id; + /** + * 问题小类[缺陷]id + */ + @Schema(description = "问题小类[缺陷]id") + private Long ngType4Id; + /** + * 比例 + */ + @Schema(description = "比例") + private Double scale; + /** + * 数量 + */ + @Schema(description = "数量") + private Long qty; + /** + * 描述 + */ + @Schema(description = "描述") + private String memo; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java new file mode 100644 index 00000000..6a5cb806 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -0,0 +1,364 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * [生产处置单] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_REVIEW_SHEET") +@Schema(description = "ReviewSheet Entity对象") +@EqualsAndHashCode(callSuper = true) +public class ReviewSheet extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]编码 + */ + public static final String COL_REVIEW_ORDER_CODE = "REVIEW_ORDER_CODE"; + /** + * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; + */ + public static final String COL_REVIEW_ORDER_MODE = "REVIEW_ORDER_MODE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [检验任务]id + */ + public static final String COL_TASK_ID = "TASK_ID"; + /** + * 打回[用户]id + */ + public static final String COL_BACK_USER_ID = "BACK_USER_ID"; + /** + * 审理[用户]id + */ + public static final String COL_REVIEW_USER_ID = "REVIEW_USER_ID"; + /** + * [部门]id + */ + public static final String COL_DEPT_ID = "DEPT_ID"; + /** + * 比例 + */ + public static final String COL_SCALE = "SCALE"; + /** + * 不合格数量 + */ + public static final String COL_UNQUALIFIED_QTY = "UNQUALIFIED_QTY"; + /** + * 上级编号 + */ + public static final String COL_UP_CODE = "UP_CODE"; + /** + * 审理意见/审理结论 + */ + public static final String COL_MEMO = "MEMO"; + /** + * 打回原因 + */ + public static final String COL_BACK_REASON = "BACK_REASON"; + /** + * 打回时间 + */ + public static final String COL_BACK_DATE = "BACK_DATE"; + /** + * 新ERP返回审理单主键 + */ + public static final String COL_ERP_ID = "ERP_ID"; + /** + * 审理时间 + */ + public static final String COL_REVIEW_DATE = "REVIEW_DATE"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 是否批次性问题-[1]:是;[0]否; + */ + public static final String COL_IS_BAT_PROBLEM = "IS_BAT_PROBLEM"; + /** + * 是否经典问题-[1]:是;[0]否; + */ + public static final String COL_IS_CLASSIC_PROBLEM = "IS_CLASSIC_PROBLEM"; + /** + * 是否低级错误-[1]:是;[0]否; + */ + public static final String COL_IS_LOW_ERROR = "IS_LOW_ERROR"; + /** + * 是否质量问题-[1]:是;[0]否; + */ + public static final String COL_IS_QUALITY_PROBLEM = "IS_QUALITY_PROBLEM"; + /** + * 审理单号 + */ + public static final String COL_RS_CODE = "RS_CODE"; + /** + * 审理状态 + */ + public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; + /** + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; + */ + public static final String COL_BIZ_TYPE = "BIZ_TYPE"; + /** + * 物料号 + */ + public static final String COL_PART_CODE = "PART_CODE"; + /** + * 批次号 + */ + public static final String COL_BATCH_NO = "BATCH_NO"; + /** + * [外协厂家]id + */ + public static final String COL_OEM_ID = "OEM_ID"; + /** + * 生产标识 + */ + public static final String COL_PROD_IDENT = "PROD_IDENT"; + /** + * 故障类别 + */ + public static final String COL_FAULT_TYPE = "FAULT_TYPE"; + /** + * [车间订单]id + */ + public static final String COL_WO_ID = "WO_ID"; + /** + * [车间订单]编码 + */ + public static final String COL_WO_CODE = "WO_CODE"; + /** + * [车间作业计划]id + */ + public static final String COL_WP_ID = "WP_ID"; + /** + * 总数量 + */ + public static final String COL_NUM = "NUM"; + /** + * 返修数量 + */ + public static final String COL_RE_DO_NUM = "RE_DO_NUM"; + /** + * 返修原因 + */ + public static final String COL_RE_DO_REASON = "RE_DO_REASON"; + /** + * 返修建议 + */ + public static final String COL_RE_DO_SUGGEST = "RE_DO_SUGGEST"; + /** + * 返修路线 + */ + public static final String COL_RE_DO_PATH = "RE_DO_PATH"; + + /** + * [生产处置单]编码 + */ + @Schema(description = "[生产处置单]编码") + private String reviewOrderCode; + /** + * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; + */ + @Schema(description = "[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;") + private Long reviewOrderMode; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [检验任务]id + */ + @Schema(description = "[检验任务]id") + private Long taskId; + /** + * 打回[用户]id + */ + @Schema(description = "打回[用户]id") + private Long backUserId; + /** + * 审理[用户]id + */ + @Schema(description = "审理[用户]id") + private Long reviewUserId; + /** + * [部门]id + */ + @Schema(description = "[部门]id") + private Long deptId; + /** + * 比例 + */ + @Schema(description = "比例") + private Double scale; + /** + * 不合格数量 + */ + @Schema(description = "不合格数量") + private Short unqualifiedQty; + /** + * 上级编号 + */ + @Schema(description = "上级编号") + private String upCode; + /** + * 审理意见/审理结论 + */ + @Schema(description = "审理意见/审理结论") + private String memo; + /** + * 打回原因 + */ + @Schema(description = "打回原因") + private String backReason; + /** + * 打回时间 + */ + @Schema(description = "打回时间") + private LocalDateTime backDate; + /** + * 新ERP返回审理单主键 + */ + @Schema(description = "新ERP返回审理单主键") + private String erpId; + /** + * 审理时间 + */ + @Schema(description = "审理时间") + private LocalDateTime reviewDate; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 是否批次性问题-[1]:是;[0]否; + */ + @Schema(description = "是否批次性问题-[1]:是;[0]否;") + private Long isBatProblem; + /** + * 是否经典问题-[1]:是;[0]否; + */ + @Schema(description = "是否经典问题-[1]:是;[0]否;") + private Long isClassicProblem; + /** + * 是否低级错误-[1]:是;[0]否; + */ + @Schema(description = "是否低级错误-[1]:是;[0]否;") + private Long isLowError; + /** + * 是否质量问题-[1]:是;[0]否; + */ + @Schema(description = "是否质量问题-[1]:是;[0]否;") + private Long isQualityProblem; + /** + * 审理单号 + */ + @Schema(description = "审理单号") + private String rsCode; + /** + * 审理状态 + */ + @Schema(description = "审理状态") + private Long reviewStatus; + /** + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; + */ + @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废;") + private Short bizType; + /** + * 物料号 + */ + @Schema(description = "物料号") + private String partCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * [外协厂家]id + */ + @Schema(description = "[外协厂家]id") + private Long oemId; + /** + * 生产标识 + */ + @Schema(description = "生产标识") + private String prodIdent; + /** + * 故障类别 + */ + @Schema(description = "故障类别") + private String faultType; + /** + * [车间订单]id + */ + @Schema(description = "[车间订单]id") + private Long woId; + /** + * [车间订单]编码 + */ + @Schema(description = "[车间订单]编码") + private String woCode; + /** + * [车间作业计划]id + */ + @Schema(description = "[车间作业计划]id") + private Long wpId; + /** + * 总数量 + */ + @Schema(description = "总数量") + private Short num; + /** + * 返修数量 + */ + @Schema(description = "返修数量") + private Short reDoNum; + /** + * 返修原因 + */ + @Schema(description = "返修原因") + private String reDoReason; + /** + * 返修建议 + */ + @Schema(description = "返修建议") + private String reDoSuggest; + /** + * 返修路线 + */ + @Schema(description = "返修路线") + private String reDoPath; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java new file mode 100644 index 00000000..618dd7f3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java @@ -0,0 +1,184 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * [工序检验项] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_WORK_PLAN_ITEM") +@Schema(description = "WorkPlanItem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业计划]id + */ + public static final String COL_WP_ID = "WP_ID"; + /** + * 检验数 + */ + public static final String COL_CHECK_QTY = "CHECK_QTY"; + /** + * 试验数量 + */ + public static final String COL_TEST_QTY = "TEST_QTY"; + /** + * 消耗数量 + */ + public static final String COL_LOSS_QTY = "LOSS_QTY"; + /** + * [检验项目]编码 + */ + public static final String COL_ITEM_CODE = "ITEM_CODE"; + /** + * [检验项目]名称 + */ + public static final String COL_ITEM_NAME = "ITEM_NAME"; + /** + * [质量标准]名称 + */ + public static final String COL_STANDARD_NAME = "STANDARD_NAME"; + /** + * 检验员[用户]id + */ + public static final String COL_CHECK_USER_ID = "CHECK_USER_ID"; + /** + * 检验值 + */ + public static final String COL_CHECK_VALUE = "CHECK_VALUE"; + /** + * 检验日期 + */ + public static final String COL_CHECK_DATE = "CHECK_DATE"; + /** + * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + */ + public static final String COL_CHECK_RESULT = "CHECK_RESULT"; + /** + * 工时定额 + */ + public static final String COL_HOUR_QUOTA = "HOUR_QUOTA"; + /** + * 准备工时 + */ + public static final String COL_HOUR_PREPARE = "HOUR_PREPARE"; + /** + * [检验任务]id + */ + public static final String COL_TASK_ID = "TASK_ID"; + /** + * [检验项目]id + */ + public static final String COL_ITEM_ID = "ITEM_ID"; + /** + * [质量标准]id + */ + public static final String COL_STANDARD_ID = "STANDARD_ID"; + /** + * [检验模板]id + */ + public static final String COL_TEMPLATE_ID = "TEMPLATE_ID"; + + /** + * [作业计划]id + */ + @Schema(description = "[作业计划]id") + private Long wpId; + /** + * 检验数 + */ + @Schema(description = "检验数") + private Short checkQty; + /** + * 试验数量 + */ + @Schema(description = "试验数量") + private Short testQty; + /** + * 消耗数量 + */ + @Schema(description = "消耗数量") + private Short lossQty; + /** + * [检验项目]编码 + */ + @Schema(description = "[检验项目]编码") + private String itemCode; + /** + * [检验项目]名称 + */ + @Schema(description = "[检验项目]名称") + private String itemName; + /** + * [质量标准]名称 + */ + @Schema(description = "[质量标准]名称") + private String standardName; + /** + * 检验员[用户]id + */ + @Schema(description = "检验员[用户]id") + private Long checkUserId; + /** + * 检验值 + */ + @Schema(description = "检验值") + private String checkValue; + /** + * 检验日期 + */ + @Schema(description = "检验日期") + private LocalDateTime checkDate; + /** + * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + */ + @Schema(description = "检验结果-[1]:合格;[2]:不合格;[-1]:NA") + private Short checkResult; + /** + * 工时定额 + */ + @Schema(description = "工时定额") + private Short hourQuota; + /** + * 准备工时 + */ + @Schema(description = "准备工时") + private Short hourPrepare; + /** + * [检验任务]id + */ + @Schema(description = "[检验任务]id") + private Long taskId; + /** + * [检验项目]id + */ + @Schema(description = "[检验项目]id") + private Long itemId; + /** + * [质量标准]id + */ + @Schema(description = "[质量标准]id") + private Long standardId; + /** + * [检验模板]id + */ + @Schema(description = "[检验模板]id") + private Long templateId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java new file mode 100644 index 00000000..f7c12823 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java @@ -0,0 +1,147 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [工序检验项明细] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_WORK_PLAN_ITEM_DETAIL") +@Schema(description = "WorkPlanItemDetail Entity对象") +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemDetail extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [工序检验项]id + */ + public static final String COL_WORK_PLAN_ITEM_ID = "WORK_PLAN_ITEM_ID"; + /** + * 测量类型-[1]镀前;[2]:镀后; + */ + public static final String COL_TEST_TYPE = "TEST_TYPE"; + /** + * 尺寸 + */ + public static final String COL_RULE_SIZE = "RULE_SIZE"; + /** + * 量具 + */ + public static final String COL_TOOLS = "TOOLS"; + /** + * 测量值1 + */ + public static final String COL_GAUGE_VALUE1 = "GAUGE_VALUE1"; + /** + * 测量值2 + */ + public static final String COL_GAUGE_VALUE2 = "GAUGE_VALUE2"; + /** + * 测量值3 + */ + public static final String COL_GAUGE_VALUE3 = "GAUGE_VALUE3"; + /** + * 测量值4 + */ + public static final String COL_GAUGE_VALUE4 = "GAUGE_VALUE4"; + /** + * 测量值5 + */ + public static final String COL_GAUGE_VALUE5 = "GAUGE_VALUE5"; + /** + * 测量值6 + */ + public static final String COL_GAUGE_VALUE6 = "GAUGE_VALUE6"; + /** + * 测量值7 + */ + public static final String COL_GAUGE_VALUE7 = "GAUGE_VALUE7"; + /** + * 测量值8 + */ + public static final String COL_GAUGE_VALUE8 = "GAUGE_VALUE8"; + /** + * [量具]id + */ + public static final String COL_MT_ID = "MT_ID"; + + /** + * [工序检验项]id + */ + @Schema(description = "[工序检验项]id") + private Long workPlanItemId; + /** + * 测量类型-[1]镀前;[2]:镀后; + */ + @Schema(description = "测量类型-[1]镀前;[2]:镀后;") + private String testType; + /** + * 尺寸 + */ + @Schema(description = "尺寸") + private String ruleSize; + /** + * 量具 + */ + @Schema(description = "量具") + private String tools; + /** + * 测量值1 + */ + @Schema(description = "测量值1") + private String gaugeValue1; + /** + * 测量值2 + */ + @Schema(description = "测量值2") + private String gaugeValue2; + /** + * 测量值3 + */ + @Schema(description = "测量值3") + private String gaugeValue3; + /** + * 测量值4 + */ + @Schema(description = "测量值4") + private String gaugeValue4; + /** + * 测量值5 + */ + @Schema(description = "测量值5") + private String gaugeValue5; + /** + * 测量值6 + */ + @Schema(description = "测量值6") + private String gaugeValue6; + /** + * 测量值7 + */ + @Schema(description = "测量值7") + private String gaugeValue7; + /** + * 测量值8 + */ + @Schema(description = "测量值8") + private String gaugeValue8; + /** + * [量具]id + */ + @Schema(description = "[量具]id") + private Long mtId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index 333c4a1b..ee801651 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -1,12 +1,43 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import java.time.LocalDate; +import java.time.LocalDateTime; + @Data @EqualsAndHashCode(callSuper = true) public class InspectionTaskSearch extends InspectionTask { - + @Schema(description = "流程卡号") + private String cardNo; + @Schema(description = "加工单位-班组") + private Long teamSetId; + @Schema(description = "加工单位-供应商") + private Long oemId; + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "零件号") + private String partCode; + @Schema(description = "生产标识") + private String prodIdent; + @Schema(description = "需求部门") + private String needDeptName; + @Schema(description = "批次号") + private String batchNo; + @Schema(description = "分批号") + private String poBatchNo; + @Schema(description = "当前工序") + private Long currentProcessId; + @Schema(description = "下个工序") + private Long nextProcessId; + @Schema(description = "生产数量") + private Double poQty; + @Schema(description = "接收时间-开始") + private LocalDate receiveDateStart; + @Schema(description = "接收时间-结束") + private LocalDate receiveDateEnd; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java new file mode 100644 index 00000000..853db304 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -0,0 +1,29 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +import java.io.Serial; + +/** + * [检验任务] 视图实体类 + *

+ * 主要关联 - 生产模块中 todo: 需要联调关联 生产模块。 + * mes v1: PrWorkPlan + * mes v1: PrWorkOrder + * + * @author Tom Shuo + * @since 2025-12-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskDetailVO extends InspectionTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java new file mode 100644 index 00000000..3ce3aeea --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -0,0 +1,71 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * [检验任务] 视图实体类 + *

+ * 主要关联 - 生产模块中 todo: 需要联调关联 生产模块。 + * mes v1: PrWorkPlan + * mes v1: PrWorkOrder + * + * @author Tom Shuo + * @since 2025-12-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskListVO extends InspectionTask { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 质检员[用户]真名 + */ + @Schema(description = "质检员[用户]真名") + private Long checkUserRealName; + /** + * 检验结果 + */ + @Schema(description = "检验结果") + private String checkResultName; + @Schema(description = "主加工单位") + private String mainProcessingUnit = "第一班组"; + /** + * + */ + @Schema(description = "车间订单号") + private String woCode = "XXXX12345"; + @Schema(description = "零件号") + private String partCode = "XXXX12345"; + @Schema(description = "生产标识") + private String prodIdent = "XXXX12345"; + @Schema(description = "流程卡号") + private String cardNo = "XXXX12345"; + @Schema(description = "需求部门") + private String needDeptName = "XXXX12345"; + @Schema(description = "批次号") + private String batchNo = "XXXX12345"; + @Schema(description = "分批号") + private String poBatchNo = "XXXX12345"; + @Schema(description = "当前工序") + private String currentProcessName = "XXXX12345"; + @Schema(description = "下个工序") + private String nextProcessName = "XXXX12345"; + @Schema(description = "面积") + private Double area = 100.10; + @Schema(description = "总面积") + private Double areaTotal = 200.10; + @Schema(description = "生产数量") + private Double poQty = 2002d; + @Schema(description = "接收时间") + private LocalDateTime receiveDate = LocalDateTime.now(); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java new file mode 100644 index 00000000..02d9db40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java @@ -0,0 +1,15 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * mes v1: PrWorkOrder 车间订单 + */ +@Data +@EqualsAndHashCode() +public class QAPrWorkOrderVO { + + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java new file mode 100644 index 00000000..909f6644 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java @@ -0,0 +1,17 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * mes v1: PrWorkPlan 车间作业计划 + */ +@Data +@EqualsAndHashCode() +public class QAPrWorkPlanVO { + + + + + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java similarity index 51% rename from blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java index c7ab1b7a..e1afcb01 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java @@ -1,22 +1,23 @@ /** * Author: Tom Shuo */ -package org.springblade.desk.basic.pojo.vo; +package org.springblade.desk.quality.pojo.vo; -import org.springblade.desk.basic.pojo.entity.Plating; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; + import java.io.Serial; /** - * [镀种] 视图实体类 + * [生产处置单-责任零件] 视图实体类 * * @author Tom Shuo - * @since 2026-01-05 + * @since 2026-01-06 */ @Data @EqualsAndHashCode(callSuper = true) -public class PlatingVO extends Plating { +public class ReviewDutyVO extends ReviewDuty { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java new file mode 100644 index 00000000..d7363081 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewFault; + +import java.io.Serial; + +/** + * [生产处置单-问题故障] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewFaultVO extends ReviewFault { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java similarity index 62% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskVO.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java index f602b338..e91a9fdd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java @@ -5,19 +5,19 @@ package org.springblade.desk.quality.pojo.vo; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; import java.io.Serial; /** - * [检验任务] 视图实体类 + * [生产处置单] 视图实体类 * * @author Tom Shuo - * @since 2025-12-23 + * @since 2026-01-06 */ @Data @EqualsAndHashCode(callSuper = true) -public class InspectionTaskVO extends InspectionTask { +public class ReviewSheetVO extends ReviewSheet { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java new file mode 100644 index 00000000..bd161524 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; + +import java.io.Serial; + +/** + * [工序检验项明细] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemDetailVO extends WorkPlanItemDetail { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java similarity index 52% rename from blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java index 3afc59f0..fff382d9 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java @@ -1,22 +1,23 @@ /** * Author: Tom Shuo */ -package org.springblade.desk.basic.pojo.dto; +package org.springblade.desk.quality.pojo.vo; -import org.springblade.desk.basic.pojo.entity.Plating; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; + import java.io.Serial; /** - * [镀种] 数据传输对象实体类 + * [工序检验项] 视图实体类 * * @author Tom Shuo - * @since 2026-01-05 + * @since 2026-01-06 */ @Data @EqualsAndHashCode(callSuper = true) -public class PlatingDTO extends Plating { +public class WorkPlanItemVO extends WorkPlanItem { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java index 1151fc06..6c724cd9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import java.util.List; @@ -26,7 +26,7 @@ public interface IInspectionTaskService extends BaseService { * @param inspectionTask 查询参数 * @return IPage */ - IPage selectInspectionTaskPage(IPage page, InspectionTaskVO inspectionTask); + IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); /** * 导出数据 @@ -40,5 +40,5 @@ public interface IInspectionTaskService extends BaseService { * VO * @param vo */ - void setVOValue(InspectionTaskVO vo); + void setVOValue(InspectionTaskDetailVO vo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java new file mode 100644 index 00000000..51b558e1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.ReviewDutyExcel; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; + +import java.util.List; + +/** + * [生产处置单-责任零件] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IReviewDutyService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewDuty 查询参数 + * @return IPage + */ + IPage selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewDuty(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(ReviewDutyVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java new file mode 100644 index 00000000..3ffd53f3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.ReviewFaultExcel; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; + +import java.util.List; + +/** + * [生产处置单-问题故障] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IReviewFaultService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewFault 查询参数 + * @return IPage + */ + IPage selectReviewFaultPage(IPage page, ReviewFaultVO reviewFault); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewFault(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(ReviewFaultVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java new file mode 100644 index 00000000..fa74e7c2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.ReviewSheetExcel; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; + +import java.util.List; + +/** + * [生产处置单] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IReviewSheetService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewSheet 查询参数 + * @return IPage + */ + IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewSheet(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(ReviewSheetVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java new file mode 100644 index 00000000..581ef04c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; + +import java.util.List; + +/** + * [工序检验项明细] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IWorkPlanItemDetailService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItemDetail 查询参数 + * @return IPage + */ + IPage selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItemDetail(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(WorkPlanItemDetailVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java new file mode 100644 index 00000000..a4c6e35b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.WorkPlanItemExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; + +import java.util.List; + +/** + * [工序检验项] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IWorkPlanItemService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItem 查询参数 + * @return IPage + */ + IPage selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItem(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(WorkPlanItemVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 03500614..61431ad4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -14,7 +14,7 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.mapper.InspectionTaskMapper; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; @@ -41,7 +41,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl selectInspectionTaskPage(IPage page, InspectionTaskVO inspectionTask) { + public IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask) { return page.setRecords(baseMapper.selectInspectionTaskPage(page, inspectionTask)); } @@ -55,7 +55,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl implements IReviewDutyService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty) { + return page.setRecords(baseMapper.selectReviewDutyPage(page, reviewDuty)); + } + + @Override + public List exportReviewDuty(Wrapper queryWrapper) { + List reviewDutyList = baseMapper.exportReviewDuty(queryWrapper); + //reviewDutyList.forEach(reviewDuty -> { + // reviewDuty.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewDuty.getType())); + //}); + return reviewDutyList; + } + + @Override + public void setVOValue(ReviewDutyVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java new file mode 100644 index 00000000..b7bd11bc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.ReviewFaultExcel; +import org.springblade.desk.quality.mapper.ReviewFaultMapper; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; +import org.springblade.desk.quality.service.IReviewFaultService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [生产处置单-问题故障] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class ReviewFaultServiceImpl extends BaseServiceImpl implements IReviewFaultService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectReviewFaultPage(IPage page, ReviewFaultVO reviewFault) { + return page.setRecords(baseMapper.selectReviewFaultPage(page, reviewFault)); + } + + @Override + public List exportReviewFault(Wrapper queryWrapper) { + List reviewFaultList = baseMapper.exportReviewFault(queryWrapper); + //reviewFaultList.forEach(reviewFault -> { + // reviewFault.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewFault.getType())); + //}); + return reviewFaultList; + } + + @Override + public void setVOValue(ReviewFaultVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java new file mode 100644 index 00000000..421a37e7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.ReviewSheetExcel; +import org.springblade.desk.quality.mapper.ReviewSheetMapper; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.service.IReviewSheetService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [生产处置单] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class ReviewSheetServiceImpl extends BaseServiceImpl implements IReviewSheetService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet) { + return page.setRecords(baseMapper.selectReviewSheetPage(page, reviewSheet)); + } + + @Override + public List exportReviewSheet(Wrapper queryWrapper) { + List reviewSheetList = baseMapper.exportReviewSheet(queryWrapper); + //reviewSheetList.forEach(reviewSheet -> { + // reviewSheet.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewSheet.getType())); + //}); + return reviewSheetList; + } + + @Override + public void setVOValue(ReviewSheetVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java new file mode 100644 index 00000000..fa99427a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.mapper.WorkPlanItemDetailMapper; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.service.IWorkPlanItemDetailService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [工序检验项明细] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl implements IWorkPlanItemDetailService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail) { + return page.setRecords(baseMapper.selectWorkPlanItemDetailPage(page, workPlanItemDetail)); + } + + @Override + public List exportWorkPlanItemDetail(Wrapper queryWrapper) { + List workPlanItemDetailList = baseMapper.exportWorkPlanItemDetail(queryWrapper); + //workPlanItemDetailList.forEach(workPlanItemDetail -> { + // workPlanItemDetail.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkPlanItemDetail.getType())); + //}); + return workPlanItemDetailList; + } + + @Override + public void setVOValue(WorkPlanItemDetailVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java new file mode 100644 index 00000000..3577e21a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.WorkPlanItemExcel; +import org.springblade.desk.quality.mapper.WorkPlanItemMapper; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; +import org.springblade.desk.quality.service.IWorkPlanItemService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [工序检验项] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class WorkPlanItemServiceImpl extends BaseServiceImpl implements IWorkPlanItemService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem) { + return page.setRecords(baseMapper.selectWorkPlanItemPage(page, workPlanItem)); + } + + @Override + public List exportWorkPlanItem(Wrapper queryWrapper) { + List workPlanItemList = baseMapper.exportWorkPlanItem(queryWrapper); + //workPlanItemList.forEach(workPlanItem -> { + // workPlanItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkPlanItem.getType())); + //}); + return workPlanItemList; + } + + @Override + public void setVOValue(WorkPlanItemVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java index b4e93a2d..57cf5cd9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java @@ -6,7 +6,7 @@ package org.springblade.desk.quality.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import java.util.Objects; @@ -16,15 +16,15 @@ import java.util.Objects; * @author Tom Shuo * @since 2025-12-23 */ -public class InspectionTaskWrapper extends BaseEntityWrapper { +public class InspectionTaskWrapper extends BaseEntityWrapper { public static InspectionTaskWrapper build() { return new InspectionTaskWrapper(); } @Override - public InspectionTaskVO entityVO(InspectionTask inspectionTask) { - InspectionTaskVO VO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionTask, InspectionTaskVO.class)); + public InspectionTaskDetailVO entityVO(InspectionTask inspectionTask) { + InspectionTaskDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionTask, InspectionTaskDetailVO.class)); //User createUser = UserCache.getUser(inspectionTask.getCreateUser()); //User updateUser = UserCache.getUser(inspectionTask.getUpdateUser()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewDutyWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewDutyWrapper.java new file mode 100644 index 00000000..943a115a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewDutyWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; + +import java.util.Objects; + +/** + * [生产处置单-责任零件] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class ReviewDutyWrapper extends BaseEntityWrapper { + + public static ReviewDutyWrapper build() { + return new ReviewDutyWrapper(); + } + + @Override + public ReviewDutyVO entityVO(ReviewDuty reviewDuty) { + ReviewDutyVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewDuty, ReviewDutyVO.class)); + + //User createUser = UserCache.getUser(reviewDuty.getCreateUser()); + //User updateUser = UserCache.getUser(reviewDuty.getUpdateUser()); + //reviewDutyVO.setCreateUserName(createUser.getName()); + //reviewDutyVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewFaultWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewFaultWrapper.java new file mode 100644 index 00000000..c6123324 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewFaultWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; + +import java.util.Objects; + +/** + * [生产处置单-问题故障] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class ReviewFaultWrapper extends BaseEntityWrapper { + + public static ReviewFaultWrapper build() { + return new ReviewFaultWrapper(); + } + + @Override + public ReviewFaultVO entityVO(ReviewFault reviewFault) { + ReviewFaultVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewFault, ReviewFaultVO.class)); + + //User createUser = UserCache.getUser(reviewFault.getCreateUser()); + //User updateUser = UserCache.getUser(reviewFault.getUpdateUser()); + //reviewFaultVO.setCreateUserName(createUser.getName()); + //reviewFaultVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java new file mode 100644 index 00000000..44932661 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; + +import java.util.Objects; + +/** + * [生产处置单] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class ReviewSheetWrapper extends BaseEntityWrapper { + + public static ReviewSheetWrapper build() { + return new ReviewSheetWrapper(); + } + + @Override + public ReviewSheetVO entityVO(ReviewSheet reviewSheet) { + ReviewSheetVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetVO.class)); + + //User createUser = UserCache.getUser(reviewSheet.getCreateUser()); + //User updateUser = UserCache.getUser(reviewSheet.getUpdateUser()); + //reviewSheetVO.setCreateUserName(createUser.getName()); + //reviewSheetVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemDetailWrapper.java new file mode 100644 index 00000000..05a0c9e8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemDetailWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; + +import java.util.Objects; + +/** + * [工序检验项明细] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class WorkPlanItemDetailWrapper extends BaseEntityWrapper { + + public static WorkPlanItemDetailWrapper build() { + return new WorkPlanItemDetailWrapper(); + } + + @Override + public WorkPlanItemDetailVO entityVO(WorkPlanItemDetail workPlanItemDetail) { + WorkPlanItemDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(workPlanItemDetail, WorkPlanItemDetailVO.class)); + + //User createUser = UserCache.getUser(workPlanItemDetail.getCreateUser()); + //User updateUser = UserCache.getUser(workPlanItemDetail.getUpdateUser()); + //workPlanItemDetailVO.setCreateUserName(createUser.getName()); + //workPlanItemDetailVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemWrapper.java new file mode 100644 index 00000000..74a79ef3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; + +import java.util.Objects; + +/** + * [工序检验项] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class WorkPlanItemWrapper extends BaseEntityWrapper { + + public static WorkPlanItemWrapper build() { + return new WorkPlanItemWrapper(); + } + + @Override + public WorkPlanItemVO entityVO(WorkPlanItem workPlanItem) { + WorkPlanItemVO VO = Objects.requireNonNull(BeanUtil.copyProperties(workPlanItem, WorkPlanItemVO.class)); + + //User createUser = UserCache.getUser(workPlanItem.getCreateUser()); + //User updateUser = UserCache.getUser(workPlanItem.getUpdateUser()); + //workPlanItemVO.setCreateUserName(createUser.getName()); + //workPlanItemVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} From 54ddc488de0f67be3ddf7607d958aaaf42f108bb Mon Sep 17 00:00:00 2001 From: Tom Li Date: Thu, 8 Jan 2026 13:22:48 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/constant/CheckType.java | 14 +++++ .../desk/quality/constant/NgConst.java | 9 ++++ .../desk/quality/controller/NgController.java | 53 +++++++++++++++++-- .../desk/quality/mapper/NgMapper.xml | 12 +++-- .../desk/quality/pojo/entity/Ng.java | 6 +-- .../desk/quality/service/NgService.java | 14 ----- 6 files changed, 84 insertions(+), 24 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/NgConst.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java new file mode 100644 index 00000000..00e3dc0e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.constant; + +public interface CheckType { + + /** + * 热表 + */ + Integer RB = 1; + + /** + * 烧结 + */ + Integer SJ = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/NgConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/NgConst.java new file mode 100644 index 00000000..46022d19 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/NgConst.java @@ -0,0 +1,9 @@ +package org.springblade.desk.quality.constant; + +public interface NgConst { + + Integer TYPE_1 = 1; + Integer TYPE_2 = 2; + Integer TYPE_3 = 3; + Integer TYPE_4 = 4; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 03c653b0..0676f181 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -30,6 +30,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; import org.springblade.desk.order.pojo.entity.YieldOrderCraft; +import org.springblade.desk.quality.constant.NgConst; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.pojo.entity.Ng; @@ -42,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -120,9 +122,54 @@ public class NgController extends BladeController { @Parameter(description = "parentId", required = false) @RequestParam Integer parentId) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); qw.eq(Ng::getNgType, ngType); - if (parentId != null) { - qw.eq(Ng::getParentId, parentId); - } + qw.eq(Objects.nonNull(parentId), Ng::getParentId, parentId); + qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); + List list = service.list(qw); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] [故障类别]list下拉选择 + */ + @GetMapping("/listForSelectGZLB") + @ApiOperationSupport(order = 22) + @Operation(summary = "[故障类别]list下拉选择", description = "") + public R> listForSelect() { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); + qw.eq(Ng::getNgType, NgConst.TYPE_2); + qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); + List list = service.list(qw); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] [问题大类]list下拉选择 + */ + @GetMapping("/listForSelectWTDL") + @ApiOperationSupport(order = 22) + @Operation(summary = "[问题大类]list下拉选择", description = "") + public R> listForSelectWTDL() { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); + qw.eq(Ng::getNgType, NgConst.TYPE_3); + qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); + List list = service.list(qw); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] [问题小类]list下拉选择 + */ + @GetMapping("/listForSelectWTXL") + @ApiOperationSupport(order = 22) + @Operation(summary = "[问题小类]list下拉选择", description = "") + public R> listForSelectWTXL( + @Parameter(description = "parentId", required = true) @RequestParam Integer parentId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); + qw.eq(Ng::getNgType, NgConst.TYPE_4); + qw.eq(Ng::getParentId, parentId); qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); List list = service.list(qw); List listVO = NgWrapper.build().listVO(list); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml index ac77b49d..95cd1ba9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml @@ -1,5 +1,6 @@ - + @@ -10,7 +11,7 @@ - + @@ -18,10 +19,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java index ad148988..262ec0dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * [缺陷] 实体类 - * + * mes v1: bs_review_sheet_type BsReviewSheetType 不良原因 * @author Tom Shuo * @since 2026-01-04 */ @@ -54,7 +54,7 @@ public class Ng extends BaseEntity { /** * 缺陷描述 */ - public static final String COL_DESC = "DESC"; + public static final String COL_DESCRIPTION = "DESCRIPTION"; /** * [制品]id */ @@ -106,7 +106,7 @@ public class Ng extends BaseEntity { * 缺陷描述 */ @Schema(description = "缺陷描述") - private String desc; + private String description; /** * [制品]id */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java deleted file mode 100644 index 9cc70d1a..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.springblade.desk.quality.service; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@Slf4j -@Data -public class NgService { - -} From 593f16d4995d5697845787c21ad6ccb9b738425c Mon Sep 17 00:00:00 2001 From: Tom Li Date: Thu, 8 Jan 2026 13:35:30 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E7=A7=BB=E5=8A=A8pojo=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service-api/blade-desk-api/pom.xml | 4 ++++ .../springblade/desk/basic/pojo/dto/BasicClazzDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/BatConfigDTO.java | 0 .../desk/basic/pojo/dto/CoatingThicknessDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/FormulaDTO.java | 0 .../desk/basic/pojo/dto/LocallyPlatedPartDTO.java | 0 .../springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java | 0 .../java/org/springblade/desk/basic/pojo/dto/OemDTO.java | 0 .../desk/basic/pojo/dto/PlanAssignSteerDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/PlatingDTO.java | 0 .../springblade/desk/basic/pojo/dto/PlatingSmallDTO.java | 0 .../desk/basic/pojo/dto/ProcessAbilityDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/ShiftsDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/TeamSetDTO.java | 0 .../springblade/desk/basic/pojo/dto/WorkCenterDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/WorkTankDTO.java | 0 .../springblade/desk/basic/pojo/entity/BasicClazz.java | 0 .../org/springblade/desk/basic/pojo/entity/BatConfig.java | 0 .../desk/basic/pojo/entity/CoatingThickness.java | 0 .../org/springblade/desk/basic/pojo/entity/Formula.java | 0 .../desk/basic/pojo/entity/LocallyPlatedPart.java | 0 .../springblade/desk/basic/pojo/entity/MaterialQuota.java | 0 .../java/org/springblade/desk/basic/pojo/entity/Oem.java | 0 .../desk/basic/pojo/entity/PlanAssignSteer.java | 0 .../org/springblade/desk/basic/pojo/entity/Plating.java | 0 .../springblade/desk/basic/pojo/entity/PlatingSmall.java | 0 .../desk/basic/pojo/entity/ProcessAbility.java | 0 .../org/springblade/desk/basic/pojo/entity/ProdMark.java | 0 .../org/springblade/desk/basic/pojo/entity/Shifts.java | 0 .../org/springblade/desk/basic/pojo/entity/TeamSet.java | 0 .../springblade/desk/basic/pojo/entity/WorkCenter.java | 0 .../org/springblade/desk/basic/pojo/entity/WorkTank.java | 0 .../springblade/desk/basic/pojo/request/OemSearch.java | 0 .../org/springblade/desk/basic/pojo/vo/BaseEntityVO.java | 0 .../org/springblade/desk/basic/pojo/vo/BasicClazzVO.java | 0 .../org/springblade/desk/basic/pojo/vo/BatConfigVO.java | 0 .../desk/basic/pojo/vo/CoatingThicknessVO.java | 0 .../org/springblade/desk/basic/pojo/vo/FormulaVO.java | 0 .../desk/basic/pojo/vo/LocallyPlatedPartVO.java | 0 .../springblade/desk/basic/pojo/vo/MaterialQuotaVO.java | 0 .../java/org/springblade/desk/basic/pojo/vo/OemVO.java | 0 .../springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java | 0 .../springblade/desk/basic/pojo/vo/PlatingSmallVO.java | 0 .../org/springblade/desk/basic/pojo/vo/PlatingVO.java | 0 .../springblade/desk/basic/pojo/vo/ProcessAbilityVO.java | 0 .../org/springblade/desk/basic/pojo/vo/ProdMarkVO.java | 0 .../java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java | 0 .../org/springblade/desk/basic/pojo/vo/TeamSetVO.java | 0 .../org/springblade/desk/basic/pojo/vo/WorkCenterVO.java | 0 .../org/springblade/desk/basic/pojo/vo/WorkTankVO.java | 0 .../springblade/desk/quality/pojo/dto/AuditFileDTO.java | 0 .../springblade/desk/quality/pojo/dto/CycleTestDTO.java | 0 .../desk/quality/pojo/dto/CycleTestItemDTO.java | 0 .../desk/quality/pojo/dto/CycleTestStandardDTO.java | 0 .../desk/quality/pojo/dto/CycleTestTaskDTO.java | 0 .../desk/quality/pojo/dto/IndicatorMonthDTO.java | 0 .../desk/quality/pojo/dto/IndicatorYearDTO.java | 0 .../desk/quality/pojo/dto/IndicatorYearDetailDTO.java | 0 .../desk/quality/pojo/dto/InspectionItemDTO.java | 0 .../desk/quality/pojo/dto/InspectionResultDTO.java | 0 .../desk/quality/pojo/dto/InspectionTaskDTO.java | 0 .../desk/quality/pojo/dto/InspectionTemplateDTO.java | 0 .../springblade/desk/quality/pojo/dto/IotHardnessDTO.java | 0 .../desk/quality/pojo/dto/IotThicknessDTO.java | 0 .../springblade/desk/quality/pojo/dto/LiquidTankDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankReportConfigDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankReportDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankTaskDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankTaskHiDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankWaveDTO.java | 0 .../java/org/springblade/desk/quality/pojo/dto/NgDTO.java | 0 .../springblade/desk/quality/pojo/dto/PlanTestDTO.java | 0 .../desk/quality/pojo/dto/ProReTemplateDTO.java | 0 .../desk/quality/pojo/dto/ProReTemplateDetailDTO.java | 0 .../desk/quality/pojo/dto/ProReTemplateTankDTO.java | 0 .../desk/quality/pojo/dto/RelInsTemplateItemDTO.java | 0 .../desk/quality/pojo/dto/RelTankReportItemDTO.java | 0 .../desk/quality/pojo/dto/RelTankWaveItemDTO.java | 0 .../springblade/desk/quality/pojo/dto/RemindMsgDTO.java | 0 .../springblade/desk/quality/pojo/dto/ReviewDutyDTO.java | 0 .../springblade/desk/quality/pojo/dto/ReviewFaultDTO.java | 0 .../springblade/desk/quality/pojo/dto/ReviewSheetDTO.java | 0 .../springblade/desk/quality/pojo/dto/StandardDTO.java | 0 .../desk/quality/pojo/dto/StandardParamDTO.java | 0 .../desk/quality/pojo/dto/SupplyInspectionDTO.java | 0 .../desk/quality/pojo/dto/WorkPlanItemDTO.java | 0 .../desk/quality/pojo/dto/WorkPlanItemDetailDTO.java | 0 .../springblade/desk/quality/pojo/dto/package-info.java | 0 .../springblade/desk/quality/pojo/entity/AuditFile.java | 0 .../springblade/desk/quality/pojo/entity/CycleTest.java | 0 .../desk/quality/pojo/entity/CycleTestItem.java | 0 .../desk/quality/pojo/entity/CycleTestStandard.java | 0 .../desk/quality/pojo/entity/CycleTestTask.java | 0 .../desk/quality/pojo/entity/IndicatorMonth.java | 0 .../desk/quality/pojo/entity/IndicatorYear.java | 0 .../desk/quality/pojo/entity/IndicatorYearDetail.java | 0 .../desk/quality/pojo/entity/InspectionItem.java | 0 .../desk/quality/pojo/entity/InspectionResult.java | 0 .../desk/quality/pojo/entity/InspectionTask.java | 0 .../desk/quality/pojo/entity/InspectionTemplate.java | 0 .../springblade/desk/quality/pojo/entity/IotHardness.java | 0 .../desk/quality/pojo/entity/IotThickness.java | 0 .../springblade/desk/quality/pojo/entity/LiquidTank.java | 0 .../desk/quality/pojo/entity/LiquidTankReport.java | 0 .../desk/quality/pojo/entity/LiquidTankReportConfig.java | 0 .../desk/quality/pojo/entity/LiquidTankTask.java | 0 .../desk/quality/pojo/entity/LiquidTankTaskCopy.java | 0 .../desk/quality/pojo/entity/LiquidTankTaskHi.java | 0 .../desk/quality/pojo/entity/LiquidTankWave.java | 0 .../java/org/springblade/desk/quality/pojo/entity/Ng.java | 0 .../springblade/desk/quality/pojo/entity/PlanTest.java | 0 .../desk/quality/pojo/entity/ProReTemplate.java | 0 .../desk/quality/pojo/entity/ProReTemplateDetail.java | 0 .../desk/quality/pojo/entity/ProReTemplateTank.java | 0 .../desk/quality/pojo/entity/RelInsTemplateItem.java | 0 .../desk/quality/pojo/entity/RelTankReportItem.java | 0 .../desk/quality/pojo/entity/RelTankWaveItem.java | 0 .../springblade/desk/quality/pojo/entity/RemindMsg.java | 0 .../springblade/desk/quality/pojo/entity/ReviewDuty.java | 0 .../springblade/desk/quality/pojo/entity/ReviewFault.java | 0 .../springblade/desk/quality/pojo/entity/ReviewSheet.java | 0 .../springblade/desk/quality/pojo/entity/Standard.java | 0 .../desk/quality/pojo/entity/StandardParam.java | 0 .../desk/quality/pojo/entity/SupplyInspection.java | 0 .../springblade/desk/quality/pojo/entity/TraceChain.java | 0 .../springblade/desk/quality/pojo/entity/TraceEvent.java | 0 .../springblade/desk/quality/pojo/entity/TraceItem.java | 0 .../desk/quality/pojo/entity/WorkPlanItem.java | 0 .../desk/quality/pojo/entity/WorkPlanItemDetail.java | 0 .../desk/quality/pojo/entity/package-info.java | 0 .../desk/quality/pojo/request/AuditFileSearch.java | 0 .../quality/pojo/request/CycleTestBatUpdateCycle.java | 0 .../desk/quality/pojo/request/CycleTestItemSubmit.java | 0 .../desk/quality/pojo/request/CycleTestSubmit.java | 0 .../desk/quality/pojo/request/CycleTestTaskAccept.java | 0 .../desk/quality/pojo/request/CycleTestTaskFillData.java | 0 .../desk/quality/pojo/request/CycleTestTaskFilter.java | 0 .../desk/quality/pojo/request/CycleTestTaskIssue.java | 0 .../desk/quality/pojo/request/CycleTestTaskIssueBat.java | 0 .../desk/quality/pojo/request/CycleTestUpdateUserBat.java | 0 .../quality/pojo/request/InspectionTaskEditResult.java | 0 .../desk/quality/pojo/request/InspectionTaskSearch.java | 1 - .../desk/quality/pojo/request/InspectionTaskStartNew.java | 0 .../desk/quality/pojo/request/InspectionTaskSubmit.java | 4 ---- .../desk/quality/pojo/request/InspectionTemplateAdd.java | 0 .../quality/pojo/request/InspectionTemplateSearch.java | 1 - .../quality/pojo/request/InspectionTemplateUpdate.java | 0 .../org/springblade/desk/quality/pojo/request/JobExt.java | 0 .../desk/quality/pojo/request/LiquidTankSubmit.java | 0 .../desk/quality/pojo/request/LiquidTankTaskAccept.java | 0 .../desk/quality/pojo/request/LiquidTankTaskApproval.java | 0 .../desk/quality/pojo/request/LiquidTankTaskClose.java | 0 .../desk/quality/pojo/request/LiquidTankTaskCloseBat.java | 0 .../desk/quality/pojo/request/LiquidTankTaskEditDrug.java | 0 .../quality/pojo/request/LiquidTankTaskException.java | 0 .../desk/quality/pojo/request/LiquidTankTaskFillData.java | 0 .../quality/pojo/request/LiquidTankTaskFillDataBat.java | 0 .../quality/pojo/request/LiquidTankTaskGenManual.java | 0 .../desk/quality/pojo/request/LiquidTankTaskIssue.java | 0 .../desk/quality/pojo/request/LiquidTankTaskIssueBat.java | 0 .../quality/pojo/request/LiquidTankTaskReceiveDrug.java | 0 .../desk/quality/pojo/request/LiquidTankTaskSendDrug.java | 0 .../desk/quality/pojo/request/LiquidTankTaskSubmit.java | 0 .../desk/quality/pojo/request/LiquidTankUpdateBat.java | 0 .../springblade/desk/quality/pojo/request/NgSearch.java | 0 .../org/springblade/desk/quality/pojo/vo/AuditFileVO.java | 1 - .../springblade/desk/quality/pojo/vo/CycleTestItemVO.java | 0 .../desk/quality/pojo/vo/CycleTestStandardVO.java | 0 .../springblade/desk/quality/pojo/vo/CycleTestTaskVO.java | 0 .../org/springblade/desk/quality/pojo/vo/CycleTestVO.java | 0 .../desk/quality/pojo/vo/IndicatorMonthVO.java | 1 - .../desk/quality/pojo/vo/IndicatorYearDetailVO.java | 0 .../springblade/desk/quality/pojo/vo/IndicatorYearVO.java | 0 .../desk/quality/pojo/vo/InspectionItemVO.java | 0 .../desk/quality/pojo/vo/InspectionResultVO.java | 0 .../desk/quality/pojo/vo/InspectionTaskDetailVO.java | 1 - .../desk/quality/pojo/vo/InspectionTaskListVO.java | 0 .../desk/quality/pojo/vo/InspectionTemplateVO.java | 0 .../springblade/desk/quality/pojo/vo/IotHardnessVO.java | 0 .../springblade/desk/quality/pojo/vo/IotThicknessVO.java | 0 .../desk/quality/pojo/vo/LiquidTankReportConfigVO.java | 0 .../desk/quality/pojo/vo/LiquidTankReportVO.java | 0 .../desk/quality/pojo/vo/LiquidTankTaskCopyVO.java | 0 .../desk/quality/pojo/vo/LiquidTankTaskHiVO.java | 0 .../desk/quality/pojo/vo/LiquidTankTaskVO.java | 1 - .../springblade/desk/quality/pojo/vo/LiquidTankVO.java | 0 .../desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java | 0 .../desk/quality/pojo/vo/LiquidTankWaveDrawVO.java | 0 .../desk/quality/pojo/vo/LiquidTankWaveVO.java | 0 .../java/org/springblade/desk/quality/pojo/vo/NgVO.java | 0 .../org/springblade/desk/quality/pojo/vo/PlanTestVO.java | 0 .../desk/quality/pojo/vo/ProReTemplateDetailVO.java | 0 .../desk/quality/pojo/vo/ProReTemplateTankVO.java | 0 .../springblade/desk/quality/pojo/vo/ProReTemplateVO.java | 0 .../springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java | 0 .../springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java | 0 .../desk/quality/pojo/vo/RelInsTemplateItemVO.java | 0 .../desk/quality/pojo/vo/RelTankReportItemVO.java | 0 .../desk/quality/pojo/vo/RelTankWaveItemVO.java | 0 .../org/springblade/desk/quality/pojo/vo/RemindMsgVO.java | 0 .../springblade/desk/quality/pojo/vo/ReviewDutyVO.java | 0 .../springblade/desk/quality/pojo/vo/ReviewFaultVO.java | 0 .../springblade/desk/quality/pojo/vo/ReviewSheetVO.java | 0 .../springblade/desk/quality/pojo/vo/StandardParamVO.java | 0 .../org/springblade/desk/quality/pojo/vo/StandardVO.java | 0 .../desk/quality/pojo/vo/SupplyInspectionVO.java | 0 .../desk/quality/pojo/vo/WorkPlanItemDetailVO.java | 0 .../springblade/desk/quality/pojo/vo/WorkPlanItemVO.java | 0 .../springblade/desk/quality/pojo/vo/package-info.java | 0 .../desk/basic/controller/FormulaController.java | 2 -- .../desk/basic/controller/MaterialQuotaController.java | 1 - .../springblade/desk/basic/controller/OemController.java | 1 - .../desk/basic/controller/ShiftsController.java | 2 -- .../desk/basic/controller/TeamSetController.java | 1 - .../java/org/springblade/desk/basic/mapper/OemMapper.java | 3 --- .../org/springblade/desk/basic/mapper/TeamSetMapper.java | 1 - .../springblade/desk/basic/mapper/WorkCenterMapper.java | 1 - .../org/springblade/desk/basic/service/IOemService.java | 2 -- .../desk/basic/service/impl/OemServiceImpl.java | 2 -- .../dashboard/controller/DsSimilarPartsController.java | 6 +----- .../desk/quality/controller/CycleTestController.java | 3 --- .../desk/quality/controller/IndicatorYearController.java | 3 --- .../quality/controller/LiquidTankReportController.java | 1 - .../springblade/desk/quality/controller/NgController.java | 2 -- .../quality/controller/ProReTemplateDetailController.java | 4 +--- .../quality/controller/ProReTemplateTankController.java | 4 +--- .../desk/quality/mapper/InspectionTemplateMapper.java | 1 - .../desk/quality/service/CycleTestService2.java | 3 --- .../desk/quality/service/IAuditFileService.java | 3 --- .../desk/quality/service/IInspectionTemplateService.java | 2 -- .../desk/quality/service/ILiquidTankReportService.java | 1 - .../desk/quality/service/ILiquidTankTaskCopyService.java | 1 - .../desk/quality/service/ILiquidTankTaskService.java | 1 - .../desk/quality/service/IProReTemplateService.java | 4 ---- .../desk/quality/service/IStandardService.java | 1 - .../desk/quality/service/LiquidTankTaskService222.java | 2 +- .../desk/quality/service/impl/AuditFileServiceImpl.java | 3 --- .../desk/quality/service/impl/CycleTestServiceImpl.java | 1 - .../service/impl/CycleTestStandardServiceImpl.java | 1 - .../service/impl/InspectionTemplateServiceImpl.java | 1 - .../service/impl/ProReTemplateDetailServiceImpl.java | 2 -- .../quality/service/impl/ProReTemplateServiceImpl.java | 8 -------- .../service/impl/ProReTemplateTankServiceImpl.java | 2 -- .../org/springblade/desk/quality/util/PowerJobUtil.java | 1 - 246 files changed, 8 insertions(+), 83 deletions(-) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java (97%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java (58%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java (94%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java (92%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java (95%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java (92%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java (98%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java (100%) diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 6e04f3e3..ec72e80c 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -24,6 +24,10 @@ org.springblade blade-starter-excel + + org.springblade + blade-resource-api + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java similarity index 97% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index ee801651..f1851ffe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; import java.time.LocalDate; -import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java similarity index 58% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java index 8d84bfd0..773ea271 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java @@ -1,9 +1,5 @@ package org.springblade.desk.quality.pojo.request; -import org.springblade.desk.quality.pojo.entity.InspectionResult; - -import java.util.List; - public class InspectionTaskSubmit { /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java similarity index 94% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java index 81a587fd..62aca6d0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTemplate; -import java.time.LocalDateTime; import java.util.Date; @Data diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java index 178c8ec1..69b44287 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java @@ -6,7 +6,6 @@ package org.springblade.desk.quality.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; import org.springblade.desk.basic.pojo.vo.BaseEntityVO; import org.springblade.desk.quality.pojo.entity.AuditFile; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java similarity index 95% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java index 4af2161c..e9647fc7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java @@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import java.io.Serial; -import java.util.List; /** * [月度指标] 视图实体类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java index 853db304..74c68865 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -3,7 +3,6 @@ */ package org.springblade.desk.quality.pojo.vo; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java similarity index 98% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java index e3506146..f5a92141 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java @@ -11,7 +11,6 @@ import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import java.io.Serial; import java.time.LocalDate; -import java.time.LocalDateTime; /** * 视图实体类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index 93f13d1b..1f718d0e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -26,9 +26,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; -import org.springblade.desk.basic.constant.BasicClazzConst; import org.springblade.desk.basic.excel.FormulaExcel; -import org.springblade.desk.basic.pojo.entity.BasicClazz; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.vo.FormulaVO; import org.springblade.desk.basic.service.IFormulaService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java index 2a33e127..ced140a1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -28,7 +28,6 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.MaterialQuotaExcel; -import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; import org.springblade.desk.basic.service.IMaterialQuotaService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index be4e8032..4b7adeaf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -27,7 +27,6 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.excel.OemExcel; -import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java index 2cbca935..4e9c9883 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java @@ -26,9 +26,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ShiftsExcel; -import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.entity.Shifts; -import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.ShiftsVO; import org.springblade.desk.basic.service.IShiftsService; import org.springblade.desk.basic.util.ExcelExtUtil; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index e342e074..f9cef1c9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -25,7 +25,6 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.TeamSetExcel; -import org.springblade.desk.basic.pojo.entity.Shifts; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; import org.springblade.desk.basic.service.ITeamSetService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java index 692c3739..72ae9820 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java index d60e0d17..ab84e8f8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.TeamSetExcel; -import org.springblade.desk.basic.mapper.en.EnBaseMapper; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java index d9424e25..583ab8b0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.WorkCenterExcel; -import org.springblade.desk.basic.mapper.en.EnBaseMapper; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.vo.WorkCenterVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index 71b1c508..ceaf5592 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -11,8 +11,6 @@ import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 5fa344e8..a856665e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -5,14 +5,12 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java index c76da256..c27bd77f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java @@ -34,7 +34,6 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; @@ -42,11 +41,9 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -58,10 +55,9 @@ import org.springblade.desk.dashboard.service.IDsSimilarPartsService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; -import java.util.stream.Collectors; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java index 58ec68d1..02b7a969 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -3,7 +3,6 @@ */ package org.springblade.desk.quality.controller; -import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -28,9 +27,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestExcel; -import org.springblade.desk.quality.excel.CycleTestExcelImport; import org.springblade.desk.quality.pojo.entity.CycleTest; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.request.CycleTestBatUpdateCycle; import org.springblade.desk.quality.pojo.request.CycleTestSubmit; import org.springblade.desk.quality.pojo.vo.CycleTestVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java index 1c6b2578..e8e39a5b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java @@ -28,11 +28,8 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorYearExcel; -import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import org.springblade.desk.quality.pojo.entity.IndicatorYear; import org.springblade.desk.quality.pojo.entity.IndicatorYearDetail; -import org.springblade.desk.quality.pojo.vo.IndicatorMonthVO; -import org.springblade.desk.quality.pojo.vo.IndicatorYearDetailVO; import org.springblade.desk.quality.pojo.vo.IndicatorYearVO; import org.springblade.desk.quality.service.IIndicatorYearDetailService; import org.springblade.desk.quality.service.IIndicatorYearService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java index e4e5e6b2..f4d8d143 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java @@ -28,7 +28,6 @@ import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; -import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; import org.springblade.desk.quality.service.ILiquidTankReportService; import org.springblade.desk.quality.wrapper.LiquidTankReportWrapper; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 0676f181..459dbe85 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -28,8 +28,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; -import org.springblade.desk.order.pojo.entity.YieldOrderCraft; import org.springblade.desk.quality.constant.NgConst; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.NgExcel; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java index 11b437f6..73501122 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java @@ -15,7 +15,6 @@ import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -33,9 +32,8 @@ import org.springblade.desk.quality.excel.ProReTemplateDetailExcel; import org.springblade.desk.quality.wrapper.ProReTemplateDetailWrapper; import org.springblade.desk.quality.service.IProReTemplateDetailService; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; import java.util.stream.Collectors; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java index c231dbbb..b43c3987 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java @@ -15,7 +15,6 @@ import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -33,9 +32,8 @@ import org.springblade.desk.quality.excel.ProReTemplateTankExcel; import org.springblade.desk.quality.wrapper.ProReTemplateTankWrapper; import org.springblade.desk.quality.service.IProReTemplateTankService; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; + import java.util.Map; import java.util.List; import java.util.stream.Collectors; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java index efee2bf0..8746aafe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java @@ -13,7 +13,6 @@ import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; import java.util.List; -import java.util.Map; /** * [检验模板] Mapper 接口 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java index e81c6322..1cc4076b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java @@ -10,10 +10,8 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.dashboard.service.IBsPlatingService; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.constant.CycleTestTaskConst; -import org.springblade.desk.quality.constant.JobTypeConst; import org.springblade.desk.quality.mapper.CycleTestMapper; import org.springblade.desk.quality.pojo.entity.CycleTest; import org.springblade.desk.quality.pojo.entity.CycleTestItem; @@ -25,7 +23,6 @@ import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; import org.springblade.desk.quality.wrapper.CycleTestStandardWrapper; import org.springblade.desk.quality.wrapper.CycleTestWrapper; import org.springblade.resource.feign.IAttachClient; -import org.springblade.resource.pojo.entity.Attach; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.UserInfo; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java index 7ec3536f..bfeaad70 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java @@ -5,14 +5,11 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.AuditFileSearch; -import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java index 0782dd12..6c3c5e9c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java @@ -10,10 +10,8 @@ import org.springblade.desk.quality.excel.InspectionTemplateExcel; import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import java.util.List; -import java.util.Map; /** * [检验模板] 服务类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java index 80d3b62c..c6a0ea1a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; -import org.springblade.desk.quality.pojo.vo.LiquidTankReportConfigVO; import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java index 4af52fa1..e3dafa3f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java @@ -11,7 +11,6 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.quality.excel.LiquidTankTaskCopyExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java index 7851c154..c5b58bd4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java @@ -10,7 +10,6 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.quality.excel.LiquidTankTaskExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java index 89dc56ac..c3be1c49 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java @@ -5,15 +5,11 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.v3.oas.annotations.Parameter; -import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.pojo.entity.ProReTemplate; -import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; import org.springblade.desk.quality.pojo.vo.ProReTemplateVO; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java index a3c072da..c643c947 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.StandardExcel; import org.springblade.desk.quality.pojo.entity.Standard; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import org.springblade.desk.quality.pojo.vo.StandardVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java index f35d8a9f..cbe23b25 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java @@ -12,8 +12,8 @@ import org.springblade.desk.quality.mapper.LiquidTankMapper; import org.springblade.desk.quality.mapper.LiquidTankTaskMapper; import org.springblade.desk.quality.pojo.entity.LiquidTank; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; -import org.springblade.desk.quality.pojo.request.*; import org.springblade.desk.basic.util.IdUtil; +import org.springblade.desk.quality.pojo.request.*; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index 1c0154f5..069ea2e9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -11,16 +11,13 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.quality.constant.AuditFileConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.AuditFileSearch; -import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.system.feign.IDictClient; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java index a81fe509..32d1a3bf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java @@ -33,7 +33,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java index 4b147556..891c52e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java @@ -15,7 +15,6 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.excel.CycleTestStandardExcel; import org.springblade.desk.quality.mapper.CycleTestStandardMapper; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.entity.CycleTestStandard; import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; import org.springblade.desk.quality.service.ICycleTestStandardService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java index d34b779a..56d32152 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java @@ -26,7 +26,6 @@ import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; /** * [检验模板] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java index 7bf92438..e16f4a16 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java @@ -16,11 +16,9 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.ProReTemplateDetailExcel; import org.springblade.desk.quality.mapper.ProReTemplateDetailMapper; import org.springblade.desk.quality.pojo.entity.ProReTemplateDetail; -import org.springblade.desk.quality.pojo.entity.ProReTemplateTank; import org.springblade.desk.quality.pojo.vo.ProReTemplateDetailVO; import org.springblade.desk.quality.service.IProReTemplateDetailService; import org.springblade.desk.quality.wrapper.ProReTemplateDetailWrapper; -import org.springblade.desk.quality.wrapper.ProReTemplateTankWrapper; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index 0cfc94d0..90d8ed63 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -11,11 +11,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; -import org.springblade.desk.basic.pojo.vo.BaseEntityVO; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.quality.constant.ProReTemplateConst; import org.springblade.desk.quality.excel.ProReTemplateExcel; @@ -31,13 +27,9 @@ import org.springblade.desk.basic.util.IdUtil; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; -import org.springblade.system.pojo.entity.Dept; -import org.springblade.system.pojo.entity.User; -import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; import java.util.*; -import java.util.stream.Collectors; /** * [过程记录模板] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java index ab22ddac..c26f38f8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java @@ -5,7 +5,6 @@ package org.springblade.desk.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; @@ -24,7 +23,6 @@ import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** * [过程记录模板-槽-明细] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java index aa26567d..bf333add 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java @@ -3,7 +3,6 @@ package org.springblade.desk.quality.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springblade.core.tool.api.R; -import org.springblade.desk.quality.constant.JobTypeConst; import org.springblade.desk.quality.pojo.request.JobExt; import java.util.Objects;