From dbcc9f8992c97b84aa6ae0a381c807ba6239ae2c Mon Sep 17 00:00:00 2001 From: huangjiayang <5265313@qq.com> Date: 星期四, 15 五月 2025 16:47:08 +0800 Subject: [PATCH] 【UPDATE】刷新BOM、库存、工艺路线数据缓存接口增加刷新钣金子单数据 --- aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java index 5ebab9c..46e4606 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java @@ -1,8 +1,20 @@ package com.aps.core.service.impl; +import java.math.BigDecimal; import java.util.List; +import java.util.Optional; + +import cn.hutool.core.util.IdUtil; import com.aps.common.core.utils.DateUtils; +import com.aps.common.security.utils.SecurityUtils; +import com.aps.core.domain.ApsPlateStandardRequire; +import com.aps.core.domain.ApsPlateStandardRequireError; +import com.aps.core.domain.ApsStandardProcessRouteHeader; +import com.aps.core.mapper.ApsPlateStandardRequireErrorMapper; +import com.aps.core.mapper.ApsStandardProcessRouteHeaderMapper; +import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import com.aps.core.mapper.ApsStandardProcessRouteLineMapper; import com.aps.core.domain.ApsStandardProcessRouteLine; @@ -19,6 +31,12 @@ { @Autowired private ApsStandardProcessRouteLineMapper apsStandardProcessRouteLineMapper; + @Resource + ApsStandardProcessRouteHeaderMapper standardProcessRouteHeaderMapper; + @Resource + ApsPlateStandardRequireErrorMapper requireErrorMapper; + @Resource + private RedisTemplate redisTemplate; /** * 鏌ヨ鏍囧噯宸ヨ壓璺嚎Line @@ -93,4 +111,101 @@ { return apsStandardProcessRouteLineMapper.deleteApsStandardProcessRouteLineById(id); } + /** + * 鏍规嵁鏂欏彿 鏌ヨ宸ヨ壓璺嚎 鍙婂叾涓嬬殑宸ュ簭锛岃绠楀伐鑹鸿矾绾挎�诲伐鏃� + * @param require 闇�姹備俊鎭� + * @return 宸ヨ壓璺嚎鎬诲伐鏃� + */ + @Override + public ApsStandardProcessRouteLine getRouteLineTotalTime(ApsPlateStandardRequire require) { + // 鍒濆鍖栨�诲伐鏃朵负0 + BigDecimal totalRouteTime = BigDecimal.ZERO; + //宸ュ巶 + String plant=require.getOrgCode(); + // 鐗╂枡鍙� + String itemNumber=require.getBomLineCode(); + long routId=0L; + ApsStandardProcessRouteLine ret=new ApsStandardProcessRouteLine(); + ret.setRouteId(String.valueOf(routId)); + ret.setRouteTime(BigDecimal.ZERO); + // 鏌ヨ鏍囧噯宸ヨ壓璺嚎澶撮儴淇℃伅 + Optional<ApsStandardProcessRouteHeader> firstProcessRoute = standardProcessRouteHeaderMapper.queryStandardProcessRouteHeaderByPlantAndItemCode(plant, itemNumber).stream().findFirst(); + if (firstProcessRoute.isPresent()) { + ApsStandardProcessRouteHeader routeHeader = firstProcessRoute.get(); + // 鏋勫缓宸ヨ壓璺嚎琛屽弬鏁板璞� + ApsStandardProcessRouteLine routeLineParam =new ApsStandardProcessRouteLine(); + routeLineParam.setRouteId(routeHeader.getRouteId()); + // 鏌ヨ鏍囧噯宸ヨ壓璺嚎琛屼俊鎭� + BigDecimal standardTime = apsStandardProcessRouteLineMapper.selectTotalStandTime(routeHeader.getRouteId()).getStandardTime(); + totalRouteTime =standardTime.multiply(require.getNetRequirement()); + ret.setRouteTime(totalRouteTime); + ret.setRouteId(routeHeader.getRouteId()); + }else { + saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�"); + } + // 杩斿洖鎬诲伐鏃� + return ret; + } + @Override + public ApsStandardProcessRouteLine getRouteHeaderRouteTime(ApsPlateStandardRequire require){ + + //宸ュ巶 + String plant=require.getOrgCode(); + // 鐗╂枡鍙� + String itemCode=require.getBomLineCode(); + // 鍑�闇�姹� + BigDecimal netRequirement= require.getNetRequirement(); + //鏋勫缓Redis Key + String key = "ROUTE:ROUTE_"+plant+"_"+itemCode; + + BigDecimal totalRouteTime = BigDecimal.ZERO; + ApsStandardProcessRouteLine ret=new ApsStandardProcessRouteLine(); + ret.setRouteId("0"); + ret.setRouteTime(totalRouteTime); + + Object routeHeaderObj = redisTemplate.opsForValue().get(key); + if (routeHeaderObj != null) { + totalRouteTime = (BigDecimal) routeHeaderObj; + ret.setRouteId("0"); + ret.setRouteTime(totalRouteTime.multiply(netRequirement)); + return ret; + } else { + saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�"); + /*// 鏌ヨ鏍囧噯宸ヨ壓璺嚎澶撮儴淇℃伅 + Optional<ApsStandardProcessRouteHeader> firstProcessRoute = standardProcessRouteHeaderMapper.queryStandardProcessRouteHeaderByPlantAndItemCode(plant, itemCode).stream().findFirst(); + if (firstProcessRoute.isPresent()) { + ApsStandardProcessRouteHeader routeHeader = firstProcessRoute.get(); + // 鏋勫缓宸ヨ壓璺嚎琛屽弬鏁板璞� + ApsStandardProcessRouteLine routeLineParam =new ApsStandardProcessRouteLine(); + routeLineParam.setRouteId(routeHeader.getRouteId()); + // 鏌ヨ鏍囧噯宸ヨ壓璺嚎琛屼俊鎭� + BigDecimal standardTime = apsStandardProcessRouteLineMapper.selectTotalStandTime(routeHeader.getRouteId()).getStandardTime(); + totalRouteTime =standardTime.multiply(netRequirement); + // 璁$畻杩斿洖鐨勬暟鎹� + ret.setRouteTime(totalRouteTime); + ret.setRouteId(routeHeader.getRouteId()); + *//*瀛樺偍鑷砇edis*//* + redisTemplate.opsForValue().set(key, standardTime); + }else { + saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�"); + }*/ + return ret; + } + } + + private void saveRequireError(ApsPlateStandardRequire require,String message) { + ApsPlateStandardRequireError data = ApsPlateStandardRequireError.builder() + .id(IdUtil.getSnowflakeNextId()) + .requireId(require.getId()) + .batchNumber(require.getBatchNumber()) + .docNum(require.getDocNum()) + .itemNum(require.getBomLineCode()) + .orgCode(require.getOrgCode()) + .message(message) + .delFlag("0") + .build(); + data.setCreateBy(SecurityUtils.getUsername()); + data.setCreateTime(DateUtils.getNowDate()); + requireErrorMapper.insertApsPlateStandardRequireError(data); + } } -- Gitblit v1.9.3