From af0f58e4b39a363b73587fa1b4cce7be46e203f5 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 12 九月 2025 15:07:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
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