From 2bc489cc38fc45bbadc5036a34ef7e1f4ea6cae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Fri, 6 Mar 2026 10:12:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/desk/produce/mapper/WorkPlanMapper.xml | 2 +- .../desk/produce/service/impl/WorkOrderServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index df2d9508..1ff829ff 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -86,7 +86,7 @@ mwp.FACT_END_TIME AS factEndTime FROM MES_WORK_PLAN mwp LEFT JOIN BS_PROCESS_SET bpe ON mwp.PPS_ID = bpe.ID - LEFT JOIN BA_TEAM_SET bte ON mwp.MAKE_TEAM = bte.ID + LEFT JOIN BS_TEAM_SET bte ON mwp.MAKE_TEAM = bte.ID LEFT JOIN MES_MAKE_REC mmr ON mwp.ID = mmr.WP_ID WHERE mwp.WO_ID = #{woId} ORDER BY mwp.ORDERS diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index dc0eb813..54ccaf54 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -1111,14 +1111,14 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workPlans = workPlanService.getProduceMonitorWorkPlanList(woId); - if (yieldOrder == null || CollectionUtils.isEmpty(workPlans) || workOrderRun == null) { + if (yieldOrder == null || CollectionUtils.isEmpty(workPlans)) { return null; } ProduceMonitorOrderDataVO orderDataVO = new ProduceMonitorOrderDataVO(); ProduceMonitorDsPartVO dsPartVO = new ProduceMonitorDsPartVO(); // 组装订单基础信息 BeanUtils.copyProperties(workOrder, orderDataVO); - orderDataVO.setOrderCode(workOrderRun.getWoCode()); + orderDataVO.setOrderCode(workOrderRun != null ? workOrderRun.getWoCode() : ""); orderDataVO.setPartCode(partCode); orderDataVO.setYpQty(yieldOrder.getYpQty()); orderDataVO.setYieldType(yieldOrder.getYieldType());