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

zhanghl

2025-05-15 9ac7ab32831d84d071ec349dc47f6350d0f49259

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

 aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java

@@ -3,10 +3,7 @@
import com.aps.common.core.domain.R;
import com.aps.common.core.utils.file.FileUtils;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.core.service.IApsBomHeaderService;
import com.aps.core.service.IApsMaterialStorageManagementService;
import com.aps.core.service.IApsStandardProcessRouteHeaderService;
import com.aps.core.service.ICoreService;
import com.aps.core.service.*;
import com.aps.system.api.domain.SysFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,6 +33,9 @@

    @Autowired
    private IApsMaterialStorageManagementService apsMaterialStorageManagementService;

    @Autowired
    private IApsPlatePlanService apsPlatePlanService;

    /**
     * 文件上传请求
@@ -71,10 +71,11 @@
            apsBomHeaderService.setBomDataToRedis(orgCode);
            apsStandardProcessRouteHeaderService.setProcessRouteDataToRedis(orgCode);
            apsMaterialStorageManagementService.setStorageDataToRedis(orgCode);
            apsPlatePlanService.setSubPlansToRedis();
            return AjaxResult.success();
        }catch (Exception e){
            e.printStackTrace();
            return AjaxResult.error(e.getMessage());
        }
        return AjaxResult.success();
    }
}

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

@@ -13,6 +13,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

/**
@@ -111,6 +112,10 @@
    @Override
    public boolean setBomDataToRedis(String orgCode) {
        try {
            Set<String> keys = redisTemplate.keys("BOM:BOM_*");
            if (keys != null && !keys.isEmpty()) {
                redisTemplate.delete(keys);
            }
            List<ApsBom> bomRedisData = apsBomHeaderMapper.selectBomRedisData(orgCode);
            Map<String, List<ApsBom>> groupedByMainItemCode = bomRedisData.stream().collect(Collectors.groupingBy(ApsBom::getMainItemCode));
            Map<String, Object> bulkData = new HashMap<>();

 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);

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

@@ -12,6 +12,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
 * 标准工艺路线HeaderService业务层处理
@@ -105,6 +106,10 @@
    @Override
    public boolean setProcessRouteDataToRedis(String orgCode) {
        try {
            Set<String> keys = redisTemplate.keys("ROUTE:ROUTE_*");
            if (keys != null && !keys.isEmpty()) {
                redisTemplate.delete(keys);
            }
            List<JSONObject> res = apsStandardProcessRouteHeaderMapper.selectProcessRouteStandardTimeData(orgCode);
            Map<String, Object> bulkData = new HashMap<>();
            for (JSONObject jsonObject : res) {