Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-14 313a6b128a78173c1c1ae1791abf2aa60284e664

 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;
    }