From 4776d8797162098ac4c29a6fc1feefb156920e98 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 9 Mar 2026 14:04:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86=E6=9B=B2?= =?UTF-8?q?=E7=BA=BF=EF=BC=8C=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=A1=AC=E5=BA=A6=E8=AF=A6=E7=BB=86=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/vo/ProduceMonitorSlotListVO.java | 3 + .../pojo/entity/WorkPlanThicknessDetail.java | 86 +++++++++++++++++++ .../quality/pojo/vo/LiquidTankWaveVO.java | 2 + .../pojo/vo/WorkPlanItemThicknessVO.java | 26 ++++++ .../impl/StorageMonitoringServiceImpl.java | 2 +- .../controller/InspectionTaskController.java | 54 ++++++++++-- .../LiquidTankTaskCopyController.java | 6 ++ .../controller/LiquidTankWaveController.java | 70 +++++++++++---- .../desk/quality/mapper/ReviewSheetMapper.xml | 6 +- .../mapper/WorkPlanItemThicknessMapper.java | 42 +++++++++ .../mapper/WorkPlanItemThicknessMapper.xml | 40 +++++++++ .../IWorkPlanItemThicknessService.java | 33 +++++++ .../WorkPlanItemThicknessServiceImpl.java | 54 ++++++++++++ .../wrapper/WorkPlanItemThicknessWrapper.java | 32 +++++++ 14 files changed, 430 insertions(+), 26 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanThicknessDetail.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemThicknessVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemThicknessMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemThicknessMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemThicknessService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemThicknessServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemThicknessWrapper.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorSlotListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorSlotListVO.java index d1b3fe0e..4541235e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorSlotListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorSlotListVO.java @@ -54,4 +54,7 @@ public class ProduceMonitorSlotListVO { @Schema(description = "作业计划ID") private Long wpId; + @Schema(description = "是否显示右边按钮 0：不显示 1：显示") + private String isShow; + } \ No newline at end of file diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanThicknessDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanThicknessDetail.java new file mode 100644 index 00000000..3f9542fe --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanThicknessDetail.java @@ -0,0 +1,86 @@ +/** + * 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; +import java.time.LocalDate; + +/** + * [工序检验项明细,硬度] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_WORK_PLAN_THICKNESS_DETAIL") +@Schema(description = "WorkPlanThicknessDetail Entity对象") +@EqualsAndHashCode(callSuper = true) +public class WorkPlanThicknessDetail extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [工序检验项]id + */ + public static final String COL_WORK_PLAN_ITEM_ID = "WORK_PLAN_ITEM_ID"; + /** + * [工序检验项]id + */ + @Schema(description = "[工序检验项]id") + private Long workPlanItemId; + /** + * 程式编号; + */ + @Schema(description = "程式编号") + private String code; + /** + * 名称1 + */ + @Schema(description = "名称1") + private String name1; + /** + * 参数1 + */ + @Schema(description = "参数1") + private BigDecimal param1; + /** + * 名称2 + */ + @Schema(description = "名称2") + private String name2; + /** + * 参数2 + */ + @Schema(description = "参数2") + private BigDecimal param2; + /** + * 名称3 + */ + @Schema(description = "名称3") + private String name3; + /** + * 参数3 + */ + @Schema(description = "参数3") + private BigDecimal param3; + /** + * 设备编码 + */ + @Schema(description = "设备编码") + private String woCode; + /** + * 检测时间 + */ + @Schema(description = "检测时间") + private LocalDate checkDate; + +} diff --git a/blade-service-api/blade-desk-api/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 index 1f79a2ec..962b3895 100644 --- a/blade-service-api/blade-desk-api/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 @@ -27,5 +27,7 @@ public class LiquidTankWaveVO extends LiquidTankWave { @Schema(description = "维护人") private String updateUserRealName; + private String workCenterName; + private List waveData = new ArrayList<>(); } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemThicknessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemThicknessVO.java new file mode 100644 index 00000000..0a6d7b40 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemThicknessVO.java @@ -0,0 +1,26 @@ +/** + * 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.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.entity.WorkPlanThicknessDetail; + +import java.io.Serial; + +/** + * [工序检验项明细] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemThicknessVO extends WorkPlanThicknessDetail { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java index bc60b5d1..a363f7a2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java @@ -89,7 +89,7 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService { * - 库位ID/任务/库位信息空值校验，跳过异常数据 * - 状态未变化时跳过更新，减少数据库IO */ - @Scheduled(cron = "0 * * * * ?") // Spring定时任务注解，cron表达式控制执行频率 +// @Scheduled(cron = "0 * * * * ?") // Spring定时任务注解，cron表达式控制执行频率 @Override // 实现IStorageMonitoringService接口的抽象方法 public void monitoringStation() { // ========== 步骤1：查询所有空闲状态的站点 ========== 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 096ac65d..e09e52a7 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 @@ -35,12 +35,14 @@ 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.InspectionTask; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskSubPartVO; import org.springblade.desk.quality.service.IInspectionTaskService; +import org.springblade.desk.quality.service.IReviewSheetSubService; import org.springblade.desk.quality.service.InspectionTaskService2; import org.springblade.desk.quality.wrapper.InspectionTaskDetailWrapper; import org.springframework.web.bind.annotation.*; @@ -72,7 +74,10 @@ public class InspectionTaskController extends BladeController { private InspectionTaskService2 service2; @Resource private RoleConfig roleConfig; - + @Resource + private IWorkPlanService workPlanService; + @Resource + private IMacToolUseService macToolUseService; /** * [检验任务] 详情 */ @@ -88,6 +93,29 @@ public class InspectionTaskController extends BladeController { return R.data(detailDetailVO); } + @GetMapping("/detailMut") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入inspectionTask") + public R detailMut(Long wpId) { +// WorkPlan plan = workPlanService.getById(wpId); + + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("WP_ID", wpId); + List list = service.list(qw); + InspectionTask inspectionTask = new InspectionTask(); + if(null != list && list.size() > 0){ + inspectionTask = list.get(0); + } + InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); + InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); +// InspectionTaskListVO detailDetail = service.detailById(inspectionTask); + service.setDetailVOValue(detailDetailVO); + return R.data(detailDetailVO); + } + + + + /** * [检验任务] 分页 */ @@ -210,23 +238,39 @@ public class InspectionTaskController extends BladeController { // return service.getSamePlace(id); // } + @Resource + private IReviewSheetSubService rsSubService; + @GetMapping("/getSameList") @ApiOperationSupport(order = 7) @Operation(summary = "查询同槽/同炉", description = "id") public R getSameList(@Parameter(description = "主键", required = true) @RequestParam Long id) { + + + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("TASK_ID", id); + List listSheet = rsSubService.list(qw); + + InspectionTask inspectionTask = new InspectionTask(); inspectionTask.setId(id); InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); WorkPlan workPlan = workPlanService.getOne(new QueryWrapper().lambda().eq(WorkPlan::getId, detail.getWpId())); List list = macToolUseService.listSlotInfo(workPlan); + if(null != listSheet && listSheet.size() > 0){ + list.forEach(one -> { + one.setIsShow("1"); + }); + }else{ + list.forEach(one -> { + one.setIsShow("0"); + }); + } return R.data(list); // return service.getSamePlace(id); } - @Resource - private IWorkPlanService workPlanService; - @Resource - private IMacToolUseService macToolUseService; + /** * [检验任务] 同槽 检验结果应用 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 9e3dd4d9..ecefcb73 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 @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.pojo.entity.WorkTank; +import org.springblade.desk.basic.service.IWorkTankService; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.util.RequestUtil; import org.springblade.desk.basic.constant.BaseCol; @@ -71,6 +72,8 @@ public class LiquidTankTaskCopyController extends BladeController { @Resource private ILiquidTankService tankService; + @Resource + private IWorkTankService workTankService; /** * [槽液检测任务复制] 详情 @@ -191,6 +194,8 @@ public class LiquidTankTaskCopyController extends BladeController { List records = tankService.list(queryWrapper); if(null != records && records.size()>0){ LiquidTank tank = records.get(0); + WorkTank work = workTankService.getById(tank.getWorkTankId()); + copyVO.setWorkTankName(work.getWorkTankCode()); if(1==tank.getJobType()){ String weekly = tank.getJobTypeWeekValue(); List weeks = Arrays.asList(weekly.split(",")); @@ -290,6 +295,7 @@ public class LiquidTankTaskCopyController extends BladeController { .collect(Collectors.toList()); List vos = voess.stream() + .filter(vo -> vo.getSampleDate() != null) .sorted(Comparator.comparing(LiquidTankTaskCopyVO::getSampleDate)) .collect(Collectors.toList()); 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 fb766fe8..18cc14b4 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 @@ -42,10 +42,13 @@ import org.springblade.desk.quality.service.ILiquidTankWaveService; import org.springblade.desk.quality.service.IRelTankWaveItemService; import org.springblade.desk.quality.wrapper.LiquidTankTaskCopyWrapper; import org.springblade.desk.quality.wrapper.LiquidTankWaveWrapper; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -71,6 +74,8 @@ public class LiquidTankWaveController extends BladeController { private ILiquidTankTaskCopyService copyService; @Resource private IRelTankWaveItemService relReportItemService; + @Resource + private IUserClient userClient; public List getListByLiquidTankReportId(Long liquidTankReportId) { @@ -102,45 +107,70 @@ public class LiquidTankWaveController extends BladeController { LiquidTankWave detail = service.getOne(qw); LiquidTankWaveVO detailVO = LiquidTankWaveWrapper.build().entityVO(detail); + User user = userClient.userInfoById(detailVO.getUpdateUser()).getData(); + List pagesVO = getListByLiquidTankReportId(detailVO.getId()); + pagesVO.stream() + .peek(copyService::setVOValue) + .collect(Collectors.toList()); + detailVO.setWorkCenterName(pagesVO.get(0).getWcName()); + detailVO.setUpdateUserRealName(user.getRealName()); + // key 自带排序 + // key: [作业槽]id + // value: 任务数据列表 + Map latestRecordMap = pagesVO.stream() + .collect(Collectors.groupingBy( + record -> record.getWorkTankId() + "_" + record.getWorkCenterId()+"_"+record.getTestElement()+"_"+record.getSampleDate(), + // 每组内按dateTime降序，取最新的一条 + Collectors.collectingAndThen( + Collectors.maxBy(Comparator.comparing(LiquidTankTaskCopy::getCreateTime)), + optional -> optional.orElse(null) // 处理Optional避免空指针 + ) + )); + // 3. 转换为List（如果需要List格式） -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.eq(LiquidTankTaskCopy.COL_LIQUID_TANK_WAVE_ID, detailVO.getId()) -// queryWrapper.orderByAsc("ID"); -// queryWrapper.orderByAsc(LiquidTankTaskCopy.COL_REPEAT_TEST_DATE); + List lesss = new ArrayList<>(latestRecordMap.values()); +// +// +// List voess = lesss.stream() +// .map(LiquidTankTaskCopyWrapper.build()::entityVO) +// .collect(Collectors.toList()); -// List pages = copyService.list(queryWrapper); -// List pagesVO = LiquidTankTaskCopyWrapper.build().listVO(pages); -// IPage pagesVO = LiquidTankTaskCopyWrapper.build().pageVO(pages); - pagesVO.stream() - .peek(copyService::setVOValue) + List vos = lesss.stream() + .filter(vo -> vo.getSampleDate() != null) + .sorted(Comparator.comparing(LiquidTankTaskCopyVO::getSampleDate)) .collect(Collectors.toList()); + // key 自带排序 // key: [作业槽]id // value: 任务数据列表 - Map> treeMap = new TreeMap<>(); + Map> treeMap = new TreeMap<>(); // 遍历赋值到treeMap中 - pagesVO.forEach(vo -> { + vos.forEach(vo -> { final Long wtId = vo.getWorkTankId(); + final Long wcId = vo.getWorkCenterId(); + final String testElement = vo.getTestElement(); + final LocalDate date = vo.getSampleDate(); + final String keys = wtId + "_" + wcId + "_" + testElement; // 不包含，新建 - if (!treeMap.containsKey(wtId)) { + if (!treeMap.containsKey(keys)) { List list = new ArrayList<>(); - treeMap.put(wtId, list); + treeMap.put(keys, list); } - treeMap.get(wtId).add(vo); + treeMap.get(keys).add(vo); }); // 前端要求匹配对象 -// LiquidTankWaveDrawVO allVO = new LiquidTankWaveDrawVO(); -// List allChart = detailVO.getWaveData(); - List allChart = new ArrayList<>(); + LiquidTankWaveDrawVO allVO = new LiquidTankWaveDrawVO(); + List allChart = allVO.getWaveData(); // 每个entry一个图表 - for (Map.Entry> entry : treeMap.entrySet()) { - Long wtId = entry.getKey(); + for (Map.Entry> entry : treeMap.entrySet()) { + String key = entry.getKey(); // 数据列表 List list = entry.getValue(); LiquidTankWaveDrawSingleVO singleChart = new LiquidTankWaveDrawSingleVO(); for (LiquidTankTaskCopyVO one : list) { + singleChart.setWcId(one.getWorkCenterId()); singleChart.setWcName(one.getWcName()); singleChart.setWorkTankId(one.getWorkTankId()); @@ -151,6 +181,8 @@ public class LiquidTankWaveController extends BladeController { singleChart.getMinList().add(one.getTargetValueMin()); singleChart.getTargetList().add(one.getTargetValue()); singleChart.getTestList().add(one.getRepeatTestValue()); + singleChart.getTestDateList().add(one.getSampleDate()); + singleChart.setId(one.getId()); } allChart.add(singleChart); } 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 28b903cc..28ec70cc 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 @@ -67,12 +67,16 @@ + SELECT * + FROM QA_WORK_PLAN_THICKNESS_DETAIL + WHERE is_deleted = 0 + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemThicknessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemThicknessService.java new file mode 100644 index 00000000..2af36f34 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemThicknessService.java @@ -0,0 +1,33 @@ +/** + * 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.WorkPlanItem; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.entity.WorkPlanThicknessDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemThicknessVO; + +import java.util.List; + +/** + * [工序检验项明细] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IWorkPlanItemThicknessService extends BaseService { + + /** + * VO + * + * @param vo + */ + void setVOValue(WorkPlanItemThicknessVO vo); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemThicknessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemThicknessServiceImpl.java new file mode 100644 index 00000000..d3851c02 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemThicknessServiceImpl.java @@ -0,0 +1,54 @@ +/** + * Author: Tom Shuo + */ +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.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.desk.dashboard.pojo.entity.DsProcessMeasuringToolEntity; +import org.springblade.desk.dashboard.service.IDsProcessMeasuringToolService; +import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.mapper.WorkPlanItemDetailMapper; +import org.springblade.desk.quality.mapper.WorkPlanItemThicknessMapper; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.entity.WorkPlanThicknessDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemThicknessVO; +import org.springblade.desk.quality.service.IWorkPlanItemDetailService; +import org.springblade.desk.quality.service.IWorkPlanItemThicknessService; +import org.springblade.desk.quality.wrapper.WorkPlanItemDetailWrapper; +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 WorkPlanItemThicknessServiceImpl extends BaseServiceImpl + implements IWorkPlanItemThicknessService { + + + @Override + public void setVOValue(WorkPlanItemThicknessVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemThicknessWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemThicknessWrapper.java new file mode 100644 index 00000000..9a567a85 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemThicknessWrapper.java @@ -0,0 +1,32 @@ +/** + * 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.entity.WorkPlanThicknessDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemThicknessVO; + +import java.util.Objects; + +/** + * [工序检验项明细] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class WorkPlanItemThicknessWrapper extends BaseEntityWrapper { + + public static WorkPlanItemThicknessWrapper build() { + return new WorkPlanItemThicknessWrapper(); + } + + @Override + public WorkPlanItemThicknessVO entityVO(WorkPlanThicknessDetail entity) { + WorkPlanItemThicknessVO VO = Objects.requireNonNull(BeanUtil.copyProperties(entity, WorkPlanItemThicknessVO.class)); + return VO; + } +}