From b3ed5823f971c04e5f814711a49c9baf7cdf54b9 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 14:59:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
index 36c0220..0b9717b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java
@@ -139,9 +139,10 @@
ApsBom apsBom = jsonArray.getJSONObject(i).to(ApsBom.class);
bomLineList.add(apsBom);
}
- }else {
- bomLineList = selectApsBomLineList(plant, itemNumber);
}
+// else {
+// bomLineList = selectApsBomLineList(plant, itemNumber);
+// }
return bomLineList;
}
--
Gitblit v1.9.3