From 9c99b9974b03cd34867c7b4a30382aeb83b20c7b Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Fri, 12 Jun 2026 14:34:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkPlanItemServiceImpl.java | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
index f6822c2c5..e6a9c6230 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java
@@ -290,9 +290,11 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
     @Override
     public List<WorkPlanItemVO> listShareVOByWpiId(Long wpiId) {
         List<WorkPlanItemVO> listVO = baseMapper.listShareByWpiId(wpiId);
-        for (WorkPlanItemVO vo : listVO) {
-            setVOValue(vo);
-            vo.setCheckName("工序检验");
+        if (CollectionUtils.isNotEmpty(listVO)) {
+            for (WorkPlanItemVO vo : listVO) {
+                setVOValue(vo);
+                vo.setCheckName("工序检验");
+            }
         }
         List<WorkPlanItemVO> itemVOS = listShareBySameSlot(wpiId);
         if (CollectionUtils.isNotEmpty(itemVOS)) {
@@ -313,10 +315,12 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
     private List<WorkPlanItemVO> listShareBySameSlot(Long wpiId) {
         WorkPlanItem workPlanItem = this.getById(wpiId);
         if (workPlanItem == null) {
+            log.info("WorkPlanItem查询失败");
             return null;
         }
         WorkPlan workPlan = workPlanMapper.selectById(workPlanItem.getWpId());
         if (workPlan == null) {
+            log.info("workPlan查询失败");
             return null;
         }
         if (workPlan != null && workPlan.getFrontWpId() != null) {
@@ -342,15 +346,19 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
             String partCode = null;
             if (workPlan.getCaId() != null) {
                 CraftAbilityEntity craftAbility = craftAbilityService.getById(workPlan.getCaId());
-                Map<String, String> dictMap = getProcessCapabilityTypeMap();
-                String wxLimitName = dictMap.get(craftAbility.getWxLimit());
-                boolean checkCaType = !StringUtils.isEmpty(wxLimitName) && (wxLimitName.contains("镀金") || wxLimitName.contains("镀银"));
-                WorkOrder workOrder = workOrderMapper.selectById(workPlan.getWoId());
-                if (workOrder == null) {
-                    return null;
-                }
-                if (checkCaType) {
-                    partCode = workOrder.getPartCode();
+                if (craftAbility != null) {
+                    Map<String, String> dictMap = getProcessCapabilityTypeMap();
+                    String wxLimitName = dictMap.get(craftAbility.getWxLimit());
+                    boolean checkCaType = !StringUtils.isEmpty(wxLimitName) && (wxLimitName.contains("镀金") || wxLimitName.contains("镀银"));
+                    log.info("checkCaType：" + checkCaType);
+                    WorkOrder workOrder = workOrderMapper.selectById(workPlan.getWoId());
+                    if (workOrder == null) {
+                        log.info("workOrder查询失败");
+                        return null;
+                    }
+                    if (checkCaType) {
+                        partCode = workOrder.getPartCode();
+                    }
                 }
             }
             List<ProduceMonitorSlotListVO> list = macToolUseService.listSlotInfo(workPlan);