From 49c93b1da24e0f4d4a77fd8a3e6cc95375596417 Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Tue, 17 Mar 2026 09:42:50 +0800
Subject: [PATCH] =?UTF-8?q?desk=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/mapper/WorkPlanMapper.java   |  1 +
 .../impl/InspectionTaskServiceImpl.java       | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java
index 9bad4fab..4835b9c3 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java
@@ -43,5 +43,6 @@ public interface WorkPlanMapper extends BaseMapper<WorkPlan> {
 
     List<ProduceMonitorSlotListVO> listSlotInfoGr (Long wpId, Boolean aTrue);
     List<ProduceMonitorSlotListVO> listSlotInfo (Long wpId,Boolean aTrue);
+    List<MacToolUse> listMacToolUse(Long wpId,Boolean aTrue);
 
 }
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 6d94ea2f..7d2db8ff 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
@@ -35,6 +35,7 @@ import org.springblade.desk.dashboard.service.IDsPartService;
 import org.springblade.desk.order.mapper.YieldOrderMapper;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.service.IYieldOrderService;
+import org.springblade.desk.produce.mapper.WorkOrderMapper;
 import org.springblade.desk.produce.mapper.WorkPlanMapper;
 import org.springblade.desk.produce.pojo.entity.MacToolUse;
 import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
@@ -104,8 +105,11 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
     private IRemindMsgService service;
     @Resource
     private WorkPlanMapper workPlanMapper;
+//    @Resource
+//    private IWorkOrderService workOrderService;
     @Resource
-    private IWorkOrderService workOrderService;
+    private WorkOrderMapper workOrderMapper;
+
     @Resource
     private YieldOrderMapper yieldOrderMapper;
     @Resource
@@ -404,7 +408,8 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             return null;
         }
         JSONObject jsonObj = new JSONObject();
-        WorkOrder wo = workOrderService.getById(woId);
+//        WorkOrder wo = workOrderService.getById(woId);
+        WorkOrder wo = workOrderMapper.selectById(woId);
         YieldOrder pjYieldOrder = yieldOrderMapper.selectById(wo.getYoId());
         QueryWrapper<DsPartEntity> qwpart = new QueryWrapper<>();
         qwpart.eq("PART_CODE", pjYieldOrder.getPartCode());
@@ -446,7 +451,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         // 生产过程(放在获取检验记录下面，这个方法会排除数据)
         this.getNewProcess(wpList, jsonObj, planList);
 
-        return null;
+        return jsonObj;
     }
 
     public void getNewProcess(List<WorkPlan> wpList, JSONObject jsonObj, List<Boolean> modelFlag) {
@@ -498,7 +503,19 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             // 2025-07-23 线上迁移修改 删除了prMacToolUseService.listSlotInfo方法调用
             workPlan.setSlotList(slotList);
         }
-
+        // 设备编号信息（从设备，工装使用记录获取）
+//        List<MacToolUse> mtuList = workPlanMapper.listMacToolUse(workPlan.getWpId(), Boolean.FALSE);
+//        if (mtuList.size() > 0) {
+//            // 设备编号
+//            String gj = StringUtils.join(mtuList.stream().filter(i -> i.getBsRackSet() != null).map(i -> i.getBsRackSet().getRsCode()).collect(Collectors.toList()), "'、'");
+//            String fb = StringUtils.join(mtuList.stream().filter(i -> i.getBsFeiBaSet() != null).map(i -> i.getBsFeiBaSet().getFsCode()).collect(Collectors.toList()), "、");
+//            String eq = StringUtils.join(mtuList.stream().filter(i -> i.getEquipmentCard() != null).map(i -> i.getEquipmentCard().getDeviceCode()).collect(Collectors.toList()), "、");
+//            workPlan.setGjCode(gj);
+//            workPlan.setFbCode(fb);
+//            //zxh 20250107 电子档案工序设备编号不再拼接烘箱，eq中已存在烘箱
+////            workPlan.setDeviceCode(box != null && box.getDeviceId() != null ? eq + "、" + box.getDeviceId() : eq);
+//            workPlan.setDeviceCode(eq);
+//        }
 
     }