diff --git a/blade-service-api/blade-desk-api/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 index 3773ab5a..2d3bb05d 100644 --- a/blade-service-api/blade-desk-api/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 @@ -40,9 +40,9 @@ public class InspectionTask extends BaseEntity { */ public static final String COL_NAME = "NAME"; /** - * [工单]id + * [车间订单]id */ - public static final String COL_WORK_ORDER_ID = "WORK_ORDER_ID"; + public static final String COL_WO_ID = "WO_ID"; /** * [制品]id */ @@ -68,9 +68,9 @@ public class InspectionTask extends BaseEntity { */ 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_WO_CODE = "WO_CODE"; /** * [工序]编码 */ @@ -156,9 +156,17 @@ public class InspectionTask extends BaseEntity { */ public static final String COL_FROM_TYPE = "FROM_TYPE"; /** - * 生产订单类型 + * [生产订单]类型 */ public static final String COL_YIELD_ORDER_TYPE = "YIELD_ORDER_TYPE"; + /** + * [生产订单]id + */ + public static final String COL_YIELD_ORDER_ID = "YIELD_ORDER_ID"; + /** + * 接收日期 + */ + public static final String COL_RECEIVE_DATE = "RECEIVE_DATE"; /** * [检验任务]编码 @@ -171,15 +179,15 @@ public class InspectionTask extends BaseEntity { @Schema(description = "[检验任务]类型") private Long inspectionTaskType; /** - * [检验任务] + * [检验任务]名称 */ - @Schema(description = "[检验任务]") + @Schema(description = "[检验任务]名称") private String name; /** - * [工单]id + * [车间订单]id */ - @Schema(description = "[工单]id") - private Long workOrderId; + @Schema(description = "[车间订单]id") + private Long woId; /** * [制品]id */ @@ -211,10 +219,10 @@ public class InspectionTask extends BaseEntity { @Schema(description = "生产批次号") private Long batchNumber; /** - * [工单]编码 + * [车间订单]编码 */ - @Schema(description = "[工单]编码") - private String workOrderCode; + @Schema(description = "[车间订单]编码") + private String woCode; /** * [工序]编码 */ @@ -321,8 +329,18 @@ public class InspectionTask extends BaseEntity { @Schema(description = "来源类型") private Integer fromType; /** - * 生产订单类型 + * [生产订单]类型 */ - @Schema(description = "生产订单类型") + @Schema(description = "[生产订单]类型") private Integer yieldOrderType; + /** + * [生产订单]id + */ + @Schema(description = "[生产订单]id") + private Integer yieldOrderId; + /** + * 接收日期 + */ + @Schema(description = "接收日期") + private LocalDateTime receiveDate; } diff --git a/blade-service-api/blade-desk-api/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 index 77cd04c9..022948ae 100644 --- a/blade-service-api/blade-desk-api/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 @@ -19,6 +19,9 @@ import java.time.LocalDateTime; * qc_review_sheet_internal QcReviewSheetInternal 热表内部审理记录表 * qc_review_sheet_internalredo QcReviewSheetInternalredo 热表内部审理记录表（返修） * qc_review_sheet_internalsj QcReviewSheetInternalsj 热表内部审理记录表（烧结） + *

+ *

+ * status 默认 -1 * * @author Tom Shuo * @since 2026-01-06 @@ -129,7 +132,7 @@ public class ReviewSheet extends BaseEntity { */ public static final String COL_BIZ_TYPE = "BIZ_TYPE"; /** - * 物料号 + * 物料号/零件号 */ public static final String COL_PART_CODE = "PART_CODE"; /** @@ -306,9 +309,9 @@ public class ReviewSheet extends BaseEntity { @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理;") private Integer bizType; /** - * 物料号 + * 物料号/零件号 */ - @Schema(description = "物料号") + @Schema(description = "物料号/零件号") private String partCode; /** * 批次号 diff --git a/blade-service-api/blade-desk-api/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 index f7c12823..f692cc79 100644 --- a/blade-service-api/blade-desk-api/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 @@ -85,9 +85,9 @@ public class WorkPlanItemDetail extends BaseEntity { @Schema(description = "[工序检验项]id") private Long workPlanItemId; /** - * 测量类型-[1]镀前;[2]:镀后; + * 测量类型; */ - @Schema(description = "测量类型-[1]镀前;[2]:镀后;") + @Schema(description = "测量类型") private String testType; /** * 尺寸 @@ -144,4 +144,9 @@ public class WorkPlanItemDetail extends BaseEntity { */ @Schema(description = "[量具]id") private Long mtId; + /** + * 实际[量具]id + */ + @Schema(description = "实际[量具]id") + private Long actMtId; } diff --git a/blade-service-api/blade-desk-api/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 index 2869e294..c7b3eaaf 100644 --- a/blade-service-api/blade-desk-api/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 @@ -25,12 +25,16 @@ public class InspectionTaskSearch extends InspectionTask { private String prodIdent; @Schema(description = "需求部门") private String needDeptName; + @Schema(description = "需求[部门]id") + private String needDeptId; @Schema(description = "批次号") private String batchNo; @Schema(description = "分批号") private String poBatchNo; @Schema(description = "当前工序") private Long currentProcessId; + @Schema(description = "上个工序") + private Long frontProcessId; @Schema(description = "下个工序") private Long nextProcessId; @Schema(description = "生产数量") diff --git a/blade-service-api/blade-desk-api/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 index 20f2164b..a9e33b58 100644 --- a/blade-service-api/blade-desk-api/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 @@ -72,7 +72,7 @@ public class InspectionTaskListVO extends InspectionTask { @Schema(description = "生产数量") private Double poQty = 2002d; @Schema(description = "接收时间") - private LocalDateTime receiveDate = LocalDateTime.now(); + private LocalDateTime receiveDate; @Schema(description = "订单-产品号") @@ -106,5 +106,5 @@ public class InspectionTaskListVO extends InspectionTask { private String sameNo = "tank-1001"; // todo: @Schema(description = "材料") - private String material = "铜"; + private String material = "铜"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyBatchVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyBatchVO.java new file mode 100644 index 00000000..ed50875a --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyBatchVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 责任批号 + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetDutyBatchVO { + + private String dutyBatch; + + public ReviewSheetDutyBatchVO(String dutyBatch) { + this.dutyBatch = dutyBatch; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyPartVO.java new file mode 100644 index 00000000..79167be7 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyPartVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 责任零件 + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetDutyPartVO { + + private String dutyPart; + + public ReviewSheetDutyPartVO(String dutyPart) { + this.dutyPart = dutyPart; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantBatchVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantBatchVO.java new file mode 100644 index 00000000..69721dd1 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantBatchVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 相关批号 + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetRelevantBatchVO { + + private String relevantBatch; + + public ReviewSheetRelevantBatchVO(String relevantBatch) { + this.relevantBatch = relevantBatch; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantPartVO.java new file mode 100644 index 00000000..3191a6ff --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantPartVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 相关零件 + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetRelevantPartVO { + + private String relevantPart; + + public ReviewSheetRelevantPartVO(String relevantPart) { + this.relevantPart = relevantPart; + } +} diff --git a/blade-service-api/blade-desk-api/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 index 0c1635dc..cb2dd0cd 100644 --- a/blade-service-api/blade-desk-api/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 @@ -24,4 +24,7 @@ public class WorkPlanItemDetailVO extends WorkPlanItemDetail { @Schema(description = "[量具]名称") private String mtName = "标尺1"; + + @Schema(description = "实际[量具]名称") + private String actMtName = "游标卡尺QW"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java index c51da904..84ca5e7b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java @@ -10,12 +10,27 @@ import org.springframework.stereotype.Component; public class RoleConfig { /** - * 工艺员角色id + * 工艺员[角色]id */ private Long processEngineerId; - /** - * 工艺员角色alias + * 工艺员[角色]alias */ private String processEngineerAlias; + /** + * 热表检验员[角色]id + */ + private Long rbCheckerId; + /** + * 热表检验员[角色]alias + */ + private String rbCheckerAlias; + /** + * 烧结检验员[角色]id + */ + private Long sjCheckerId; + /** + * 烧结检验员[角色]alias + */ + private String sjCheckerAlias; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java index 5028a850..1fdbf61a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.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.RelTeamSetUserExcel; import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; import org.springblade.desk.basic.pojo.vo.RelTeamSetUserVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2026-01-13 */ @RestController -@RequestMapping("/RelTeamSetUser") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/RelTeamSetUser") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class RelTeamSetUserController extends BladeController { @Resource - private IRelTeamSetUserService service; - - /** - * [班组用户关联] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入RelTeamSetUser Obj") - public R detail(RelTeamSetUser relTeamSetUser) { - QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser); - RelTeamSetUser detail = service.getOne(qw); - RelTeamSetUserVO detailVO = RelTeamSetUserWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [班组用户关联] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入RelTeamSetUser Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, - Query query) { + private IRelTeamSetUserService service; + + /** + * [班组用户关联] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入RelTeamSetUser Obj") + public R detail(RelTeamSetUser relTeamSetUser) { + QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser); + RelTeamSetUser detail = service.getOne(qw); + RelTeamSetUserVO detailVO = RelTeamSetUserWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [班组用户关联] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入RelTeamSetUser Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = RelTeamSetUserWrapper.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 = "传入RelTeamSetUser Obj") - public R> page(RelTeamSetUserVO relTeamSetUser, Query query) { - IPage pagesVO = service.selectRelTeamSetUserPage( - Condition.getPage(query), relTeamSetUser - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = RelTeamSetUserWrapper.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 = "传入RelTeamSetUser Obj") + public R> page(RelTeamSetUserVO relTeamSetUser, Query query) { + IPage pagesVO = service.selectRelTeamSetUserPage( + Condition.getPage(query), relTeamSetUser + ); + 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 = RelTeamSetUserWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = RelTeamSetUserWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [班组用户关联] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入RelTeamSetUser Obj") + public R save(@Valid @RequestBody RelTeamSetUser addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [班组用户关联] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入RelTeamSetUser Obj") - public R save(@Valid @RequestBody RelTeamSetUser addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [班组用户关联] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入RelTeamSetUser 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 = "传入RelTeamSetUser Obj") - public R update(@Valid @RequestBody RelTeamSetUser updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入RelTeamSetUser 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 = "传入RelTeamSetUser Obj") + public R update(@Valid @RequestBody RelTeamSetUser updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [班组用户关联] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入RelTeamSetUser List") + @Operation(summary = "修改批量", description = "传入RelTeamSetUser List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [班组用户关联] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入RelTeamSetUser Obj") - public R submit(@Valid @RequestBody RelTeamSetUser mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [班组用户关联] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入RelTeamSetUser Obj") + public R submit(@Valid @RequestBody RelTeamSetUser mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [班组用户关联] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入RelTeamSetUser 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 = "传入RelTeamSetUser") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(RelTeamSetUser::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(RelTeamSetUserEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportRelTeamSetUser(qw); - ExcelUtil.export(response, "[班组用户关联]数据" + DateUtil.time(), - "[班组用户关联]数据表", list, RelTeamSetUserExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入RelTeamSetUser 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 = "传入RelTeamSetUser") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(RelTeamSetUser::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(RelTeamSetUserEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportRelTeamSetUser(qw); + ExcelUtil.export(response, "[班组用户关联]数据" + DateUtil.time(), + "[班组用户关联]数据表", list, RelTeamSetUserExcel.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, RelTeamSetUser.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, RelTeamSetUser.class + ); + return R.status(service.saveBatch(importList)); + } } 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 2eab8ee5..b26d920f 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 @@ -5,12 +5,12 @@ public interface InspectionTaskConst { /** * 热表 */ - Integer TYPE_RB = 1; + Integer FROM_TYPE_RB = 1; /** * 烧结 */ - Integer TYPE_SJ = 2; + Integer FROM_TYPE_SJ = 2; /** * 未检验 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java index ef0d0728..2945e512 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java @@ -5,11 +5,6 @@ package org.springblade.desk.quality.constant; */ public interface ReviewSheetConst { - /** - * 初始化 - */ - Integer S_INIT = 0; - interface BizType { /** * [1]:内部审理返修 @@ -26,10 +21,14 @@ public interface ReviewSheetConst { } interface STATUS { + /** + * 初始化 + */ + Integer S_INIT = -1; /** * 新建 内部 ERP 都用 */ - Integer S_NEW = 1; + Integer S_NEW = -1; /** * 待审理 内部用 ERP不用 */ @@ -56,7 +55,7 @@ public interface ReviewSheetConst { /** * 初始化 */ - Integer REVIEW_STATUS_0 = 0; + Integer REVIEW_STATUS_INIT = -1; /** * 让步接收 */ @@ -87,6 +86,8 @@ public interface ReviewSheetConst { Integer REVIEW_STATUS_15 = 15; } + + // 一期状态 整合 // interface SELF { // /** // * 编制中 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 0a1ca980..58c52764 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 @@ -14,17 +14,24 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; 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.secure.utils.AuthUtil; 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.config.RoleConfig; +import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.pojo.vo.UrlVO; +import org.springblade.desk.quality.constant.CycleTestTaskConst; +import org.springblade.desk.quality.constant.InspectionTaskConst; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; @@ -49,6 +56,7 @@ import java.util.Map; * @author Tom Shuo * @since 2025-11-14 */ +@Slf4j @RestController @Data @EqualsAndHashCode(callSuper = true) @@ -60,6 +68,8 @@ public class InspectionTaskController extends BladeController { private IInspectionTaskService service; @Resource private InspectionTaskService2 service2; + @Resource + private RoleConfig roleConfig; /** * [检验任务] 详情 @@ -82,6 +92,18 @@ public class InspectionTaskController extends BladeController { @Operation(summary = "分页", description = "传入inspectionTask") public R> listSearch( @Parameter(hidden = true) @RequestParam(required = false) InspectionTaskSearch search, Query query) { + log.info("getUserRole = {}", AuthUtil.getUserRole()); + // 热表 烧结 检验员 数据区分。 + if (AuthUtil.getUserRole().contains(roleConfig.getRbCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_RB); + } + if (AuthUtil.getUserRole().contains(roleConfig.getSjCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); + } + if (AuthUtil.getUserRole().contains(roleConfig.getRbCheckerAlias()) && + AuthUtil.getUserRole().contains(roleConfig.getSjCheckerAlias())) { + search.setFromType(null); + } IPage pagesVO = service.listSearch(Condition.getPage(query), search); return R.data(pagesVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index 958c61b6..60adf159 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -117,7 +117,7 @@ public class ReviewSheetController extends BladeController { public R> listInit(@Parameter() @RequestBody ReviewSheetInitSearch search, Query query) { Map demo = new HashMap(); - demo.put(BaseRequest.STATUS, ReviewSheetConst.S_INIT); + demo.put(BaseRequest.STATUS, ReviewSheetConst.STATUS.S_INIT); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetInitWrapper.build().pageVO(pages); @@ -146,7 +146,11 @@ public class ReviewSheetController extends BladeController { Map demo = new HashMap(); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); Integer bizType = search.getBizType(); - qw.eq((bizType != null && bizType != 0), ReviewSheet.COL_BIZ_TYPE, search.getBizType()); + if (bizType != null && bizType != 0) { + qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType()); + } else { + qw.ne(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_ERP); + } // qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages); @@ -160,22 +164,22 @@ public class ReviewSheetController extends BladeController { /** * [生产处置单] list分页 */ - @PostMapping("/listSelf") - @ApiOperationSupport(order = 20) - @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") - public R> listSelf(@Parameter() @RequestBody - ReviewSheetSelfSearch search, Query query) { - Map demo = new HashMap(); - QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - qw.in(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setSelfVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } +// @PostMapping("/listSelf") +// @ApiOperationSupport(order = 20) +// @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") +// public R> listSelf(@Parameter() @RequestBody +// ReviewSheetSelfSearch search, Query query) { +// Map demo = new HashMap(); +// QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); +// qw.in(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages); +// pagesVO.getRecords() +// .stream() +// .peek(service::setSelfVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); +// } /** * [生产处置单] list分页 @@ -232,8 +236,6 @@ public class ReviewSheetController extends BladeController { @Operation(summary = "copy相同数据到from车间订单id", description = "传入 [车间订单]id") public R sameCopyFromHiWO(@Parameter(description = "列表id") @RequestParam Long id, @Parameter(description = "车间订单Id") @RequestParam Long woId) { - // todo: - // 找到的历史审理单 return service.sameCopyFromHiWO(id, woId); } @@ -431,4 +433,72 @@ public class ReviewSheetController extends BladeController { public R fill(@Valid @RequestBody ReviewSheetDetailVO vo) { return service.fill(vo); } + + @GetMapping("/getRSDutyPartList") + @ApiOperationSupport(order = 51) + @Operation(summary = "责任零件list", description = "") + public R getRSDutyPartList(@Parameter(description = "id") @RequestParam Long id) { + ReviewSheetDutyPartVO vo1 = new ReviewSheetDutyPartVO("21E8-571-3000-K5"); + ReviewSheetDutyPartVO vo2 = new ReviewSheetDutyPartVO("21E8-003-11234-K5"); + ReviewSheetDutyPartVO vo3 = new ReviewSheetDutyPartVO("21E8-001-1625-H8-N"); + ReviewSheetDutyPartVO vo4 = new ReviewSheetDutyPartVO("21E8-570-3238-K8"); + ReviewSheetDutyPartVO vo5 = new ReviewSheetDutyPartVO("21E8-570-1066-K5"); + List list = new ArrayList<>(); + list.add(vo1); + list.add(vo2); + list.add(vo3); + list.add(vo4); + list.add(vo5); + return R.data(list); + } + + @GetMapping("/getRSDutyBatchList") + @ApiOperationSupport(order = 52) + @Operation(summary = "责任批号list", description = "") + public R getRSDutyBatchList(@Parameter(description = "id") @RequestParam Long id) { + ReviewSheetDutyBatchVO vo1 = new ReviewSheetDutyBatchVO("L1022312073"); + ReviewSheetDutyBatchVO vo2 = new ReviewSheetDutyBatchVO("Y0572401499"); + ReviewSheetDutyBatchVO vo3 = new ReviewSheetDutyBatchVO("Y7952401087"); + ReviewSheetDutyBatchVO vo4 = new ReviewSheetDutyBatchVO("Y5432403515"); + ReviewSheetDutyBatchVO vo5 = new ReviewSheetDutyBatchVO("2402-XC-6566-JII-W664"); + List list = new ArrayList<>(); + list.add(vo1); + list.add(vo2); + list.add(vo3); + list.add(vo4); + list.add(vo5); + return R.data(list); + } + + @GetMapping("/getRSRelevantPartList") + @ApiOperationSupport(order = 51) + @Operation(summary = "相关零件list", description = "") + public R getRSRelevantPartList(@Parameter(description = "id") @RequestParam Long id) { + ReviewSheetRelevantPartVO vo1 = new ReviewSheetRelevantPartVO("21E8-571-3000-K5"); + ReviewSheetRelevantPartVO vo2 = new ReviewSheetRelevantPartVO("21E8-003-11234-K5"); + ReviewSheetRelevantPartVO vo3 = new ReviewSheetRelevantPartVO("21E8-001-1625-H8-N"); + ReviewSheetRelevantPartVO vo4 = new ReviewSheetRelevantPartVO("21E8-570-3238-K8"); + ReviewSheetRelevantPartVO vo5 = new ReviewSheetRelevantPartVO("21E8-570-1066-K5"); + List list = new ArrayList<>(); + list.add(vo1); + list.add(vo2); + list.add(vo3); + list.add(vo4); + list.add(vo5); + return R.data(list); + } + + @GetMapping("/getRSRelevantBatchList") + @ApiOperationSupport(order = 51) + @Operation(summary = "相关批号list", description = "") + public R getRSRelevantBatchList(@Parameter(description = "id") @RequestParam Long id) { + ReviewSheetRelevantBatchVO vo1 = new ReviewSheetRelevantBatchVO("24022001"); + ReviewSheetRelevantBatchVO vo2 = new ReviewSheetRelevantBatchVO("23122001"); + ReviewSheetRelevantBatchVO vo3 = new ReviewSheetRelevantBatchVO("2401200101"); + List list = new ArrayList<>(); + list.add(vo1); + list.add(vo2); + list.add(vo3); + return R.data(list); + } } 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 index 0f4bcad6..956b8434 100644 --- 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 @@ -35,7 +35,7 @@ public class WorkPlanItemDetailExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("[工序检验项]id") - private BigDecimal workPlanItemId; + private Long workPlanItemId; /** * 测量类型-[1]镀前;[2]:镀后; */ @@ -107,5 +107,5 @@ public class WorkPlanItemDetailExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("[量具]id") - private BigDecimal mtId; + private Long mtId; } 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 61b62582..96aa0770 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 @@ -41,5 +41,4 @@ public interface InspectionTaskMapper extends BaseMapper { List exportInspectionTask(@Param("ew") Wrapper queryWrapper); List listSearch(IPage page, @Param("q") InspectionTaskSearch search); - } 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 652be1f4..cbe155f0 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 @@ -10,14 +10,14 @@ - + - + @@ -46,6 +46,8 @@ + + - SELECT task.* - FROM QA_INSPECTION_TASK task + SELECT t.* + FROM QA_INSPECTION_TASK t -- 车间作业计划 wp - -- LEFT JOIN RB_PR_WORK_PLAN wp ON task.WP_ID = wp.ID + LEFT JOIN MES_WORK_PLAN wp ON t.WP_ID = wp.ID -- 车间订单 wo - -- LEFT JOIN PR_WORK_ORDER wo ON wp.WO_ID = wo.ID + LEFT JOIN MES_WORK_ORDER wo ON wp.WO_ID = wo.ID + -- 生产订单 yo + LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID + -- 工序 + LEFT JOIN DS_PROCESS ps ON wp.ORDERS = ps.PROCESS_CODE + -- 外协厂商 oem + LEFT JOIN BA_OEM oem ON wp.OC_ID = oem.ID -- 班组 ts -- LEFT JOIN BA_TEAM_SET ts ON wp.MAKE_TEAM = ts.ID - -- 外协厂商 oem - -- LEFT JOIN BA_OEM oem ON wp.OC_ID = oem.ID - -- 工序 - -- LEFT JOIN BS_PROCEDURE_SET ON wp. - -- LEFT JOIN BLADE_DEPT bl_dept on task.CREATE_DEPT = bl_dept.ID + -- 部门 + LEFT JOIN BLADE_DEPT bl_dept on t.CREATE_DEPT = bl_dept.ID WHERE ( - task.IS_DELETED = 0 + t.IS_DELETED = 0 -- AND wp.IS_DELETED = 0 -- AND wo.IS_DELETED = 0 + -- AND ps.IS_DELETED = 0 + -- AND oem.IS_DELETED = 0 -- AND bl_dept.IS_DELETED = 0 ) - AND task.WP_ID = #{q.wpId} + AND t.WP_ID = #{q.wpId} - AND task.STATUS = #{q.status} + AND t.STATUS = #{q.status} - AND task.FROM_TYPE = #{q.fromType} + AND t.FROM_TYPE = #{q.fromType} + + + AND rs.RECEIVE_DATE >= #{q.receiveDateStart} + + + AND rs.RECEIVE_DATE <= #{q.receiveDateEnd} + + -- wp + + AND wo.MAKE_TEAM = #{q.teamSetId} + + + AND wp.OC_ID = #{q.oemId} + + + AND wp.FRONT_WP_ID = #{q.frontProcessId} + + + AND wp.NEXT_WP_ID = #{q.nextProcessId} + + -- wo + + AND wo.CARD_NO = #{q.cardNo} + + + AND wo.WO_ID = #{q.woCode} + + + AND wo.PART_CODE = #{q.partCode} + + + AND wo.BATCH_NO = #{q.batchNo} + + + AND wo.MAKE_QTY = #{q.poQty} + + -- yo + + AND yo.PRODUCT_IDENT = #{q.prodIdent} + + -- ps + + AND ps.ID = #{q.currentProcessId} - ORDER BY task.ID DESC + -- oem + ORDER BY t.ID DESC 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 index fc6d33d1..7df12ac8 100644 --- 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 @@ -9,7 +9,11 @@ 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.ReviewSheetDetailVO; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; +import org.springblade.desk.quality.pojo.vo.*; import java.util.List; @@ -21,20 +25,29 @@ import java.util.List; */ public interface ReviewSheetMapper extends BaseMapper { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param reviewSheet 查询参数 - * @return List - */ - List selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet); - - /** - * 获取导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportReviewSheet(@Param("ew") Wrapper queryWrapper); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewSheet 查询参数 + * @return List + */ + List selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewSheet(@Param("ew") Wrapper queryWrapper); + + List listInit(IPage page, + @Param("q") ReviewSheetInitSearch search); + + List listReviewRedoScrap(IPage page, + @Param("q") ReviewSheetRedoScrapSearch search); + + List listErp(IPage page, + @Param("q") ReviewSheetErpSearch search); } 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 index fc8bf7a5..e82eccc4 100644 --- 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 @@ -62,4 +62,178 @@ SELECT * FROM QA_REVIEW_SHEET ${ew.customSqlSegment} + + + + + + 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 index a01f1f2b..4151e8b7 100644 --- 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 @@ -19,6 +19,7 @@ +