From a1b91baa97b887d5b109bba8ed07d6e2e84a2436 Mon Sep 17 00:00:00 2001 From: DouDou <877258667@qq.com> Date: Fri, 20 Dec 2024 09:47:22 +0800 Subject: [PATCH] =?UTF-8?q?IFS=20jar=20=E6=B5=8B=E8=AF=95=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/spring/ifs/api/BomApi.java | 6 +++--- .../com/spring/ifs/bean/BomServiceBean.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/spring/ifs/api/BomApi.java b/src/main/java/com/spring/ifs/api/BomApi.java index 7721de2e..a279a11c 100644 --- a/src/main/java/com/spring/ifs/api/BomApi.java +++ b/src/main/java/com/spring/ifs/api/BomApi.java @@ -463,7 +463,7 @@ public class BomApi { * @date 2024/12/13 9:48 * @version 1.0 */ - public static List getBomItems(Server srv, String contract, String partNo, String engChgLevel, String bomType, + public static List getBomItems(Server srv, String contract, String partNo, String engChgLevel, String bomType, String alternativeNo, String lineItemNo) throws APException { StringBuilder searchSql = new StringBuilder(); searchSql.append("SELECT OBJID ifsRowId, OBJVERSION ifsRowVersion, PART_NO, CONTRACT, ENG_CHG_LEVEL, BOM_TYPE, ALTERNATIVE_NO,"); @@ -491,7 +491,7 @@ public class BomApi { if (recordCollection == null) { return new ArrayList<>(); } else { - List resultItems = new ArrayList<>(); + List resultItems = new ArrayList<>(); //调用通用的处理方法 返回Map List> resultList = IfsConverterToMap.ConverterIfsToList(recordCollection); //判断是否存在数据 @@ -501,7 +501,7 @@ public class BomApi { //获取数据转bean for (int i = 0; i < resultList.size(); i++) { Map tempMap = resultList.get(i); - BomItem tempItem = new BomItem(); + BomIfsItem tempItem = new BomIfsItem(); //设置参数 tempItem.setIfsRowId(tempMap.get("IFSROWID")); tempItem.setIfsRowVersion(tempMap.get("IFSROWVERSION")); diff --git a/src/main/java/com/spring/ifs/bean/BomServiceBean.java b/src/main/java/com/spring/ifs/bean/BomServiceBean.java index 86608a37..25721a7f 100644 --- a/src/main/java/com/spring/ifs/bean/BomServiceBean.java +++ b/src/main/java/com/spring/ifs/bean/BomServiceBean.java @@ -3,7 +3,7 @@ package com.spring.ifs.bean; import com.alibaba.fastjson.JSON; import com.spring.ifs.api.BomApi; import com.spring.ifs.api.IfsServer; -import com.spring.ifs.data.*; +import com.spring.ifs.data.BomDistribution; import com.spring.modules.part.entity.APIEntity.BomIfsAlternative; import com.spring.modules.part.entity.APIEntity.BomIfsHeader; import com.spring.modules.part.entity.APIEntity.BomIfsItem; @@ -447,7 +447,7 @@ public class BomServiceBean { throw new RuntimeException("Bom Alternative不存在!"); } //查询结果集 - List resultList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); + List resultList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); //判断是否查询数据 if(resultList == null ||resultList.size() == 0 || resultList.isEmpty()) { throw new RuntimeException("不存在此bom组件信息!"); @@ -488,9 +488,9 @@ public class BomServiceBean { throw new RuntimeException("Bom Alternative不存在!"); } //查询结果集 - List itemList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, null); + List itemList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, null); //转Map - Map itemMap = itemList.stream().collect(Collectors.toMap(BomItem::getLineItemNo, BomItem::getLineItemNo)); + Map itemMap = itemList.stream().collect(Collectors.toMap(BomIfsItem::getLineItemNo, BomIfsItem::getLineItemNo)); //打印日志 logger.info("Bom替代明细集合 批量新增结束："+JSON.toJSONString(inDatas)); //循环判断的方法 @@ -545,13 +545,13 @@ public class BomServiceBean { throw new RuntimeException("Bom Alternative不存在!"); } //查询结果集 - List resultList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); + List resultList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); //判断是否查询数据 if(resultList.size() == 0 || resultList.isEmpty()) { throw new RuntimeException("不存在此bom组件信息!"); } - BomItem bomItem = resultList.get(0); + BomIfsItem bomItem = resultList.get(0); //设置版本信息 inData.setIfsRowId(bomItem.getIfsRowId()); inData.setIfsRowVersion(bomItem.getIfsRowVersion()); @@ -589,9 +589,9 @@ public class BomServiceBean { String alternativeNo = inDatas.get(0).getAlternativeNo(); try{ //查询数据 - List itemList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, null); + List itemList = BomApi.getBomItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, null); //转Map - Map itemMap = itemList.stream().collect(Collectors.toMap(BomItem::getLineItemNo, Function.identity())); + Map itemMap = itemList.stream().collect(Collectors.toMap(BomIfsItem::getLineItemNo, Function.identity())); //打印日志 logger.info("Bom替代明细集合 批量新增结束："+JSON.toJSONString(inDatas)); //循环判断的方法 @@ -606,7 +606,7 @@ public class BomServiceBean { for(BomIfsItem bomItem : inDatas) { //设置版本的信息 String key = bomItem.getLineItemNo(); - BomItem oriItem = itemMap.get(key); + BomIfsItem oriItem = itemMap.get(key); bomItem.setIfsRowId(oriItem.getIfsRowId()); bomItem.setIfsRowVersion(oriItem.getIfsRowVersion()); //调用api