aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java
@@ -69,4 +69,7 @@ * 初始化剩余库存数量 * */ int initRemainderStock(); int updateRemainderStock(String id, BigDecimal remainderStock, Integer version); } aps-modules/aps-core/src/main/java/com/aps/core/service/IApsMaterialStorageManagementService.java
@@ -1,5 +1,9 @@ package com.aps.core.service; import java.math.BigDecimal; import java.util.List; import java.util.Optional; import com.aps.core.domain.ApsMaterialStorageManagement; import java.util.List; @@ -60,6 +64,8 @@ */ public int deleteApsMaterialStorageManagementById(String id); Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber); ApsMaterialStorageManagement getRdsStorage(String plant, String itemCode); @@ -68,4 +74,6 @@ * @return */ public boolean setStorageDataToRedis(String orgCode); int updateRemainderStock(String id, BigDecimal remainderStock, Integer version); } aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java
@@ -2,6 +2,7 @@ import com.aps.core.domain.ApsPlatePlan; import com.aps.core.domain.ApsPlatePlanTemp; import com.aps.core.domain.ApsPlateStandardRequire; import java.util.List; @@ -79,4 +80,6 @@ * @return */ public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan); // ApsPlatePlan selectUnMatchPlateSubPlan(ApsPlateStandardRequire require); } aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java
@@ -1,5 +1,9 @@ package com.aps.core.service.impl; import java.math.BigDecimal; import java.util.List; import java.util.Optional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.aps.common.core.utils.DateUtils; @@ -105,7 +109,8 @@ /** * 获取物料库存信息 * */ private Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) { @Override public Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) { ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement(); storageParam.setItemNumber(itemNumber); storageParam.setApplicableFactories(plant); @@ -183,4 +188,16 @@ // } return true; } /** * 更新库存信息 * */ public int updateMaterialStorageByVersion(String id, BigDecimal remainderStock, Integer version) { return apsMaterialStorageManagementMapper.updateMaterialStorageByVersion(id, remainderStock, version); } @Override public int updateRemainderStock(String id, BigDecimal remainderStock, Integer version){ return apsMaterialStorageManagementMapper.updateRemainderStock(id, remainderStock, version); } } aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -1,11 +1,15 @@ package com.aps.core.service.impl; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.aps.common.core.utils.DateUtils; import com.aps.common.core.utils.uuid.IdUtils; import com.aps.common.security.utils.DictUtils; import com.aps.core.domain.ApsMaterialStorageManagement; import com.aps.core.domain.ApsPlatePlan; import com.aps.core.domain.ApsPlatePlanTemp; import com.aps.core.domain.ApsPlateStandardRequire; import com.aps.core.mapper.ApsPartPlanTempMapper; import com.aps.core.mapper.ApsPlatePlanMapper; import com.aps.core.mapper.ApsPlatePlanTempMapper; @@ -14,6 +18,7 @@ import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import java.util.List; aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
@@ -127,6 +127,6 @@ bomOrderDetail.setCreateBy(SecurityUtils.getUsername()); orderDetailsList.add(bomOrderDetail); // apsPlateStandardRequireBomOrderDetailMapper.insertApsPlateStandardRequireBomOrderDetail(bomOrderDetail); apsPlateStandardRequireBomOrderDetailMapper.insertApsPlateStandardRequireBomOrderDetail(bomOrderDetail); } } aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
@@ -115,7 +115,8 @@ String itemCode, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId ,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList){ /*更新物料剩余库存*/ itemStorageMapper.updateMaterialStorageByVersion(itemStorage.getId(), afterStockAmount,itemStorage.getVersion()); /*记录扣减明细*/ ApsPlateStandardRequireBomStockDetail bomStockDetail = ApsPlateStandardRequireBomStockDetail.builder() @@ -135,7 +136,13 @@ bomStockDetail.setCreateTime(DateUtils.getNowDate()); stockDetailsList.add(bomStockDetail); //plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail); plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail); /*更新内存中物料剩余库存*/ /*itemStorage.setRemainderStock(afterStockAmount); if(null== itemStorage.getVersion()){ itemStorage.setVersion(1); }else{ itemStorage.setVersion(itemStorage.getVersion()+1); }*/ } } aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -72,7 +72,7 @@ @Resource IApsPlateStandardRequireBatchService requireBatchService; @Autowired @Resource private IApsMaterialStorageManagementService storageManagementService; /** @@ -173,6 +173,8 @@ String batchNum= requireBatchService.getNewBatchNumber(); /*获取钣金主单信息*/ List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType); Hashtable<String, ApsMaterialStorageManagement> usedStorage = new Hashtable<>(); for (ApsPlatePlan mainPlan : mainPlans) { String itemNumber = mainPlan.getItemNumber(); /*根据料号 获取BOM Header */ @@ -183,7 +185,9 @@ List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList=new ArrayList<>(); getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L,stockDetailsList,orderDetailsList); getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null , mainPlan, requiresList, 0L,stockDetailsList,orderDetailsList,usedStorage ); // 批量插入以提高性能 if (!requiresList.isEmpty()) { @@ -195,23 +199,32 @@ } } if(!stockDetailsList.isEmpty()){ int batchSize = 1000; 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(!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(!orderDetailsList.isEmpty()){ int batchSize = 1000; 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); } } } } @@ -234,8 +247,9 @@ private void getBomRequires(String plant, String bomHeaderCode, String bomLineId,String itemCode,BigDecimal itemNum, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList ,List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList, Hashtable<String, ApsMaterialStorageManagement> usedStorage ) { /*构建需求信息*/ ApsPlateStandardRequire require = new ApsPlateStandardRequire(); @@ -260,14 +274,22 @@ require.setBomUseAmount(itemNum.multiply(plan.getProductionQuantity())); } /*查找库存，计算净需求，保存剩余库存，保存库存扣减明细*/ BigDecimal remainderStock = BigDecimal.ZERO; /*默认净需求为BOM用量*/ require.setNetRequirement(require.getBomUseAmount()); Optional<ApsMaterialStorageManagement> itemStorage = Optional.of(storageManagementService.getRdsStorage( plant, itemCode)); if (itemStorage.isPresent()) { ApsMaterialStorageManagement storage = itemStorage.get(); /*剩余库存*/ remainderStock = storage.getRemainderStock(); /*读取库存信息的优先级-> 内存、redis、db*/ /* 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); if (itemStorageOpt.isPresent()) { ApsMaterialStorageManagement itemStorage=itemStorageOpt.get(); BigDecimal remainderStock =itemStorage.getRemainderStock(); /*计算净需求 默认=需求数量*/ if (remainderStock.compareTo(BigDecimal.ZERO) == 0) { require.setNetRequirement(require.getBomUseAmount()); @@ -286,9 +308,11 @@ require.setNetRequirement(BigDecimal.ZERO); } /*记录库存剩余数量，记录库存使用记录*/ bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount , afterStockAmount,require.getId(),stockDetailsList bomStockDetailService.saveStorageAndDetail(itemStorage, plan, bomLineId, itemCode, batchNum, deductionAmount , afterStockAmount, require.getId(), stockDetailsList ); /*更新内存中的库存使用信息*/ // usedStorage.put(itemCode, storage); } } /*未匹配数量，默认为净需求*/ @@ -338,7 +362,6 @@ require.setMatchState("已匹配"); require.setMatchMode("库存匹配"); if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) { require.setMatchState("待匹配"); require.setMatchMode("工单匹配"); /*使用子件工单进行需求匹配*/ matchRequireAndSubPlan(require,orderDetailsList); @@ -352,7 +375,7 @@ bomLineList.forEach(line -> { getBomRequires(plant, itemCode, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum , require.getStartDate(), plan, allRequires, nextLevel,stockDetailsList ,orderDetailsList ,orderDetailsList,usedStorage ); }); } @@ -379,6 +402,7 @@ private void matchRequireAndSubPlan(ApsPlateStandardRequire require, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList) { BigDecimal netRequirement = require.getNetRequirement(); require.setMatchMode("工单匹配"); require.setMatchState("已匹配"); if (netRequirement.compareTo(BigDecimal.ZERO) > 0) { ApsPlatePlan platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode()); /*子件工单的未匹配数量 作为当前的库存*/ @@ -390,7 +414,7 @@ BigDecimal subtract = stock.subtract(netRequirement); bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement,orderDetailsList); netRequirement = BigDecimal.ZERO; require.setMatchState("已匹配"); require.setUnmatchedDemandAmount(BigDecimal.ZERO); /*净需求已经被满足，不需要继续匹配*/ @@ -400,7 +424,7 @@ BigDecimal subtract = BigDecimal.ZERO; bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement,orderDetailsList); netRequirement = BigDecimal.ZERO; require.setMatchState("已匹配"); require.setUnmatchedDemandAmount(BigDecimal.ZERO); /*净需求已经被满足，不需要继续匹配*/ } @@ -408,7 +432,7 @@ /*需求大于库存*/ /*净需求 被部分满足 */ BigDecimal rest = netRequirement.subtract(stock); require.setMatchState("匹配中"); /*工单 未匹配数量为0 全部用于匹配需求*/ bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, BigDecimal.ZERO, stock, netRequirement,orderDetailsList); /*净需求未被满足，需要继续匹配*/ @@ -418,6 +442,7 @@ require.setUnmatchedDemandAmount(rest); } } } }
@@ -104,4 +104,11 @@ set remainder_stock=num,version=0 where 1=1 </update> <update id="updateRemainderStock" parameterType="ApsMaterialStorageManagement"> update aps_material_storage_management set remainder_stock=#{remainderStock},version=#{version} where id=#{id} </update> </mapper> aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml
@@ -134,12 +134,13 @@ insert into aps_plate_standard_require_bom_order_detail (id, require_id,require_track_id, bom_line_id, bom_line_code, doc_no, before_prod_amount, deduction_amount, after_prod_amount, org_code, batch_number, del_flag, create_time, create_by,) org_code, batch_number, del_flag, create_time, create_by) values <foreach collection="list" item="item" index="index" separator=","> (#{item.id}, #{item.requireId},#{item.requireTrackId}, #{item.bomLineId}, #{item.bomLineCode}, #{item.docNo}, #{item.beforeProdAmount}, #{item.deductionAmount}, #{item.afterProdAmount}, #{item.orgCode}, #{item.batchNumber}, #{item.delFlag}, #{item.createTime}, #{item.createBy},) #{item.orgCode}, #{item.batchNumber}, #{item.delFlag}, #{item.createTime}, #{item.createBy} ) </foreach> </insert> </mapper> aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml
@@ -129,7 +129,7 @@ , after_stock_amount, org_code, batch_number, del_flag, create_time, create_by) values <foreach item="item" index="index" collection="list" separator=","> ( #{id}, #{item.requireId}, #{item.requireTrackId}, #{item.bomLineId}, #{item.bomLineCode} ( #{item.id}, #{item.requireId}, #{item.requireTrackId}, #{item.bomLineId}, #{item.bomLineCode} , #{item.beforeStockAmount} , #{item.deductionAmount}, #{item.afterStockAmount}, #{item.orgCode} , #{item.batchNumber} , #{item.delFlag}, #{item.createTime}, #{item.createBy} )
