烧结数据打印完成未联调

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TaskDataDto.java

@@ -0,0 +1,15 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
+
+import java.util.List;
+
+@Data
+public class TaskDataDto {
+    private String cdjArea;
+    private String pdjArea;
+    private String gjArea;
+    private List<ProduceMonitorSlotListVO> slotList;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.desk.produce.pojo.dto.PrintChildCheck;
+import org.springblade.desk.produce.pojo.dto.TaskDataDto;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.quality.pojo.entity.AuditFile;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
@@ -292,8 +293,8 @@ public class WorkPlan extends BaseEntity {
 	@Schema(description = "返工工艺Id")
 	@TableField(exist = false)
 	public Long rpId;
-	@TableField(exist = false)
+//	@TableField(exist = false)
-	private List<ProduceMonitorSlotListVO> slotList;
+//	private List<ProduceMonitorSlotListVO> slotList;
 	@TableField(exist = false)
 	private List<MesQcProduceRunEntity> prList;
 	@TableField(exist = false)
@@ -337,5 +338,7 @@ public class WorkPlan extends BaseEntity {
 	private List<PrintChildCheck> printChildCheck;
 	@TableField(exist = false)
 	private AuditFile auditFile;
+	@TableField(exist = false)
+	private TaskDataDto taskData;
 
 }

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

@@ -51,6 +51,7 @@ import org.springblade.desk.produce.mapper.WorkPlanMapper;
 import org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO;
 import org.springblade.desk.produce.pojo.dto.PrintChildCheck;
 import org.springblade.desk.produce.pojo.dto.PrintChildCheckChild;
+import org.springblade.desk.produce.pojo.dto.TaskDataDto;
 import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.produce.service.IMesEquipmentCardService;
@@ -555,8 +556,15 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                     slotList = workPlanMapper.listSlotInfoList(workPlan.getId(), Boolean.FALSE);
                 }
             }
+
+            TaskDataDto dto = new TaskDataDto();
+            //未取得数据
+//            dto.setGjArea();
+//            dto.setCdjArea();
+//            dto.setPdjArea();
+            dto.setSlotList(slotList);
             // 2025-07-23 线上迁移修改 删除了prMacToolUseService.listSlotInfo方法调用
-            workPlan.setSlotList(slotList);
+            workPlan.setTaskData(dto);
         }
         // 设备编号信息（从设备，工装使用记录获取）
         List<MacToolUse> mtuList = workPlanMapper.listMacToolUse(workPlan.getId(), Boolean.FALSE);
@@ -1654,7 +1662,16 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             }
             // 同槽信息
             List<ProduceMonitorSlotListVO> slotList = workPlanMapper.listSjSlotInfoMes(prWorkPlan.getId(), Boolean.FALSE);
-            prWorkPlan.setSlotList(slotList);
+
+//            prWorkPlan.setSlotList(slotList);
+            TaskDataDto dto = new TaskDataDto();
+            //未取得数据
+//            dto.setGjArea();
+//            dto.setCdjArea();
+//            dto.setPdjArea();
+            dto.setSlotList(slotList);
+            // 2025-07-23 线上迁移修改 删除了prMacToolUseService.listSlotInfo方法调用
+            prWorkPlan.setTaskData(dto);
 
             // 设备绑定记录
             List<MesQcProduceRunEntity> qcProduceRunsList = workPlanMapper.listPrByWpId(prWorkPlan.getId());

blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java

@@ -220,11 +220,14 @@ public class UserController {
     @Operation(summary = "详情", description = "传入post")
     public R<List<Post>> getPost(Long userId) {
 
+        List<Post> posts = new ArrayList<>();
         User detail = userService.getById(userId);
         List<Long> postIds = Func.toLongList(detail.getPostId());
+        if(null != postIds && postIds.size() > 0){
             QueryWrapper<Post> queryWrapper = new QueryWrapper<>();
             queryWrapper.in("id",postIds);
-        List<Post> posts = postService.list(queryWrapper);
+            posts = postService.list(queryWrapper);
+        }
         return R.data(posts);
     }