From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 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..0185f67 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,21 @@
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.ApsPlate.ApsPlateStandardRequire;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireError;
+import com.aps.core.domain.ApsStandardProcessRouteHeader;
+import com.aps.core.mapper.ApsPlateStandardRequireErrorMapper;
+import com.aps.core.mapper.ApsStandardProcessRouteHeaderMapper;
+import com.aps.core.service.ApsPlate.IApsPlateStandardRequireErrorService;
+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 +32,12 @@
{
@Autowired
private ApsStandardProcessRouteLineMapper apsStandardProcessRouteLineMapper;
+ @Resource
+ ApsStandardProcessRouteHeaderMapper standardProcessRouteHeaderMapper;
+ @Resource
+ IApsPlateStandardRequireErrorService requireErrorService;
+ @Resource
+ private RedisTemplate redisTemplate;
/**
* 鏌ヨ鏍囧噯宸ヨ壓璺嚎Line
@@ -93,4 +112,86 @@
{
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 {
+ requireErrorService.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 {
+ requireErrorService.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;
+ }
+ }
+
}
--
Gitblit v1.9.3