From e4efff6637f4d598a7efdfca8b62fbb4c3286b02 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 15:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 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 b9b2ac3..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
@@ -12,6 +12,7 @@
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;
@@ -34,7 +35,7 @@
@Resource
ApsStandardProcessRouteHeaderMapper standardProcessRouteHeaderMapper;
@Resource
- ApsPlateStandardRequireErrorMapper requireErrorMapper;
+ IApsPlateStandardRequireErrorService requireErrorService;
@Resource
private RedisTemplate redisTemplate;
@@ -141,7 +142,7 @@
ret.setRouteTime(totalRouteTime);
ret.setRouteId(routeHeader.getRouteId());
}else {
- saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�");
+ requireErrorService.saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�");
}
// 杩斿洖鎬诲伐鏃�
return ret;
@@ -170,7 +171,7 @@
ret.setRouteTime(totalRouteTime.multiply(netRequirement));
return ret;
} else {
- saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�");
+ requireErrorService.saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�");
/*// 鏌ヨ鏍囧噯宸ヨ壓璺嚎澶撮儴淇℃伅
Optional<ApsStandardProcessRouteHeader> firstProcessRoute = standardProcessRouteHeaderMapper.queryStandardProcessRouteHeaderByPlantAndItemCode(plant, itemCode).stream().findFirst();
if (firstProcessRoute.isPresent()) {
@@ -193,19 +194,4 @@
}
}
- 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