From b31810d67d517b42c9f335d88affe0e9cc074ad7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 16:44:51 +0800
Subject: [PATCH] fix(mes): 出货检验质检方案为空，未绑定模板时按产品类别兜底
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java
index 712c693..df97f0b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateItemServiceImpl.java
@@ -146,13 +146,22 @@
if (resolvedItemId == null) {
return Collections.emptyList();
}
- // 2. mes_md_item.id 杞� mdm_item.id锛堜骇鍝佸叧鑱旇〃瀛樼殑鏄� mdm 鐗╂枡锛�
+ // 2. 瑙ｆ瀽鎴� mdm_item.id锛堜骇鍝佸叧鑱旇〃瀛樼殑鏄� mdm 鐗╂枡锛�
+ // - 鐢熶骇浠诲姟/宸ュ崟甯﹀嚭鐨勪骇鍝佺紪鍙蜂竴瀹氭槸 mes_md_item.id锛岄渶瑕佽浆鎹紱
+ // - 鍓嶇鐩存帴閫夌殑鐗╂枡锛堝嚭璐ф楠�/閫�璐ф楠岀敤 MdmItemSelect锛夋湰韬氨鏄� mdm_item.id锛�
+ // mes_md_item 鏌ヤ笉鍒帮紙鎴栧凡鍒犻櫎锛夋椂鎸� mdm_item.id 鐩存帴鍖归厤锛屽惁鍒欒繖浜涘崟鎹案杩滃尮閰嶄笉鍒版柟妗�
+ Long mdmItemId = null;
MesMdItemDO item = mesMdItemService.getItem(resolvedItemId);
- if (item == null || item.getMdmItemId() == null) {
+ if (item != null && item.getMdmItemId() != null) {
+ mdmItemId = item.getMdmItemId();
+ } else if (taskId == null && workOrderId == null) {
+ mdmItemId = resolvedItemId;
+ }
+ if (mdmItemId == null) {
return Collections.emptyList();
}
// 3. 鏌ュ嚭璇ョ墿鏂欏叧鑱旂殑鎵�鏈変骇鍝佸叧鑱�
- List<MesQcTemplateItemDO> templateItems = templateItemMapper.selectListByItemId(item.getMdmItemId());
+ List<MesQcTemplateItemDO> templateItems = templateItemMapper.selectListByItemId(mdmItemId);
if (CollUtil.isEmpty(templateItems)) {
return Collections.emptyList();
}
--
Gitblit v1.9.3