From e6ebaf71bd67866d6233a03ae6eff4a7fb2e5d67 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 11:40:27 +0800
Subject: [PATCH] 钣金工单计划：优化子件工单的读取方式 先存储内存，再从内存扣减，最后一起保存
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 7 ++++---
aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml | 4 +---
2 files changed, 5 insertions(+), 6 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 f3dfd22..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
@@ -170,7 +170,8 @@
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();
@@ -183,11 +184,11 @@
// 璁＄畻杩斿洖鐨勬暟鎹�
ret.setRouteTime(totalRouteTime);
ret.setRouteId(routeHeader.getRouteId());
- /*瀛樺偍鑷砇edis*/
+ *//*瀛樺偍鑷砇edis*//*
redisTemplate.opsForValue().set(key, standardTime);
}else {
saveRequireError(require,"鏍囧噯宸ヨ壓璺嚎涓嶅瓨鍦�");
- }
+ }*/
return ret;
}
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
index 4246e11..8ca8ab2 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsStandardProcessRouteHeaderMapper.xml
@@ -107,11 +107,9 @@
<select id="queryStandardProcessRouteHeaderByPlantAndItemCode" parameterType="String" resultMap="ApsStandardProcessRouteHeaderResult">
<include refid="selectApsStandardProcessRouteHeaderVo"/>
- <where>
+ where del_flag = '0'
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
<if test="itemCode != null and itemCode != ''"> and item_code = #{itemCode} </if>
- and del_flag = '0'
- </where>
</select>
<select id="selectProcessRouteStandardTimeData" parameterType="String" resultType="com.alibaba.fastjson2.JSONObject">
--
Gitblit v1.9.3