+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.dashboard.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.desk.dashboard.pojo.entity.DsCraftTurnRecordEntity;
+
+import java.util.List;
+
+/**
+ * 工艺能力表 服务类
+ *
+ * @author BladeX
+ * @since 2025-11-12
+ */
+public interface IDsCraftTurnRecordService extends BaseService {
+
+ /**
+ * 根据流程卡号查询
+ * @param cardNo
+ * @return
+ */
+ List selectByCardNo(String cardNo);
+}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java
index fcef17b8f..91c0a231c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java
@@ -265,7 +265,7 @@ public class DsCraftServiceImpl extends BaseServiceImpl
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.dashboard.service.impl;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.desk.dashboard.mapper.DsCraftTurnRecordMapper;
+import org.springblade.desk.dashboard.pojo.entity.DsCraftTurnRecordEntity;
+import org.springblade.desk.dashboard.service.IDsCraftTurnRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 工艺能力表 服务实现类
+ *
+ * @author BladeX
+ * @since 2025-11-12
+ */
+@Service
+public class DsCraftTurnRecordServiceImpl extends BaseServiceImpl implements IDsCraftTurnRecordService {
+
+ @Autowired
+ DsCraftTurnRecordMapper craftTurnRecordMapper;
+
+ @Override
+ public List selectByCardNo(String cardNo) {
+ return craftTurnRecordMapper.selectByCardNo(cardNo);
+ }
+}
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 b6d023248..3da8f4ae7 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
@@ -128,6 +128,9 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsPartPage(IPage page, DsPartVO dsPart) {
@@ -764,6 +767,19 @@ public class DsPartServiceImpl extends BaseServiceImpl craftTurnRecordList = craftTurnRecordService.selectByCardNo(cardNo);
+ if(!CollectionUtils.isEmpty(craftTurnRecordList)){
+ //标记工艺为工装编制工艺
+ List craftList = craftService.listByPartId(partEntity.getId());
+ for (DsCraftEntity craft : craftList) {
+ craft.setIsCraftTurnRecord(1);
+ }
+ craftService.updateBatchById(craftList);
+
+ newTask.setCardNo(cardNo);
+ }
+
boolean taskingSave = taskingService.save(newTask);
if (!taskingSave) {
log.error("创建维护任务失败，零件编码：{}", partEntity.getPartCode());
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java
index 1719770aa..43d6af477 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java
@@ -77,7 +77,11 @@ public class OrderClient implements IOrderClient {
@Override
public void dataVerify() {
- List list = orderService.list(Wrappers.lambdaQuery().in(YieldOrder::getValidationResult,16001,16003));
+ List list = orderService.list(Wrappers.lambdaQuery()
+ .in(YieldOrder::getValidationResult, 16001, 16003)
+ .orderByAsc(YieldOrder::getPartCode)
+ .orderByAsc(YieldOrder::getCardNo)
+ );
if(CollectionUtils.isNotEmpty(list)){
List idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList());
log.info("定时任务合规性校验：{}",idList);