From 51aeb12b0bd3030931b22c666b9c83e7ee51c800 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 17:18:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 6036b4f..03f6973 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
@@ -1,11 +1,11 @@
package com.aps.core.service.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import com.aps.common.core.utils.DateUtils;
+import com.aps.core.domain.ApsBomHeader;
+import com.aps.core.mapper.ApsBomHeaderMapper;
+import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsBomMapper;
@@ -24,6 +24,8 @@
@Autowired
private ApsBomMapper apsBomMapper;
+ @Resource
+ private ApsBomHeaderMapper bomHeaderMapper;
/**
* 鏌ヨBOM鏁版嵁绠＄悊
*
@@ -97,10 +99,24 @@
@Override
public List<ApsBom> selectApsBomList(ApsBom apsBom)
{
-
return apsBomMapper.selectApsBomList(apsBom);
-
}
-
-
+ /**
+ * 閫氳繃鏂欏彿銆佸伐鍘傛煡璇OMLine鏁版嵁鍒楄〃
+ * */
+ @Override
+ public List<ApsBom> selectApsBomLineList(String plant, String itemNumber)
+ {
+ List<ApsBom> bomLineList =new ArrayList<>();
+ ApsBomHeader headerParam = ApsBomHeader.builder().itemCode(itemNumber).orgCode(plant).build();
+ Optional<ApsBomHeader> first = bomHeaderMapper.selectApsBomHeaderList(headerParam).stream().findFirst();
+ if (first.isPresent()){
+ ApsBomHeader apsBomHeader = first.get();
+ ApsBom build = new ApsBom();
+ build.setBomHeaderId(apsBomHeader.getBomHeaderId());
+ build.setOrgCode(apsBomHeader.getOrgCode());
+ bomLineList = apsBomMapper.selectApsBomList(build);
+ }
+ return bomLineList;
+ }
}
--
Gitblit v1.9.3