From f6f57c7c14c43c7b0b660790e84a8797be96d871 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 13:49:05 +0800
Subject: [PATCH] art: 物料拉动 物料选择问题
---
src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java | 8 ++++++++
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java | 7 ++++++-
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml | 5 +++++
3 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java b/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java
index 319825a..c57da93 100644
--- a/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java
+++ b/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java
@@ -24,4 +24,12 @@
* @return
*/
List<PmsProcessBillMaterialsDetail> queryByMaterialNumber(String materialNumber);
+
+ /**
+ * 鐗╂枡鎷夊姩閫夋嫨鐗╂枡浣跨敤
+ * 鏍规嵁鐑鐞嗘瘺鍧墿鏂欐煡璇�
+ * @param materialNumber 鐑鐞嗙墿鏂欑紪鐮�
+ * @return
+ */
+ List<PmsProcessBillMaterialsDetail> queryByMaterialNumberOnly(String materialNumber);
}
diff --git a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml
index c569fbd..da3039d 100644
--- a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml
+++ b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml
@@ -23,4 +23,9 @@
and t1.material_id = t2.id)
</select>
+ <select id="queryByMaterialNumberOnly" resultType="org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail">
+ select DISTINCT t1.material_number, t1.material_name, t1.production_unit
+ from pms_process_bill_materials_detail t1
+ where t1.material_number = #{materialNumber}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
index feec4a1..56b34a8 100644
--- a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
@@ -54,6 +54,11 @@
if (StringUtils.isBlank(materialNumber)) {
return Collections.emptyList();
}
- return this.getBaseMapper().queryByMaterialNumber(materialNumber);
+ List<PmsProcessBillMaterialsDetail> list = this.getBaseMapper().queryByMaterialNumber(materialNumber);
+ if (CollectionUtil.isEmpty(list)) {
+ //濡傛灉鏄儹澶勭悊锛屽垯浠ｈ〃閫夋嫨鎺掍骇宸ュ崟鐢熶骇鐨勬瘺鍧�
+ return this.getBaseMapper().queryByMaterialNumberOnly(materialNumber);
+ }
+ return list;
}
}
--
Gitblit v1.9.3