From 87a53cd5fdb44eafd3982b05c057e02845ad70bb Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Tue, 28 Apr 2026 16:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/dashboard/mapper/DsTaskingMapper.java    |  4 ++++
 .../desk/dashboard/mapper/TaskingMapper.xml       |  8 ++++++++
 .../desk/dashboard/service/IDsTaskingService.java |  9 +++++++++
 .../dashboard/service/impl/DsPartServiceImpl.java |  5 +++++
 .../service/impl/DsTaskingServiceImpl.java        |  5 +++++
 .../service/impl/YieldOrderCraftServiceImpl.java  | 15 +++++++++++++++
 6 files changed, 46 insertions(+)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java
index 66f04f38..f158ea38 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java
@@ -140,4 +140,8 @@ public interface DsTaskingMapper extends BaseMapper<DsTaskingEntity> {
 	 * @return
 	 */
 	DsTaskingEntity getMaxReworkSyncTime();
+
+    List<DsTaskingEntity> selectTaskingByPartCode(@Param("partCode") String partCode,
+												  @Param("taskStatus") Integer taskStatus,
+												  @Param("taskType")String taskType);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml
index 66b00250..1d4e56cf 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml
@@ -156,5 +156,13 @@
             ORDER BY SYNC_TIME DESC
         ) WHERE ROWNUM = 1;
     </select>
+    <select id="selectTaskingByPartCode"
+            resultType="org.springblade.desk.dashboard.pojo.entity.DsTaskingEntity">
+         SELECT * FROM DS_TASKING
+            WHERE IS_DELETED = 0
+            AND PART_CODE = #{partCode}
+            AND TASK_STATUS = #{taskStatus}
+            AND TASK_TYPE = #{taskType}
+    </select>
 
 </mapper>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java
index 668b27de..eeb830ba 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java
@@ -235,4 +235,13 @@ public interface IDsTaskingService extends BaseService<DsTaskingEntity> {
 	 * @return
 	 */
 	boolean syncPart( String startTime, String endTime,String partCode);
+
+	/**
+	 * 根据零件号 查询任务
+	 * @param partCode
+	 * @param taskStatus
+	 * @param taskType
+	 * @return
+	 */
+	List<DsTaskingEntity> selectTaskingByPartCode(String partCode, Integer taskStatus, String taskType);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
index 1ff4bc2e..92545668 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
@@ -971,6 +971,11 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 	 * 创建维护任务
 	 */
 	private void createMaintainTask(DsPartEntity partEntity, DsPartVersionEntity partVersionEntity) {
+		//查询是否有无工艺任务
+		List<DsTaskingEntity> taskingEntityList = taskingService.selectTaskingByPartCode(partEntity.getPartCode(),TaskingConstant.TASK_STATUS_WAIT,TaskingConstant.INSPECTION_TIMEOUT);
+		if(!CollectionUtils.isEmpty(taskingEntityList)){
+			return;
+		}
 		DsTaskingEntity dsTaskingEntity = new DsTaskingEntity();
 		dsTaskingEntity.setPartCode(partEntity.getPartCode());
 		dsTaskingEntity.setPartName(partEntity.getPartName());
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 fb391775..de1844fb 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
@@ -1738,6 +1738,11 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 		return true;
 	}
 
+	@Override
+	public List<DsTaskingEntity> selectTaskingByPartCode(String partCode, Integer taskStatus, String taskType) {
+		return taskingMapper.selectTaskingByPartCode(partCode,taskStatus,taskType);
+	}
+
 	/**
 	 * 单个任务独立事务处理
 	 */
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
index 49caacd8..f1947fef 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java
@@ -82,6 +82,21 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 				item.setProcessCode(processSet.getCode());
 				item.setProcessName(processSet.getName());
 			}
+			if(item.getIsOutsource()){
+				if(null != item.getOcId()){
+					Oem oem = oemService.getById(item.getOcId());
+					if(null != oem){
+						item.setWorkCenterName(oem.getOcName());
+					}
+				}
+			}else {
+				if(null != item.getWorkCenterId()){
+					WorkCenter workCenter = workCenterService.getById(item.getWorkCenterId());
+					if(null != workCenter){
+						item.setWorkCenterName(workCenter.getWcName());
+					}
+				}
+			}
 		});
 		return craftList;
 	}