copyList 槽液报告 详情 会带一个copyList的列表。

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java

@@ -6,7 +6,6 @@ public interface InspectionTaskConst {
      * 热表
      */
     Integer FROM_TYPE_RB = 1;
-
     /**
      * 烧结
      */
@@ -28,4 +27,9 @@ public interface InspectionTaskConst {
      * NA
      */
     Integer CHECK_RESULT_NA = 3;
+
+    /**
+     * 烧结包装防护
+     */
+    String PROCESS_NAME_SJBZFH = "烧结包装防护";
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java

@@ -167,6 +167,10 @@ public class InspectionTask extends BaseEntity {
      * 接收日期
      */
     public static final String COL_RECEIVE_DATE  = "RECEIVE_DATE";
+    /**
+     * [工序]名称
+     */
+    public static final String COL_PROCESS_NAME  = "PROCESS_NAME";
 
     /**
      * [检验任务]编码
@@ -343,4 +347,9 @@ public class InspectionTask extends BaseEntity {
      */
     @Schema(description = "接收日期")
     private LocalDateTime receiveDate;
+    /**
+     * 工序名称
+     */
+    @Schema(description = "工序名称")
+    private String processName;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java

@@ -28,12 +28,6 @@ public class InspectionTaskDetailVO extends InspectionTask {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    /**
-     * todo:
-     */
-    @Schema(description = "工序名称")
-    private String processName = "工序名称A";
-
     private InspectionTaskListVO orderInfo;
 
     private List<RemindMsg> remindMsgList;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportDetailVO.java

@@ -0,0 +1,31 @@
+/**
+ * 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.LiquidTankReport;
+import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy;
+
+import java.io.Serial;
+import java.util.List;
+
+/**
+ * [槽液报告] 视图实体类
+ *
+ * @author Tom Shuo
+ * @since 2025-12-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LiquidTankReportDetailVO extends LiquidTankReport {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "维护人")
+    private String updateUserRealName;
+    @Schema(description = "复制槽液任务列表")
+    private List<LiquidTankTaskCopyVO> copyList;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.desk.quality.pojo.entity.LiquidTankReport;
 
 import java.io.Serial;
+import java.util.List;
 
 /**
  * [槽液报告] 视图实体类

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java

@@ -28,8 +28,11 @@ 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.vo.LiquidTankReportDetailVO;
 import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO;
 import org.springblade.desk.quality.service.ILiquidTankReportService;
+import org.springblade.desk.quality.service.ILiquidTankTaskCopyService;
+import org.springblade.desk.quality.wrapper.LiquidTankReportDetailWrapper;
 import org.springblade.desk.quality.wrapper.LiquidTankReportWrapper;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -55,6 +58,8 @@ public class LiquidTankReportController extends BladeController {
 
     @Resource
     private ILiquidTankReportService service;
+    @Resource
+    private ILiquidTankTaskCopyService liquidTankTaskCopyService;
 
     /**
      * [槽液报告] 详情
@@ -62,10 +67,12 @@ public class LiquidTankReportController extends BladeController {
     @GetMapping("/detail")
     @ApiOperationSupport(order = 10)
     @Operation(summary = "详情", description = "传入LiquidTankReport Obj")
-	public R<LiquidTankReportVO> detail(LiquidTankReport liquidTankReport) {
+    public R<LiquidTankReportDetailVO> detail(LiquidTankReport liquidTankReport) {
         QueryWrapper<LiquidTankReport> qw = Condition.getQueryWrapper(liquidTankReport);
         LiquidTankReport detail = service.getOne(qw);
-		LiquidTankReportVO detailVO = LiquidTankReportWrapper.build().entityVO(detail);
+        LiquidTankReportDetailVO detailVO = LiquidTankReportDetailWrapper.build().entityVO(detail);
+        // 直接查询明细列表
+        detailVO.setCopyList(liquidTankTaskCopyService.getListByLiquidTankReportId(detailVO.getId()));
         return R.data(detailVO);
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java

@@ -8,6 +8,7 @@ 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.LiquidTankReportDetailVO;
 import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO;
 
 import java.util.List;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java

@@ -45,4 +45,6 @@ public interface ILiquidTankTaskCopyService extends BaseService<LiquidTankTaskCo
     R generateReport(@Valid @RequestBody List<LiquidTankTaskCopy> list);
 
     R generateWave(@Valid @RequestBody List<LiquidTankTaskCopy> list);
+
+    List<LiquidTankTaskCopyVO> getListByLiquidTankReportId(Long liquidTankReportId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IRelTankReportItemService.java

@@ -19,6 +19,7 @@ import java.util.List;
  * @since 2025-12-18
  */
 public interface IRelTankReportItemService extends BaseService<RelTankReportItem> {
+
     /**
      * 自定义分页
      *
@@ -26,7 +27,8 @@ public interface IRelTankReportItemService extends BaseService<RelTankReportItem
      * @param relTankReportItem 查询参数
      * @return IPage<RelTankReportItemVO>
      */
-	IPage<RelTankReportItemVO> selectRelTankReportItemPage(IPage<RelTankReportItemVO> page, RelTankReportItemVO relTankReportItem);
+    IPage<RelTankReportItemVO> selectRelTankReportItemPage(IPage<RelTankReportItemVO> page,
+                                                           RelTankReportItemVO relTankReportItem);
 
     /**
      * 导出数据

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -169,6 +169,12 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         // 新建 InspectionTask
         InspectionTask task = new InspectionTask();
         task.setId(null);
+        //
+        if (Objects.equals(fromType, InspectionTaskConst.FROM_TYPE_RB)) {
+            task.setProcessName(InspectionTaskConst.PROCESS_NAME_SJBZFH);
+        } else {
+            task.setProcessName("测试工序2000");
+        }
         task.setStatus(InspectionTaskConst.CHECK_RESULT_TODO);
         // todo: fake data
         task.setWoId(2002227460172464129L);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankReportServiceImpl.java

@@ -11,12 +11,17 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.desk.quality.excel.LiquidTankReportExcel;
 import org.springblade.desk.quality.mapper.LiquidTankReportMapper;
 import org.springblade.desk.quality.pojo.entity.LiquidTankReport;
+import org.springblade.desk.quality.pojo.vo.LiquidTankReportDetailVO;
 import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO;
 import org.springblade.desk.quality.service.ILiquidTankReportService;
+import org.springblade.desk.quality.service.ILiquidTankTaskCopyService;
+import org.springblade.desk.quality.service.IRelTankReportItemService;
 import org.springblade.system.feign.IUserClient;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -32,7 +37,11 @@ import java.util.List;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
-public class LiquidTankReportServiceImpl extends BaseServiceImpl<LiquidTankReportMapper, LiquidTankReport> implements ILiquidTankReportService {
+public class LiquidTankReportServiceImpl extends BaseServiceImpl<LiquidTankReportMapper, LiquidTankReport>
+        implements ILiquidTankReportService {
+
+    @Resource
+    private IRelTankReportItemService relTankReportItemService;
 
     @Resource
     private IUserClient userClient;
@@ -53,6 +62,8 @@ public class LiquidTankReportServiceImpl extends BaseServiceImpl<LiquidTankRepor
 
     @Override
     public void setVOValue(LiquidTankReportVO vo) {
+        if (IdUtil.isValid(vo.getUpdateUser())) {
             vo.setUpdateUserRealName(userClient.userInfo(vo.getUpdateUser()).getData().getUser().getRealName());
         }
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskCopyServiceImpl.java

@@ -5,7 +5,9 @@ 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.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;
@@ -22,9 +24,11 @@ import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO;
 import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO;
 import org.springblade.desk.quality.service.*;
 import org.springblade.desk.quality.util.CodeUtil;
+import org.springblade.desk.quality.wrapper.LiquidTankTaskCopyWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,6 +45,9 @@ import java.util.List;
 public class LiquidTankTaskCopyServiceImpl extends BaseServiceImpl<LiquidTankTaskCopyMapper, LiquidTankTaskCopy>
         implements ILiquidTankTaskCopyService {
 
+    @Resource
+    private IWorkCenterService workCenterService;
+
     @Resource
     private ILiquidTankReportService reportService;
     @Resource
@@ -53,8 +60,7 @@ public class LiquidTankTaskCopyServiceImpl extends BaseServiceImpl<LiquidTankTas
     private IRelTankReportItemService relReportItemService;
     @Resource
     private IRelTankWaveItemService relTankWaveItemService;
-    @Resource
-    private IWorkCenterService workCenterService;
+
 
     @Override
     public IPage<LiquidTankTaskCopyVO> selectLiquidTankTaskCopyPage(IPage<LiquidTankTaskCopyVO> page, LiquidTankTaskCopyVO liquidTankTaskCopy) {
@@ -103,7 +109,7 @@ public class LiquidTankTaskCopyServiceImpl extends BaseServiceImpl<LiquidTankTas
             // 保存关联关系
             relReportItemService.save(item);
         }
-        return R.success();
+        return R.success("生成报告成功");
     }
 
     @Transactional
@@ -129,6 +135,22 @@ public class LiquidTankTaskCopyServiceImpl extends BaseServiceImpl<LiquidTankTas
             // 保存关联关系
             relTankWaveItemService.save(item);
         }
-        return R.success();
+        return R.success("生成曲线成功");
+    }
+
+    @Override
+    public List<LiquidTankTaskCopyVO> getListByLiquidTankReportId(Long liquidTankReportId) {
+        LambdaQueryWrapper<RelTankReportItem> qw = Wrappers.lambdaQuery();
+        qw.eq(RelTankReportItem::getLiquidTankReportId, liquidTankReportId);
+        List<RelTankReportItem> relList = relReportItemService.list(qw);
+        List<LiquidTankTaskCopyVO> copyList = new ArrayList<>();
+        for (RelTankReportItem relOne : relList) {
+            Long taskId = relOne.getLiquidTankTaskId();
+            LiquidTankTaskCopy copy = getById(taskId);
+            LiquidTankTaskCopyVO copyVO = LiquidTankTaskCopyWrapper.build().entityVO(copy);
+            setVOValue(copyVO);
+            copyList.add(copyVO);
+        }
+        return copyList;
     }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/LiquidTankReportDetailWrapper.java

@@ -0,0 +1,37 @@
+/**
+ * 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.LiquidTankReport;
+import org.springblade.desk.quality.pojo.vo.LiquidTankReportDetailVO;
+import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO;
+
+import java.util.Objects;
+
+/**
+ * [槽液报告] 包装类,返回视图层所需的字段
+ *
+ * @author Tom Shuo
+ * @since 2025-12-18
+ */
+public class LiquidTankReportDetailWrapper extends BaseEntityWrapper<LiquidTankReport, LiquidTankReportDetailVO>  {
+
+	public static LiquidTankReportDetailWrapper build() {
+		return new LiquidTankReportDetailWrapper();
+ 	}
+
+	@Override
+	public LiquidTankReportDetailVO entityVO(LiquidTankReport liquidTankReport) {
+        LiquidTankReportDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(liquidTankReport, LiquidTankReportDetailVO.class));
+
+		//User createUser = UserCache.getUser(liquidTankReport.getCreateUser());
+		//User updateUser = UserCache.getUser(liquidTankReport.getUpdateUser());
+		//liquidTankReportVO.setCreateUserName(createUser.getName());
+		//liquidTankReportVO.setUpdateUserName(updateUser.getName());
+
+		return VO;
+	}
+}