From 94cdf93233cd84aff1c575ac27572b903a867201 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Thu, 26 Mar 2026 17:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/dashboard/mapper/PartMapper.xml      |  4 +--
 .../desk/dashboard/mapper/ProcessMapper.xml   |  2 +-
 .../dashboard/mapper/SimilarPartsMapper.xml   |  8 +++---
 .../service/impl/DsTaskingServiceImpl.java    | 28 +++++++++++++++----
 4 files changed, 30 insertions(+), 12 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 19581e3d..249e0ac9 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
@@ -165,7 +165,7 @@
             AND p.PLATE = #{dsPart.plate}
         </if>
         <if test="dsPart.partCode != null and dsPart.partCode != ''">
-            AND p.PART_CODE = #{dsPart.partCode}
+            AND p.PART_CODE LIKE '%' || #{dsPart.partCode} || '%'
         </if>
         <if test="dsPart.sinTerType != null and dsPart.sinTerType != ''">
             AND p.SIN_TER_TYPE = #{dsPart.sinTerType}
@@ -391,7 +391,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 MJMES.DS_PART_SUB src where src.PART_CODE = #{partCode}
+      FROM TOOL_MES.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/mapper/ProcessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml
index 3cfe562b..82d6ebd3 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml
@@ -38,7 +38,7 @@
     </select>
     <select id="selectDsProcessByCraftId"
             resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessEntity">
-        select * from DS_PROCESS where IS_DELETED = 0 and CRAFT_ID = #{craftId}
+        select * from DS_PROCESS where IS_DELETED = 0 and CRAFT_ID = #{craftId}  order by PROCESS_NO asc
     </select>
 
     <select id="selectDsProcessByIds" resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessEntity">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml
index 75600665..19d0d1a6 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml
@@ -22,11 +22,11 @@
 
     <select id="selectDsSimilarPartsPage" resultType="org.springblade.desk.dashboard.pojo.vo.DsSimilarPartsVO">
         select * from DS_SIMILAR_PARTS where is_deleted = 0
-        <if test="dsSimilarParts.partOne != null ">
-            and PART_TWO_CODE = #{dsSimilarParts.partOneCode}
+        <if test="dsSimilarParts.partOneCode != null ">
+            AND PART_TWO_CODE LIKE '%' || #{dsSimilarParts.partOneCode} || '%'
         </if>
-        <if test="dsSimilarParts.partTwo != null ">
-            and PART_TWO_CODE = #{dsSimilarParts.partTwoCode}
+        <if test="dsSimilarParts.partTwoCode != null ">
+            AND PART_TWO_CODE LIKE '%' || #{dsSimilarParts.partTwoCode} || '%'
         </if>
     </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 d3398770..41233778 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
@@ -34,6 +34,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.desk.basic.service.ICraftAbilityService;
+import org.springblade.desk.basic.service.impl.WorkCenterServiceImpl;
 import org.springblade.desk.dashboard.constant.*;
 import org.springblade.desk.dashboard.pojo.dto.DsTaskingDTO;
 import org.springblade.desk.dashboard.pojo.entity.*;
@@ -51,6 +52,7 @@ import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO;
 import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch;
 import org.springblade.desk.quality.service.IReviewSheetService;
 import org.springblade.erpdata.feign.IErpDataReworkTaskClient;
+import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springblade.system.feign.IUserClient;
@@ -158,8 +160,6 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	@Autowired
 	IReviewSheetService reviewSheetService;
 
-
-
 	@Override
 	public IPage<DsTaskingVO> selectAssignList(IPage<DsTaskingVO> page, DsTaskingVO dsTasking) {
 		List<DsTaskingVO> dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking);
@@ -738,6 +738,19 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 
 				// 查询工序信息
 				List<DsProcessEntity> processEntities = processService.selectDsProcessByCraftId(craftVO.getId());
+				for (DsProcessEntity processEntity : processEntities) {
+					if (processEntity == null) {
+						continue;
+					}
+
+					Optional.ofNullable(processEntity.getPpsId())
+							.map(processSetService::getById)
+							.ifPresent(processSet -> processEntity.setProcessName(processSet.getName()));
+
+					Optional.ofNullable(processEntity.getCaId())
+							.map(craftAbilityService::getById)
+							.ifPresent(craftAbility -> processEntity.setCraftName(craftAbility.getCaName()));
+				}
 
 				if (!CollectionUtils.isEmpty(processEntities)) {
 					List<Long> processIds = processEntities.stream()
@@ -2237,13 +2250,18 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 			// 设置尺寸量具列表
 			List<DsProcessMeasuringToolEntity> tools = measuringToolMap.get(processId);
 			processNode.setMeasuringToolList(tools != null ?
-					tools.stream().map(JSONObject::from).collect(Collectors.toList()) :
+					tools.stream()
+							.sorted(Comparator.comparing(DsProcessMeasuringToolEntity::getTrialNo))
+							.map(JSONObject::from).collect(Collectors.toList()) :
 					new ArrayList<>());
 
-			// 设置工序项目列表
+//			// 设置工序项目列表
 			List<DsProcessProjectEntity> projects = projectMap.get(processId);
 			processNode.setProjectList(projects != null ?
-					projects.stream().map(JSONObject::from).collect(Collectors.toList()) :
+					projects.stream()
+							.sorted(Comparator.comparing(DsProcessProjectEntity::getTrialNo))
+							.map(JSONObject::from)
+							.collect(Collectors.toList()) :
 					new ArrayList<>());
 
 			processTree.add(processNode);