Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-15 9ac7ab32831d84d071ec349dc47f6350d0f49259

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java

@@ -1,9 +1,5 @@
package com.aps.core.service.impl;

import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.aps.common.core.utils.DateUtils;
@@ -15,10 +11,8 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.math.BigDecimal;
import java.util.*;

/**
 * 物料库存管理Service业务层处理
@@ -156,6 +150,10 @@
    @Override
    public boolean setStorageDataToRedis(String orgCode) {
        try {
            Set<String> keys = redisTemplate.keys("MaterialStorage:Material_*");
            if (keys != null && !keys.isEmpty()) {
                redisTemplate.delete(keys);
            }
            ApsMaterialStorageManagement temp = new ApsMaterialStorageManagement();
            if(!StringUtils.isEmpty(orgCode)){
                temp.setApplicableFactories(orgCode);