From a5c145b5b9afb665d3130bbcf8659ee1a4b15ebf Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 16 五月 2025 13:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
index 7075ca3..51e6618 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -243,13 +243,11 @@
}
public List<ApsPlatePlan> getSubPlansFromRedis(String itemNumber) {
- List<ApsPlatePlan> subPlans;
+ List<ApsPlatePlan> subPlans=new ArrayList<>();
JSONArray jsonArray =(JSONArray) redisTemplate.opsForValue().get("PLATE_SUB_PLAN:" + itemNumber);
if (jsonArray != null && !jsonArray.isEmpty()) {
subPlans = jsonArray.stream().map(obj -> JSONObject.parseObject(String.valueOf(obj), ApsPlatePlan.class)).toList();
subPlans.forEach(subPlan -> subPlan.setVersion(0));
- }else {
- subPlans = apsPlatePlanMapper.selectUnMatchPlateSubPlanList("FORTUNA", itemNumber);
}
return subPlans;
}
--
Gitblit v1.9.3