From 50cf972c100b28e368590b07c33e5f78c20475d0 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 23 五月 2025 16:17:55 +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 | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 0cd9e52..bd7b3c8 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,5 +1,6 @@
package com.aps.core.service.impl;
+import com.alibaba.fastjson2.JSONArray;
import com.aps.common.core.utils.DateUtils;
import com.aps.core.domain.ApsBom;
import com.aps.core.domain.ApsBomHeader;
@@ -124,11 +125,21 @@
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;
+ }
+
+ @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);
+ }
+ }
return bomLineList;
}
}
--
Gitblit v1.9.3