From 0b028879421f1028407bfccd10f91af1b8d4876a Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Fri, 30 May 2025 13:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E8=8E=B7=E5=8F=96=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC=20=20=E6=A0=B9=E6=8D=AE=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E4=BA=BA=E5=91=98=E8=8E=B7=E5=8F=96=20=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E6=A0=B9=E6=8D=AE=E5=85=A8=E5=B1=80=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/QuoteDetailBomTreeServiceImpl.java   | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
index 7f540bad..1c5fa492 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java
@@ -1,6 +1,7 @@
 package com.spring.modules.quote.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.spring.ifs.api.IfsServer;
 import com.spring.ifs.bean.BaseSearchBean;
@@ -9,6 +10,7 @@ import com.spring.modules.part.vo.InventoryPartUnitCostSumVo;
 import com.spring.modules.quote.entity.*;
 import com.spring.modules.quote.mapper.QuoteDetailBomTreeMapper;
 import com.spring.modules.quote.service.*;
+import com.spring.modules.sys.dao.SysUserDao;
 import com.spring.modules.sys.entity.SysUserEntity;
 import com.spring.modules.sys.service.SysUserService;
 import ifs.fnd.ap.Server;
@@ -38,6 +40,10 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
     private QuoteDetailToolService quoteDetailToolService;
     @Autowired
     private BaseSearchBean baseSearchBean;
+    @Autowired
+    private SysUserDao  sysUserDao;
+    @Autowired
+    private IfsServer ifsServer;
 
     private Server server = null;
 
@@ -50,6 +56,17 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
     @Override
     @Transactional
     public long initQuoteDetailBomTree(QuoteDetail detail, Long parentId, Integer level) {
+        //获取当前用户的ifs账号和连接 LR 2025-05-30 Start
+        //获取当前操作的账号
+        String username = ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername();
+
+        SysUserEntity ifsUser = sysUserDao.selectOne(new QueryWrapper<SysUserEntity>().eq("username", username));
+        if (ifsUser == null || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsUsername()) || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsPassword())) {
+            throw new RuntimeException("请维护IFS账号和密码!");
+        }
+        Server ifsCon = ifsServer.getIfsServer(ifsUser.getIfsUsername(), ifsUser.getIfsPassword());
+        //获取当前用户的ifs账号和连接 LR 2025-05-30 End
+
         // 1、通过PartNo、Site和BuNo 查询BOM信息 失效日期日期为空 替代为* 和Routing (存在BOM的物料)
         if (parentId.equals(0L)){
             detail.setBomType("Manufacturing");
@@ -109,7 +126,8 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl<QuoteDetailBomTre
                 component.setBomFlag("N");
             }
             if ("Y".equals(component.getStatus())) {
-                getFinalPartCost(component,server);
+                //getFinalPartCost(component, server); // 获取最终的物料的成本 使用当前用的
+                getFinalPartCost(component, ifsCon);
             }
             //新增子物料信息
             component.setTreeId(bom.getId());