From b0858cfb5addf0adfbb618c671334878e0d17780 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 14 五月 2025 17:22:47 +0800
Subject: [PATCH] 钣金工单计划：从redis读取库存，在本地计算版本，批量更新库存数据
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsAbnormalProcessAnalysisMapper.xml | 10 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 76 +++++++++++--------------
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java | 2
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml | 10 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java | 8 +-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java | 29 +++------
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml | 8 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialStorageManagementService.java | 2
9 files changed, 65 insertions(+), 82 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
index 50a10ef..624d390 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -58,7 +58,7 @@
/** 鎬绘暟閲� */
@Excel(name = "鎬绘暟閲�")
- private BigDecimal total_num;
+ private BigDecimal totalNum;
/** 鍑嗗宸ユ椂 */
@Excel(name = "鍑嗗宸ユ椂")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialStorageManagementService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialStorageManagementService.java
index 53e8c91..039fd83 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialStorageManagementService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialStorageManagementService.java
@@ -66,7 +66,7 @@
Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber);
- ApsMaterialStorageManagement getRdsStorage(String plant, String itemCode);
+ Optional<ApsMaterialStorageManagement> getRdsStorage(String plant, String itemCode);
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java
index 79015ad..33ffb72 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java
@@ -129,30 +129,23 @@
* @return ApsMaterialStorageManagement 杩斿洖鑾峰彇鍒扮殑搴撳瓨淇℃伅瀵硅薄锛屽鏋滄病鏈夋壘鍒帮紝鍒欒繑鍥瀗ull
*/
@Override
- public ApsMaterialStorageManagement getRdsStorage(String plant, String itemCode){
- ApsMaterialStorageManagement ams=null;
+ public Optional<ApsMaterialStorageManagement> getRdsStorage(String plant, String itemCode){
// 灏濊瘯浠嶳edis涓幏鍙栧簱瀛樹俊鎭�
- JSONObject materialStorage = (JSONObject)redisTemplate.opsForValue().get("MaterialStorage:Material_"+plant+"_"+itemCode);
+ String key = "MaterialStorage:Material_" + plant + "_" + itemCode;
+ JSONObject materialStorage = (JSONObject)redisTemplate.opsForValue().get(key);
if(materialStorage!=null){
// 濡傛灉Redis涓湁缂撳瓨锛屽皢鍏惰浆鎹负ApsMaterialStorageManagement瀵硅薄骞惰繑鍥�
- ams = materialStorage.toJavaObject(ApsMaterialStorageManagement.class);
- return ams;
+ ApsMaterialStorageManagement ams= materialStorage.toJavaObject(ApsMaterialStorageManagement.class);
+ Optional<ApsMaterialStorageManagement> optional = Optional.ofNullable(ams);
+ return optional ;
}else {
- // 濡傛灉Redis涓病鏈夌紦瀛橈紝鍒涘缓鏌ヨ鍙傛暟瀵硅薄
- ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement();
- storageParam.setItemNumber(itemCode);
- storageParam.setApplicableFactories(plant);
// 浠庢暟鎹簱涓煡璇㈠簱瀛樹俊鎭�
- Optional<ApsMaterialStorageManagement> first = apsMaterialStorageManagementMapper.selectApsMaterialStorageManagementList(storageParam).stream()
- .findFirst();
- if (first.isPresent()){
- // 濡傛灉鏌ヨ鍒板簱瀛樹俊鎭紝灏嗗叾缂撳瓨鍒癛edis涓�
- ams = first.get();
- redisTemplate.opsForValue().set("MaterialStorage:Material_"+plant+"_"+itemCode,JSONObject.parseObject(JSON.toJSONString(ams)));
- }
+ Optional<ApsMaterialStorageManagement> first = getItemStorage( plant, itemCode);
+ first.ifPresent(apsMaterialStorageManagement ->
+ redisTemplate.opsForValue().set(key, JSONObject.parseObject(JSON.toJSONString(apsMaterialStorageManagement)))
+ );
+ return first;
}
- // 杩斿洖搴撳瓨淇℃伅瀵硅薄
- return ams;
}
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
index f360c6f..6294cea 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
@@ -127,7 +127,7 @@
bomOrderDetail.setCreateBy(SecurityUtils.getUsername());
orderDetailsList.add(bomOrderDetail);
- apsPlateStandardRequireBomOrderDetailMapper.insertApsPlateStandardRequireBomOrderDetail(bomOrderDetail);
+ //apsPlateStandardRequireBomOrderDetailMapper.insertApsPlateStandardRequireBomOrderDetail(bomOrderDetail);
}
@Override
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
index 82a379d..3517059 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
@@ -117,7 +117,7 @@
,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList){
- itemStorageMapper.updateMaterialStorageByVersion(itemStorage.getId(), afterStockAmount,itemStorage.getVersion());
+ //itemStorageMapper.updateMaterialStorageByVersion(itemStorage.getId(), afterStockAmount,itemStorage.getVersion());
/*璁板綍鎵ｅ噺鏄庣粏*/
ApsPlateStandardRequireBomStockDetail bomStockDetail = ApsPlateStandardRequireBomStockDetail.builder()
.id(IdUtil.getSnowflakeNextId())
@@ -136,13 +136,13 @@
bomStockDetail.setCreateTime(DateUtils.getNowDate());
stockDetailsList.add(bomStockDetail);
- plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail);
+ // plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail);
/*鏇存柊鍐呭瓨涓墿鏂欏墿浣欏簱瀛�*/
- /*itemStorage.setRemainderStock(afterStockAmount);
+ itemStorage.setRemainderStock(afterStockAmount);
if(null== itemStorage.getVersion()){
itemStorage.setVersion(1);
}else{
itemStorage.setVersion(itemStorage.getVersion()+1);
- }*/
+ }
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index 2ab9146..84995db 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -175,7 +175,7 @@
String batchNum= requireBatchService.getNewBatchNumber();
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType);
- Hashtable<String, BigDecimal> usedStorage = new Hashtable<>();
+ Hashtable<String, ApsMaterialStorageManagement> usedStorage = new Hashtable<>();
log.info("寮�濮嬬敓鎴愰渶姹傦細");
for (ApsPlatePlan mainPlan : mainPlans) {
String itemNumber = mainPlan.getItemNumber();
@@ -200,38 +200,31 @@
apsPlateStandardRequireMapper.batchInsert(batch);
}
}
- log.info("鐢熸垚瀹屾垚");
-// if(!stockDetailsList.isEmpty()){
-// int batchSize = 1000;
-// stockDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
-// for (int i = 0; i < stockDetailsList.size(); i += batchSize) {
-// int end = Math.min(i + batchSize, stockDetailsList.size());
-// List<ApsPlateStandardRequireBomStockDetail> batch = stockDetailsList.subList(i, end);
-// plateBomStockDetailMapper.batchInsert(batch);
-// }
-// }
-//
-// if(!orderDetailsList.isEmpty()){
-// int batchSize = 1000;
-// orderDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
-// for (int i = 0; i < orderDetailsList.size(); i += batchSize) {
-// int end = Math.min(i + batchSize, orderDetailsList.size());
-// List<ApsPlateStandardRequireBomOrderDetail> batch = orderDetailsList.subList(i, end);
-// plateBomOrderDetailMapper.batchInsert(batch);
-// }
-// }
- /*闆嗕腑淇濆瓨搴撳瓨淇℃伅*/
- /* if(!usedStorage.isEmpty()){
- usedStorage.forEach((key, sm) -> {
- storageManagementService.updateRemainderStock(sm.getId(),sm.getRemainderStock(),sm.getVersion());
- });
- }*/
-
+ if(!stockDetailsList.isEmpty()){
+ int batchSize = 1000;
+ stockDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
+ for (int i = 0; i < stockDetailsList.size(); i += batchSize) {
+ int end = Math.min(i + batchSize, stockDetailsList.size());
+ List<ApsPlateStandardRequireBomStockDetail> batch = stockDetailsList.subList(i, end);
+ plateBomStockDetailMapper.batchInsert(batch);
+ }
+ }
+ if(!orderDetailsList.isEmpty()){
+ int batchSize = 1000;
+ orderDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
+ for (int i = 0; i < orderDetailsList.size(); i += batchSize) {
+ int end = Math.min(i + batchSize, orderDetailsList.size());
+ List<ApsPlateStandardRequireBomOrderDetail> batch = orderDetailsList.subList(i, end);
+ plateBomOrderDetailMapper.batchInsert(batch);
+ }
+ }
}
- usedStorage.forEach((key,value)->{
- log.info("鏂欏彿锛�"+key+"锛屽簱瀛橈細"+value);
- });
-
+ /*闆嗕腑淇濆瓨搴撳瓨淇℃伅*/
+ if(!usedStorage.isEmpty()){
+ usedStorage.forEach((key, sm) -> {
+ storageManagementService.updateRemainderStock(sm.getId(),sm.getRemainderStock(),sm.getVersion());
+ });
+ }
}
/**
@@ -255,7 +248,7 @@
List<ApsPlateStandardRequire> allRequires,
Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList,
List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList,
- Hashtable<String, BigDecimal> usedStorage
+ Hashtable<String, ApsMaterialStorageManagement> usedStorage
) {
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
@@ -285,17 +278,14 @@
/*榛樿鍑�闇�姹備负BOM鐢ㄩ噺*/
require.setNetRequirement(require.getRequireAmount());
+
/*璇诲彇搴撳瓨淇℃伅鐨勪紭鍏堢骇-> 鍐呭瓨銆乺edis銆乨b*/
- /* ApsMaterialStorageManagement storage = usedStorage.get(itemCode);
- if(storage==null){
- storage = storageManagementService.getRdsStorage(plant, itemCode);
- if(storage!=null){
- *//*鍓╀綑搴撳瓨*//*
- remainderStock = storage.getRemainderStock();
- }
- }*/
- Optional<ApsMaterialStorageManagement> itemStorageOpt = storageManagementService.getItemStorage(plant, itemCode);
+ Optional<ApsMaterialStorageManagement> itemStorageOpt = Optional.ofNullable(usedStorage.get(itemCode)) ;
+ if(itemStorageOpt.isEmpty()){
+ itemStorageOpt = storageManagementService.getRdsStorage(plant, itemCode);
+ }
if (itemStorageOpt.isPresent()) {
+
ApsMaterialStorageManagement itemStorage=itemStorageOpt.get();
BigDecimal remainderStock =itemStorage.getRemainderStock();
/*璁＄畻鍑�闇�姹� 榛樿=闇�姹傛暟閲�*/
@@ -320,7 +310,7 @@
, afterStockAmount, require.getId(), stockDetailsList
);
/*鏇存柊鍐呭瓨涓殑搴撳瓨浣跨敤淇℃伅*/
- usedStorage.put(itemCode, afterStockAmount);
+ usedStorage.put(itemCode, itemStorage);
}
}
/*鏈尮閰嶆暟閲忥紝榛樿涓哄噣闇�姹�*/
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsAbnormalProcessAnalysisMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsAbnormalProcessAnalysisMapper.xml
index 90511bb..eaeabf2 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsAbnormalProcessAnalysisMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsAbnormalProcessAnalysisMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsAbnormalProcessAnalysisMapper">
- <resultMap type="ApsAbnormalProcessAnalysis" id="ApsAbnormalProcessAnalysisResult">
+ <resultMap type="com.aps.core.domain.ApsAbnormalProcessAnalysis" id="ApsAbnormalProcessAnalysisResult">
<result property="id" column="id" />
<result property="processName" column="process_name" />
<result property="source" column="source" />
@@ -18,7 +18,7 @@
select id, process_name, source, summary, create_time, del_flag, create_by from aps_abnormal_process_analysis
</sql>
- <select id="selectApsAbnormalProcessAnalysisList" parameterType="ApsAbnormalProcessAnalysis" resultMap="ApsAbnormalProcessAnalysisResult">
+ <select id="selectApsAbnormalProcessAnalysisList" parameterType="com.aps.core.domain.ApsAbnormalProcessAnalysis" resultMap="ApsAbnormalProcessAnalysisResult">
<include refid="selectApsAbnormalProcessAnalysisVo"/>
<where>
and del_flag = '0'
@@ -34,7 +34,7 @@
where id = #{id}
</select>
- <insert id="insertApsAbnormalProcessAnalysis" parameterType="ApsAbnormalProcessAnalysis" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertApsAbnormalProcessAnalysis" parameterType="com.aps.core.domain.ApsAbnormalProcessAnalysis" useGeneratedKeys="true" keyProperty="id">
insert into aps_abnormal_process_analysis
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="processName != null">process_name,</if>
@@ -54,7 +54,7 @@
</trim>
</insert>
- <update id="updateApsAbnormalProcessAnalysis" parameterType="ApsAbnormalProcessAnalysis">
+ <update id="updateApsAbnormalProcessAnalysis" parameterType="com.aps.core.domain.ApsAbnormalProcessAnalysis">
update aps_abnormal_process_analysis
<trim prefix="SET" suffixOverrides=",">
<if test="processName != null">process_name = #{processName},</if>
@@ -86,7 +86,7 @@
order by resource_group_name;
</select>
<!--鎵归噺鎻掑叆淇℃伅-->
- <insert id="batchSaveAbnormalInfo" parameterType="ApsAbnormalProcessAnalysis">
+ <insert id="batchSaveAbnormalInfo" parameterType="com.aps.core.domain.ApsAbnormalProcessAnalysis">
insert into aps_abnormal_process_analysis(process_name,source,summary,create_time,del_flag,create_by)
values
<foreach collection="list" item="item" index="index" separator=",">
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
index fe78db3..aaa2a8e 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsBomHeaderMapper">
- <resultMap type="ApsBomHeader" id="ApsBomHeaderResult">
+ <resultMap type="com.aps.core.domain.ApsBomHeader" id="ApsBomHeaderResult">
<result property="id" column="id" />
<result property="bomHeaderId" column="bom_header_id" />
<result property="itemCode" column="item_code" />
@@ -25,7 +25,7 @@
from aps_bom_header
</sql>
- <select id="selectApsBomHeaderList" parameterType="ApsBomHeader" resultMap="ApsBomHeaderResult">
+ <select id="selectApsBomHeaderList" parameterType="com.aps.core.domain.ApsBomHeader" resultMap="ApsBomHeaderResult">
<include refid="selectApsBomHeaderVo"/>
<where>
<if test="bomHeaderId != null and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
@@ -42,7 +42,7 @@
where id = #{id}
</select>
- <insert id="insertApsBomHeader" parameterType="ApsBomHeader">
+ <insert id="insertApsBomHeader" parameterType="com.aps.core.domain.ApsBomHeader">
insert into aps_bom_header
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -74,7 +74,7 @@
</trim>
</insert>
- <update id="updateApsBomHeader" parameterType="ApsBomHeader">
+ <update id="updateApsBomHeader" parameterType="com.aps.core.domain.ApsBomHeader">
update aps_bom_header
<trim prefix="SET" suffixOverrides=",">
<if test="bomHeaderId != null">bom_header_id = #{bomHeaderId},</if>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
index a25b782..2cac72f 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsBomMapper">
- <resultMap type="ApsBom" id="ApsBomResult">
+ <resultMap type="com.aps.core.domain.ApsBom" id="ApsBomResult">
<result property="id" column="id" />
<result property="bomLineId" column="bom_line_id" />
<result property="bomHeaderId" column="bom_header_id" />
@@ -34,7 +34,7 @@
from aps_bom_line
</sql>
- <select id="selectApsBomList" parameterType="ApsBom" resultMap="ApsBomResult">
+ <select id="selectApsBomList" parameterType="com.aps.core.domain.ApsBom" resultMap="ApsBomResult">
<include refid="selectApsBomVo"/>
<where>
<if test="bomLineId != null and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
@@ -55,7 +55,7 @@
where id = #{id}
</select>
- <insert id="insertApsBom" parameterType="ApsBom" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertApsBom" parameterType="com.aps.core.domain.ApsBom" useGeneratedKeys="true" keyProperty="id">
insert into aps_bom_line
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="bomLineId != null">bom_line_id,</if>
@@ -101,7 +101,7 @@
</trim>
</insert>
- <update id="updateApsBom" parameterType="ApsBom">
+ <update id="updateApsBom" parameterType="com.aps.core.domain.ApsBom">
update aps_bom_line
<trim prefix="SET" suffixOverrides=",">
<if test="bomLineId != null">bom_line_id = #{bomLineId},</if>
@@ -138,7 +138,7 @@
</foreach>
</delete>
- <resultMap type="ApsBom" id="ApsBomLineResult">
+ <resultMap type="com.aps.core.domain.ApsBom" id="ApsBomLineResult">
<result property="id" column="id" />
<result property="bomLineId" column="bom_line_id" />
<result property="itemCode" column="item_code" />
--
Gitblit v1.9.3