From 7cd52b112a2e7da06aa8cfebf19a337be858762f Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期五, 16 五月 2025 11:32:39 +0800
Subject: [PATCH] 查询气体管路产能规划列表补充“OrgCode”字段值
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 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 0acb385..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
@@ -1,16 +1,20 @@
package com.aps.core.service.impl;
-import java.util.*;
-
+import com.alibaba.fastjson2.JSONArray;
import com.aps.common.core.utils.DateUtils;
+import com.aps.core.domain.ApsBom;
import com.aps.core.domain.ApsBomHeader;
import com.aps.core.mapper.ApsBomHeaderMapper;
+import com.aps.core.mapper.ApsBomMapper;
+import com.aps.core.service.IApsBomService;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
-import com.aps.core.mapper.ApsBomMapper;
-import com.aps.core.domain.ApsBom;
-import com.aps.core.service.IApsBomService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
/**
* BOM鏁版嵁绠＄悊Service涓氬姟灞傚鐞�
@@ -26,6 +30,10 @@
@Resource
private ApsBomHeaderMapper bomHeaderMapper;
+
+ @Autowired
+ public RedisTemplate redisTemplate;
+
/**
* 鏌ヨBOM鏁版嵁绠＄悊
*
@@ -112,8 +120,30 @@
Optional<ApsBomHeader> first = bomHeaderMapper.selectApsBomHeaderList(headerParam).stream().findFirst();
if (first.isPresent()){
ApsBomHeader apsBomHeader = first.get();
- bomLineList = apsBomMapper.selectApsBomLineList(plant, apsBomHeader.getBomHeaderId());
+ ApsBom build = new ApsBom();
+ build.setBomHeaderId(apsBomHeader.getBomHeaderId());
+ build.setOrgCode(apsBomHeader.getOrgCode());
+ bomLineList = apsBomMapper.selectApsBomList(build);
}
+
+ return bomLineList;
+ }
+
+ @Override
+ public List<ApsBom> selectRdsBomLineList(String plant, String itemNumber)
+ {
+ List<ApsBom> bomLineList =new ArrayList<>();
+ JSONArray jsonArray = (JSONArray)redisTemplate.opsForValue().get("BOM:BOM_"+plant+"_"+itemNumber);
+ if (jsonArray != null && !jsonArray.isEmpty()) {
+ for (int i = 0; i < jsonArray.size(); i++){
+ ApsBom apsBom = jsonArray.getJSONObject(i).to(ApsBom.class);
+ bomLineList.add(apsBom);
+ }
+ }
+// else {
+// bomLineList = selectApsBomLineList(plant, itemNumber);
+// }
+
return bomLineList;
}
}
--
Gitblit v1.9.3