From 38293ed4247a1a33a715eeec216a3522c2178297 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Tue, 26 May 2026 14:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 dbb48505e..d46904b33 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
@@ -182,6 +182,9 @@
         <if test="dsPart.formingThickness != null">
             AND p.FORMING_THICKNESS = #{dsPart.formingThickness}
         </if>
+        <if test="dsPart.productType != null">
+            AND p.PRODUCT_TYPE = #{dsPart.productType}
+        </if>
         <if test="dsPart.startDate != null and dsPart.endDate != null">
             AND p.NEXT_DUE BETWEEN TO_DATE(#{dsPart.startDate}, 'YYYY-MM-DD')
             AND TO_DATE(#{dsPart.endDate}, 'YYYY-MM-DD') + 1 - 1/86400
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 bdd490a48..3d22a9b81 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
@@ -2557,10 +2557,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 					new ArrayList<>());
 
 			// 设置尺寸量具列表
+			// trialNo 有可能为null 所以不进行排序
 			List<DsProcessMeasuringToolEntity> tools = measuringToolMap.get(processId);
 			processNode.setMeasuringToolList(tools != null ?
 					tools.stream()
-							.sorted(Comparator.comparing(DsProcessMeasuringToolEntity::getTrialNo))
 							.map(JSONObject::from).collect(Collectors.toList()) :
 					new ArrayList<>());