From aa527f732cff65689e82b660389be4ece3825ae3 Mon Sep 17 00:00:00 2001 From: huangjiayang <5265313@qq.com> Date: 星期五, 09 五月 2025 18:00:15 +0800 Subject: [PATCH] 【UPDATE】1.新增同步标准工艺路线定时任务代码 2.从redis中获取BOM数据 3.将工艺路线数据存入redis中 4.从redis中获取工艺路线数据 --- aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 40 insertions(+), 12 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..0cd9e52 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,19 @@ package com.aps.core.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.aps.common.core.utils.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.aps.core.mapper.ApsBomMapper; 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 java.util.ArrayList; +import java.util.List; +import java.util.Optional; /** * BOM鏁版嵁绠$悊Service涓氬姟灞傚鐞� @@ -23,6 +26,12 @@ { @Autowired private ApsBomMapper apsBomMapper; + + @Resource + private ApsBomHeaderMapper bomHeaderMapper; + + @Autowired + public RedisTemplate redisTemplate; /** * 鏌ヨBOM鏁版嵁绠$悊 @@ -97,10 +106,29 @@ @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); + } +// JSONArray jsonArray = (JSONArray)redisTemplate.opsForValue().get("BOM:BOM_"+plant+"_"+itemNumber); +// for (int i = 0; i < jsonArray.size(); i++){ +// ApsBom apsBom = jsonArray.getJSONObject(i).to(ApsBom.class); +// bomLineList.add(apsBom); +// } + return bomLineList; + } } -- Gitblit v1.9.3