From d33b2383628f2a634a966f89c17a36a45aacdf4c Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Sat, 23 May 2026 12:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/desk/dashboard/mapper/PartMapper.xml    | 2 +-
 .../desk/dashboard/service/impl/DsTaskingServiceImpl.java   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
index c8eade279..6c0d4fe0e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml
@@ -394,7 +394,7 @@
      src.PART_CODE, src.SUB_CODE, src.SUB_NAME, src.QUOTA,
     src.SUB_TYPE, src.PRODUCT_TYPE, src.AREA, src.CONFIG_NO, src.PLATE,
     src.MATERIAL, src.PLATE_CODE, src.SIN_TER_TYPE
-      FROM TOOL_MES.DS_PART_SUB src where src.PART_CODE = #{partCode}
+      FROM MJMES.DS_PART_SUB src where src.PART_CODE = #{partCode}
     </select>
     <select id="selectListPartByCodeLike" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartEntity">
         SELECT
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
index 2bfbb88d2..c6f6a6a26 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
@@ -2099,8 +2099,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 						item.setId(null);
 						item.setProcessId(dsProcessEntity.getId());
 						MeasurementRecordsEntity measurementRecords = measurementRecordsService.getById(item.getMtId());
-						item.setToolInfo(measurementRecords.getMcName());
-						item.setToolSize(measurementRecords.getNorms());
+						if(null != measurementRecords){
+							item.setToolInfo(measurementRecords.getMcName());
+							item.setToolSize(measurementRecords.getNorms());
+						}
 					});
 					if(!CollectionUtils.isEmpty(processMeasuringToolList)){
 						boolean measuringToolSaveBatch = processMeasuringToolService.saveBatch(processMeasuringToolList);