diff --git a/src/main/java/com/spring/ifs/bean/InventoryServiceBean.java b/src/main/java/com/spring/ifs/bean/InventoryServiceBean.java index 4c6544e5..3cca99d3 100644 --- a/src/main/java/com/spring/ifs/bean/InventoryServiceBean.java +++ b/src/main/java/com/spring/ifs/bean/InventoryServiceBean.java @@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,26 +37,37 @@ public class InventoryServiceBean { * @date 2024/12/12 15:49 * @version 1.0 */ - public InventoryPart getInventoryPart(Server srv, InventoryPart inData) throws APException { + public Map getInventoryPart(Server srv, InventoryPart inData) { logger.info("Inventory Part 查询开始:"+ JSON.toJSONString(inData)); - //查询的参数 + //查询的参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); - //获取数据 - Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); - //判断是否需要插入到ifs - if(partMap == null || partMap.size() == 0) { - throw new RuntimeException("库存件不存在!"); + try{ + //获取数据 + Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); + //判断是否需要插入到ifs + if(partMap == null || partMap.size() == 0) { + partMap.put("resultCode", "400"); + partMap.put("resultMsg", "库存件不存在!"); + }else { + partMap.put("resultCode", "200"); + //设置ifs 信息 + inData.setIfsRowId(partMap.get("IFSROWID")); + inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); + //查询库存件的属性模版 + Map templateMap = InventoryPartApi.getInventoryPartCharacteristicTemplate(srv, contract, partNo); + //设置模版 + inData.setEngAttribute(templateMap.get("ENG_ATTRIBUTE")); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } - //设置ifs 信息 - inData.setIfsRowId(partMap.get("IFSROWID")); - inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); - //查询库存件的属性模版 - Map templateMap = InventoryPartApi.getInventoryPartCharacteristicTemplate(srv, contract, partNo); - //设置模版 - inData.setEngAttribute(templateMap.get("ENG_ATTRIBUTE")); logger.info("Inventory Part 查询结束:"+JSON.toJSONString(inData)); - return inData; + return returnMap; } /** @@ -64,27 +76,35 @@ public class InventoryServiceBean { * @date 2024/12/12 15:52 * @version 1.0 */ - public PartIfsInventory syncInventoryPart(Server srv, PartIfsInventory inData) throws APException { + public Map syncInventoryPart(Server srv, PartIfsInventory inData) { logger.info("Inventory Part 新增开始:"+JSON.toJSONString(inData)); //查询的参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); - //获取数据 - Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); - //判断是否需要插入到ifs - if(partMap == null || partMap.size() == 0) { - //调用api - Map resultMap = InventoryPartApi.insertInventoryPart(srv, inData); - //设置ifs 信息 - inData.setIfsRowId(resultMap.get("OBJID")); - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); - }else { - throw new RuntimeException("库存件已存在!"); + try{ + //获取数据 + Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); + //判断是否需要插入到ifs + if(partMap == null || partMap.size() == 0) { + //调用api + Map resultMap = InventoryPartApi.insertInventoryPart(srv, inData); + //设置ifs 信息 + inData.setIfsRowId(resultMap.get("OBJID")); + inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + }else { + throw new RuntimeException("库存件已存在!"); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } //打印日志 logger.info("Inventory Part 新增结束:"+JSON.toJSONString(inData)); //返回结果集 - return inData; + return returnMap; } /** @@ -93,28 +113,36 @@ public class InventoryServiceBean { * @date 2024/12/12 15:55 * @version 1.0 */ - public PartIfsInventory modifyInventoryPart(Server srv, PartIfsInventory inData) throws APException { + public Map modifyInventoryPart(Server srv, PartIfsInventory inData) { logger.info("Inventory Part 修改开始:"+JSON.toJSONString(inData)); //查询的参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); - //获取数据 - Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); - //判断是否需要插入到ifs - if(partMap == null || partMap.size() == 0) { - throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在!"); - }else { - //设置ifs 信息 - inData.setIfsRowId(partMap.get("IFSROWID")); - inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); - Map resultMap = InventoryPartApi.modifyInventoryPart(srv, inData); - //设置ifs 信息 - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + try{ + //获取数据 + Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); + //判断是否需要插入到ifs + if(partMap == null || partMap.size() == 0) { + throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在!"); + }else { + //设置ifs 信息 + inData.setIfsRowId(partMap.get("IFSROWID")); + inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); + Map resultMap = InventoryPartApi.modifyInventoryPart(srv, inData); + //设置ifs 信息 + inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } //打印日志 logger.info("Inventory Part 修改结束:"+JSON.toJSONString(inData)); //返回结果集 - return inData; + return returnMap; } /** @@ -123,24 +151,34 @@ public class InventoryServiceBean { * @date 2024/12/12 15:58 * @version 1.0 */ - public void removeInventoryPart(Server srv, PartIfsInventory inData) throws APException { + public Map removeInventoryPart(Server srv, PartIfsInventory inData) { logger.info("Inventory Part 删除开始:"+JSON.toJSONString(inData)); - //查询的参数 + //查询的参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); - //获取数据 - Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); - //判断是否需要插入到ifs - if(partMap == null || partMap.size() == 0) { - throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在!"); - }else { - //设置ifs 信息 - inData.setIfsRowId(partMap.get("IFSROWID")); - inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); - InventoryPartApi.removeInventoryPart(srv, inData); + try{ + //获取数据 + Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); + //判断是否需要插入到ifs + if(partMap == null || partMap.size() == 0) { + throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在!"); + }else { + //设置ifs 信息 + inData.setIfsRowId(partMap.get("IFSROWID")); + inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); + InventoryPartApi.removeInventoryPart(srv, inData); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } //打印日志 logger.info("Inventory Part 删除结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; } /** @@ -149,28 +187,36 @@ public class InventoryServiceBean { * @date 2024/12/12 16:11 * @version 1.0 */ - public PartIfsInventoryConfig modifyInventoryPartCost(Server srv, PartIfsInventoryConfig inData) throws APException { + public Map modifyInventoryPartCost(Server srv, PartIfsInventoryConfig inData) { logger.info("Inventory Part Cost 修改开始:"+JSON.toJSONString(inData)); //查询的参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); - //获取数据 - Map partMap = InventoryPartApi.getInventoryPartConfig(srv, contract, partNo); - //判断是否需要插入到ifs - if(partMap == null || partMap.size() == 0) { - throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在!"); - }else { - //设置ifs 信息 - inData.setIfsRowId(partMap.get("IFSROWID")); - inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); - Map resultMap = InventoryPartApi.modifyInventoryPartCost(srv, inData); - //设置ifs 信息 - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + try{ + //获取数据 + Map partMap = InventoryPartApi.getInventoryPartConfig(srv, contract, partNo); + //判断是否需要插入到ifs + if(partMap == null || partMap.size() == 0) { + throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在!"); + }else { + //设置ifs 信息 + inData.setIfsRowId(partMap.get("IFSROWID")); + inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); + Map resultMap = InventoryPartApi.modifyInventoryPartCost(srv, inData); + //设置ifs 信息 + inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } //打印日志 logger.info("Inventory Part Cost 修改结束:"+JSON.toJSONString(inData)); //返回结果集 - return inData; + return returnMap; } /** @@ -179,30 +225,38 @@ public class InventoryServiceBean { * @date 2024/12/12 16:31 * @version 1.0 */ - public PartIfsInventoryPlan modifyInventoryPartPlan(Server srv, PartIfsInventoryPlan inData) throws APException { + public Map modifyInventoryPartPlan(Server srv, PartIfsInventoryPlan inData) { logger.info("Inventory Part Plan 修改开始:"+JSON.toJSONString(inData)); - //查询的参数 + //查询的参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); - //获取数据 - Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); - //判断是否需要插入到ifs - if(partMap == null || partMap.size() == 0) { - throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在!"); - }else { - //获取库存件Plan配置的信息 - Map planMap = InventoryPartApi.getInventoryPartPlan(srv, contract, partNo); - //设置ifs 信息 - inData.setIfsRowId(planMap.get("IFSROWID")); - inData.setIfsRowVersion(planMap.get("IFSROWVERSION")); - Map resultMap = InventoryPartApi.modifyInventoryPartPlan(srv, inData); - //设置ifs 信息 - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + try{ + //获取数据 + Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); + //判断是否需要插入到ifs + if(partMap == null || partMap.size() == 0) { + throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在!"); + }else { + //获取库存件Plan配置的信息 + Map planMap = InventoryPartApi.getInventoryPartPlan(srv, contract, partNo); + //设置ifs 信息 + inData.setIfsRowId(planMap.get("IFSROWID")); + inData.setIfsRowVersion(planMap.get("IFSROWVERSION")); + Map resultMap = InventoryPartApi.modifyInventoryPartPlan(srv, inData); + //设置ifs 信息 + inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } //打印日志 logger.info("Inventory Part Plan 修改结束:"+JSON.toJSONString(inData)); //返回结果集 - return inData; + return returnMap; } /** @@ -211,27 +265,36 @@ public class InventoryServiceBean { * @date 2024/12/12 16:36 * @version 1.0 */ - public List syncInventoryPartLocations(Server srv, List inDatas) throws APException { + public Map syncInventoryPartLocations(Server srv, List inDatas) { logger.info("Inventory Part Location 批量新增开始:"+JSON.toJSONString(inDatas)); + Map returnMap = new HashMap<>(); PartIfsInventoryLocation zeroData = inDatas.get(0); String contract = zeroData.getContract(); String partNo = zeroData.getPartNo(); - //获取数据 - Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); - //判断是否需要插入到ifs - if(partMap == null || partMap.size() == 0) { - throw new RuntimeException("域:" + contract + "库存件:" + partNo + "不存在!"); - } - //编辑处理需要处理的数据 - for(PartIfsInventoryLocation inData : inDatas) { - Map resultMap = InventoryPartApi.insertInventoryPartLocation(srv, inData); - //设置ifs 信息 - inData.setIfsRowId(resultMap.get("OBJID")); - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + try{ + //获取数据 + Map partMap = InventoryPartApi.getInventoryPartByPartNo(srv, contract, partNo); + //判断是否需要插入到ifs + if(partMap == null || partMap.size() == 0) { + throw new RuntimeException("域:" + contract + "库存件:" + partNo + "不存在!"); + } + //编辑处理需要处理的数据 + for(PartIfsInventoryLocation inData : inDatas) { + Map resultMap = InventoryPartApi.insertInventoryPartLocation(srv, inData); + //设置ifs 信息 + inData.setIfsRowId(resultMap.get("OBJID")); + inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inDatas)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } + //打印日志 logger.info("Inventory Part Location 批量新增结束:"+JSON.toJSONString(inDatas)); //返回结果集 - return inDatas; + return returnMap; } /** @@ -240,23 +303,33 @@ public class InventoryServiceBean { * @date 2024/12/12 16:37 * @version 1.0 */ - public void removeInventoryPartLocation(Server srv, PartIfsInventoryLocation inData) throws APException { + public Map removeInventoryPartLocation(Server srv, PartIfsInventoryLocation inData) { logger.info("Inventory Part Location 删除开始:"+JSON.toJSONString(inData)); + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); String locationNo = inData.getLocationNo(); - //获取数据 - Map locationMap = InventoryPartApi.getInventoryPartLocation(srv, contract, partNo, locationNo); - //判断是否需要插入到ifs - if(locationMap == null || locationMap.size() == 0) { - throw new RuntimeException("域:" + contract + "库存件:" + partNo + "库位编码:" + locationNo +"不存在!"); + try{ + //获取数据 + Map locationMap = InventoryPartApi.getInventoryPartLocation(srv, contract, partNo, locationNo); + //判断是否需要插入到ifs + if(locationMap == null || locationMap.size() == 0) { + throw new RuntimeException("域:" + contract + "库存件:" + partNo + "库位编码:" + locationNo +"不存在!"); + } + //设置ifs 信息 + inData.setIfsRowId(locationMap.get("IFSROWID")); + inData.setIfsRowVersion(locationMap.get("IFSROWVERSION")); + InventoryPartApi.removeInventoryPartLocation(srv, inData); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } - //设置ifs 信息 - inData.setIfsRowId(locationMap.get("IFSROWID")); - inData.setIfsRowVersion(locationMap.get("IFSROWVERSION")); - InventoryPartApi.removeInventoryPartLocation(srv, inData); //打印日志 logger.info("Inventory Part Location 删除结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; } /** @@ -265,27 +338,37 @@ public class InventoryServiceBean { * @date 2024/12/12 16:42 * @version 1.0 */ - public void removeInventoryPartLocations(Server srv, List inDatas) throws APException { + public Map removeInventoryPartLocations(Server srv, List inDatas) { logger.info("Inventory Part Location 批量删除开始:"+JSON.toJSONString(inDatas)); + Map returnMap = new HashMap<>(); PartIfsInventoryLocation zeroData = inDatas.get(0); String contract = zeroData.getContract(); String partNo = zeroData.getPartNo(); - //循环处理数据 - for(PartIfsInventoryLocation inData : inDatas) { - String locationNo = inData.getLocationNo(); - //获取库存件Plan配置的信息 - Map locationMap = InventoryPartApi.getInventoryPartLocation(srv, contract, partNo, locationNo); - //判断是否需要插入到ifs - if(locationMap == null || locationMap.size() == 0) { - throw new RuntimeException("域:" + contract + "库存件:" + partNo + "库位编码:" + locationNo +"不存在!"); + try{ + //循环处理数据 + for(PartIfsInventoryLocation inData : inDatas) { + String locationNo = inData.getLocationNo(); + //获取库存件Plan配置的信息 + Map locationMap = InventoryPartApi.getInventoryPartLocation(srv, contract, partNo, locationNo); + //判断是否需要插入到ifs + if(locationMap == null || locationMap.size() == 0) { + throw new RuntimeException("域:" + contract + "库存件:" + partNo + "库位编码:" + locationNo +"不存在!"); + } + //设置ifs 信息 + inData.setIfsRowId(locationMap.get("IFSROWID")); + inData.setIfsRowVersion(locationMap.get("IFSROWVERSION")); + InventoryPartApi.removeInventoryPartLocation(srv, inData); } - //设置ifs 信息 - inData.setIfsRowId(locationMap.get("IFSROWID")); - inData.setIfsRowVersion(locationMap.get("IFSROWVERSION")); - InventoryPartApi.removeInventoryPartLocation(srv, inData); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inDatas)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } //打印日志 logger.info("Inventory Part Location 批量删除结束:"+JSON.toJSONString(inDatas)); + //返回结果集 + return returnMap; } /** @@ -294,28 +377,36 @@ public class InventoryServiceBean { * @date 2024/12/12 16:44 * @version 1.0 */ - public PartIfsInventoryManufacture modifyInventoryPartManufacture(Server srv, PartIfsInventoryManufacture inData) throws APException { + public Map modifyInventoryPartManufacture(Server srv, PartIfsInventoryManufacture inData) { logger.info("Inventory Part Manufacture 修改开始:"+JSON.toJSONString(inData)); + Map returnMap = new HashMap<>(); //公共参数 String contract = inData.getContract(); String partNo = inData.getPartNo(); - //查询制造商信息 - Map manufMap = InventoryPartApi.getInventoryManufacture(srv, contract, partNo); - //判断是否需要插入到ifs - if(manufMap == null || manufMap.size() == 0) { - throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在制造商信息!"); - }else { - //设置ifs 信息 - inData.setIfsRowId(manufMap.get("IFSROWID")); - inData.setIfsRowVersion(manufMap.get("IFSROWVERSION")); - Map resultMap = InventoryPartApi.modifyInventoryPartManufacture(srv, inData); - //设置ifs 信息 - inData.setIfsRowVersion(resultMap.get("IFSROWVERSION")); + try{ + //查询制造商信息 + Map manufMap = InventoryPartApi.getInventoryManufacture(srv, contract, partNo); + //判断是否需要插入到ifs + if(manufMap == null || manufMap.size() == 0) { + throw new RuntimeException("域:"+contract+"库存件:"+partNo+"不存在制造商信息!"); + }else { + //设置ifs 信息 + inData.setIfsRowId(manufMap.get("IFSROWID")); + inData.setIfsRowVersion(manufMap.get("IFSROWVERSION")); + Map resultMap = InventoryPartApi.modifyInventoryPartManufacture(srv, inData); + //设置ifs 信息 + inData.setIfsRowVersion(resultMap.get("IFSROWVERSION")); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } - //打印日志 + //打印日志 logger.info("Inventory Part Manufacture 修改结束:"+JSON.toJSONString(inData)); - //返回信息 - return inData; + //返回结果集 + return returnMap; } /** @@ -324,24 +415,36 @@ public class InventoryServiceBean { * @date 2024/12/12 16:59 * @version 1.0 */ - public PartIfsInventoryRevision getInventoryPartRevision(Server srv, PartIfsInventoryRevision inData) throws APException { + public Map getInventoryPartRevision(Server srv, PartIfsInventoryRevision inData) { logger.info("Inventory Part Revision 查询开始:"+JSON.toJSONString(inData)); //公共参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); String engChgLevel = inData.getEngChgLevel(); - //获取数据 - Map revisionMap = InventoryPartApi.getInventoryPartRevision(srv, contract, partNo, engChgLevel); - //判断是否需要插入到ifs - if(revisionMap == null) { - throw new RuntimeException("当前版本信息不存在!"); + try{ + //获取数据 + Map revisionMap = InventoryPartApi.getInventoryPartRevision(srv, contract, partNo, engChgLevel); + //判断是否需要插入到ifs + if(revisionMap == null || revisionMap.size() == 0) { + revisionMap.put("resultCode", "400"); + revisionMap.put("resultMsg", "当前版本信息不存在!"); + }else{ + revisionMap.put("resultCode", "200"); + } + //设置ifs 信息 + inData.setIfsRowId(revisionMap.get("IFSROWID")); + inData.setIfsRowVersion(revisionMap.get("IFSROWVERSION")); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } - //设置ifs 信息 - inData.setIfsRowId(revisionMap.get("IFSROWID")); - inData.setIfsRowVersion(revisionMap.get("IFSROWVERSION")); //打印日志 logger.info("Inventory Part Revision 查询结束:"+JSON.toJSONString(inData)); - return inData; + //返回结果集 + return returnMap; } /** @@ -350,27 +453,35 @@ public class InventoryServiceBean { * @date 2024/12/12 17:03 * @version 1.0 */ - public PartIfsInventoryRevision syncInventoryPartRevision(Server srv, PartIfsInventoryRevision inData) throws APException { + public Map syncInventoryPartRevision(Server srv, PartIfsInventoryRevision inData) { logger.info("Inventory Part Revision 新增开始:"+JSON.toJSONString(inData)); //公共参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); String engChgLevel = inData.getEngChgLevel(); - //获取数据 - Map revisionMap = InventoryPartApi.getInventoryPartRevision(srv, contract, partNo, engChgLevel); - //判断是否需要插入到ifs - if(revisionMap != null) { - throw new RuntimeException("当前版本信息已存在!"); + try{ + //获取数据 + Map revisionMap = InventoryPartApi.getInventoryPartRevision(srv, contract, partNo, engChgLevel); + //判断是否需要插入到ifs + if(revisionMap != null) { + throw new RuntimeException("当前版本信息已存在!"); + } + //调用新增api + Map resultMap = InventoryPartApi.insertInventoryPartRevision(srv, inData); + //设置ifs 信息 + inData.setIfsRowId(resultMap.get("OBJID")); + inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } - //调用新增api - Map resultMap = InventoryPartApi.insertInventoryPartRevision(srv, inData); - //设置ifs 信息 - inData.setIfsRowId(resultMap.get("OBJID")); - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); //打印日志 logger.info("Inventory Part Revision 新增结束:"+JSON.toJSONString(inData)); - //返回结果 - return inData; + //返回结果集 + return returnMap; } /** @@ -379,29 +490,37 @@ public class InventoryServiceBean { * @date 2024/12/12 17:06 * @version 1.0 */ - public PartIfsInventoryRevision modifyInventoryPartRevision(Server srv, PartIfsInventoryRevision inData) throws APException { + public Map modifyInventoryPartRevision(Server srv, PartIfsInventoryRevision inData) { logger.info("Inventory Part Revision 修改开始:"+JSON.toJSONString(inData)); //公共参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); String engChgLevel = inData.getEngChgLevel(); - //获取数据 - Map revisionMap = InventoryPartApi.getInventoryPartRevision(srv, contract, partNo, engChgLevel); - //判断是否需要插入到ifs - if(revisionMap == null || revisionMap.size() == 0) { - throw new RuntimeException("当前版本信息不存在!"); + try{ + //获取数据 + Map revisionMap = InventoryPartApi.getInventoryPartRevision(srv, contract, partNo, engChgLevel); + //判断是否需要插入到ifs + if(revisionMap == null || revisionMap.size() == 0) { + throw new RuntimeException("当前版本信息不存在!"); + } + //设置ifs 信息 + inData.setIfsRowId(revisionMap.get("IFSROWID")); + inData.setIfsRowVersion(revisionMap.get("IFSROWVERSION")); + //调用api + Map resultMap = InventoryPartApi.modifyInventoryPartRevision(srv, inData); + //设置ifs 信息 + inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } - //设置ifs 信息 - inData.setIfsRowId(revisionMap.get("IFSROWID")); - inData.setIfsRowVersion(revisionMap.get("IFSROWVERSION")); - //调用api - Map resultMap = InventoryPartApi.modifyInventoryPartRevision(srv, inData); - //设置ifs 信息 - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); //打印日志 logger.info("Inventory Part Revision 修改结束:"+JSON.toJSONString(inData)); - //返回结果 - return inData; + //返回结果集 + return returnMap; } /** @@ -410,25 +529,34 @@ public class InventoryServiceBean { * @date 2024/12/12 17:07 * @version 1.0 */ - public void removeInventoryPartRevision(Server srv, PartIfsInventoryRevision inData) throws APException { + public Map removeInventoryPartRevision(Server srv, PartIfsInventoryRevision inData) { logger.info("Inventory Part Revision 删除开始:"+JSON.toJSONString(inData)); //公共参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); String engChgLevel = inData.getEngChgLevel(); - //获取数据 - Map revisionMap = InventoryPartApi.getInventoryPartRevision(srv, contract, partNo, engChgLevel); - //判断是否需要插入到ifs - if(revisionMap == null || revisionMap.size() == 0) { - throw new RuntimeException("当前版本信息不存在!"); - } - //设置ifs 信息 - inData.setIfsRowId(revisionMap.get("IFSROWID")); - inData.setIfsRowVersion(revisionMap.get("IFSROWVERSION")); - //调用api - InventoryPartApi.removeInventoryPartRevision(srv, inData); - //打印日志 + try{ + //获取数据 + Map revisionMap = InventoryPartApi.getInventoryPartRevision(srv, contract, partNo, engChgLevel); + //判断是否需要插入到ifs + if(revisionMap == null || revisionMap.size() == 0) { + throw new RuntimeException("当前版本信息不存在!"); + } + //设置ifs 信息 + inData.setIfsRowId(revisionMap.get("IFSROWID")); + inData.setIfsRowVersion(revisionMap.get("IFSROWVERSION")); + //调用api + InventoryPartApi.removeInventoryPartRevision(srv, inData); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); + }//打印日志 logger.info("Inventory Part Revision 删除结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; } /** @@ -437,28 +565,37 @@ public class InventoryServiceBean { * @date 2024/12/12 17:23 * @version 1.0 */ - public List syncInventoryPartCharacteristics(Server srv, List inDatas) throws APException { + public Map syncInventoryPartCharacteristics(Server srv, List inDatas) { logger.info("Inventory Part Characteristic Code 批量新增开始:"+JSON.toJSONString(inDatas)); PartIfsInventoryProperty zeroData = inDatas.get(0); //公共参数 + Map returnMap = new HashMap<>(); String contract = zeroData.getContract(); String partNo = zeroData.getPartNo(); - //递归判断 - for(PartIfsInventoryProperty characteristic : inDatas) { - String characteristicCode = characteristic.getCharacteristicCode(); - Map characteristicMap = InventoryPartApi.getInventoryPartCharacteristicCode(srv, contract, partNo, characteristicCode); - if(characteristicMap != null && characteristicMap.size() > 0) { - throw new RuntimeException("属性编码已存在!"); + try{ + //递归判断 + for(PartIfsInventoryProperty characteristic : inDatas) { + String characteristicCode = characteristic.getCharacteristicCode(); + Map characteristicMap = InventoryPartApi.getInventoryPartCharacteristicCode(srv, contract, partNo, characteristicCode); + if(characteristicMap != null && characteristicMap.size() > 0) { + throw new RuntimeException("属性编码已存在!"); + } + //校验通过继续新增 + Map resultMap = InventoryPartApi.insertInventoryPartCharacteristicCode(srv, characteristic); + //设置ifs 信息 + characteristic.setIfsRowId(resultMap.get("OBJID")); + characteristic.setIfsRowVersion(resultMap.get("OBJVERSION")); } - //校验通过继续新增 - Map resultMap = InventoryPartApi.insertInventoryPartCharacteristicCode(srv, characteristic); - //设置ifs 信息 - characteristic.setIfsRowId(resultMap.get("OBJID")); - characteristic.setIfsRowVersion(resultMap.get("OBJVERSION")); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inDatas)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } //打印日志 logger.info("Inventory Part Characteristic Code 批量新增结束:"+JSON.toJSONString(inDatas)); - return inDatas; + //返回结果集 + return returnMap; } /** @@ -467,21 +604,32 @@ public class InventoryServiceBean { * @date 2024/12/12 17:28 * @version 1.0 */ - public void removeInventoryPartCharacteristicsByPartNo(Server srv, InventoryPart inData) throws APException { + public Map removeInventoryPartCharacteristicsByPartNo(Server srv, InventoryPart inData) { logger.info("删除库存件的所有属性开始:"+JSON.toJSONString(inData)); //公共参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); - //查询当前物料的属性 先删除物料属性 再删除库存件 - List characteristicList = InventoryPartApi.getInventoryPartCharacteristicCodes(srv, contract, partNo); - //如果存在就批量删掉数据 - if(characteristicList != null && characteristicList.size() > 0) { - for(PartIfsInventoryProperty characteristic : characteristicList) { - //一个一个删掉库存件的属性 - InventoryPartApi.removeInventoryPartCharacteristic(srv, characteristic); + try{ + //查询当前物料的属性 先删除物料属性 再删除库存件 + List characteristicList = InventoryPartApi.getInventoryPartCharacteristicCodes(srv, contract, partNo); + //如果存在就批量删掉数据 + if(characteristicList != null && characteristicList.size() > 0) { + for(PartIfsInventoryProperty characteristic : characteristicList) { + //一个一个删掉库存件的属性 + InventoryPartApi.removeInventoryPartCharacteristic(srv, characteristic); + } + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } logger.info("删除库存件的所有属性结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; } /** @@ -490,47 +638,58 @@ public class InventoryServiceBean { * @date 2024/12/12 17:38 * @version 1.0 */ - public void removeInventoryPartRelationInfo(Server srv, InventoryPart inData) throws APException { + public Map removeInventoryPartRelationInfo(Server srv, InventoryPart inData) { logger.info("删除库存件的关联信息开始:"+JSON.toJSONString(inData)); //公共参数 + Map returnMap = new HashMap<>(); String contract = inData.getContract(); String partNo = inData.getPartNo(); - //按照条件查询Bom的相关信息 按照海波的要求 删除Bom Header - List bomHeaders = BomApi.getBomHeadersByPartNo(srv, contract, partNo); - //判断是否存在 - if(bomHeaders != null && bomHeaders.size() > 0) { - for(BomHeader bomHeader : bomHeaders) { - //执行删除的操作 - BomApi.removeBomHeader(srv, bomHeader); + try{ + //按照条件查询Bom的相关信息 按照海波的要求 删除Bom Header + List bomHeaders = BomApi.getBomHeadersByPartNo(srv, contract, partNo); + //判断是否存在 + if(bomHeaders != null && bomHeaders.size() > 0) { + for(BomHeader bomHeader : bomHeaders) { + //执行删除的操作 + BomApi.removeBomHeader(srv, bomHeader); + } } - } - //按照条件查询Routing的相关信息 按照海波的要求 - List routingHeaders = RoutingApi.getRoutingHeadersByPartNo(srv, contract, partNo); - //判断是否存在 - if(routingHeaders != null && routingHeaders.size() > 0) { - for(RoutingHeader routingHeader : routingHeaders) { - //执行删除的操作 - RoutingApi.removeRoutingHeader(srv, routingHeader); + //按照条件查询Routing的相关信息 按照海波的要求 + List routingHeaders = RoutingApi.getRoutingHeadersByPartNo(srv, contract, partNo); + //判断是否存在 + if(routingHeaders != null && routingHeaders.size() > 0) { + for(RoutingHeader routingHeader : routingHeaders) { + //执行删除的操作 + RoutingApi.removeRoutingHeader(srv, routingHeader); + } } - } - //判断库存件是否存在 - PartIfsInventory inventoryPart = InventoryPartApi.getInventoryPart(srv, contract, partNo); - //如果存在需要删掉 - if(inventoryPart != null) { - //查询当前物料的属性 先删除物料属性 再删除库存件 - List characteristicCodes = InventoryPartApi.getInventoryPartCharacteristicCodes(srv, contract, partNo); - //如果存在就批量删掉数据 - if(characteristicCodes.size() > 0) { - for(PartIfsInventoryProperty characteristic : characteristicCodes) { - //一个一个删掉库存件的属性 - InventoryPartApi.removeInventoryPartCharacteristic(srv, characteristic); + //判断库存件是否存在 + PartIfsInventory inventoryPart = InventoryPartApi.getInventoryPart(srv, contract, partNo); + //如果存在需要删掉 + if(inventoryPart != null) { + //查询当前物料的属性 先删除物料属性 再删除库存件 + List characteristicCodes = InventoryPartApi.getInventoryPartCharacteristicCodes(srv, contract, partNo); + //如果存在就批量删掉数据 + if(characteristicCodes.size() > 0) { + for(PartIfsInventoryProperty characteristic : characteristicCodes) { + //一个一个删掉库存件的属性 + InventoryPartApi.removeInventoryPartCharacteristic(srv, characteristic); + } } + InventoryPartApi.removeInventoryPart(srv, inventoryPart); } - InventoryPartApi.removeInventoryPart(srv, inventoryPart); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } + //打印日志 logger.info("删除库存件的关联信息结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; } /** @@ -539,8 +698,9 @@ public class InventoryServiceBean { * @date 2024/12/9 15:51 * @version 1.0 */ - public void syncCopyPartForInventoryPart(Server srv, CopyPart inData) throws APException { + public Map syncCopyPartForInventoryPart(Server srv, CopyPart inData) { //公共参数 + Map returnMap = new HashMap<>(); String oriContract = inData.getOriContract(); String oriPartNo = inData.getOriPartNo(); String contract = inData.getContract(); @@ -559,208 +719,219 @@ public class InventoryServiceBean { String copySPCharacteristics = inData.getCopySPCharacteristics();//对应Sales Part, Characteristics String copySPDocumentTexts = inData.getCopySPDocumentTexts();//对应Sales Part, Document Texts String copySPLanguageDescription = inData.getCopySPLanguageDescription();//对应Sales Part, Language Description - //调用api方法获取事件的编码 - Map resultMap = InventoryPartApi.getCopyPartEventNo(srv); - String eventNo = resultMap.get("EVENT_NO"); - //调整选择的接口数据 - List copyPartItems = InventoryPartApi.getCopyPartItemsByEventNo(srv, eventNo); - //循环遍历 - for(CopyPartItem copyPartItem : copyPartItems) { - String copyDesc = copyPartItem.getCopyDesc(); - String ifsRowId = copyPartItem.getIfsRowId(); - String ifsRowVersion = copyPartItem.getIfsRowVersion(); - //处理Bom的数据都要传 - if(copyDesc.indexOf("Manufacturing Structure,") == 0) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - } - //处理Routing的数据都要传 - if(copyDesc.indexOf("Manufacturing Routings,") == 0) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - } - //处理master Part数据都要传 - if(copyDesc.indexOf("Part Catalog,") == 0 || copyDesc.indexOf("Part,") == 0) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - } - //针对Connected Objects 特殊设置 不确定页面和页签 - //库存件 - if(copyDesc.equalsIgnoreCase("Inventory Part, Connected Objects")) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - } - //库存件 - if(copyDesc.equalsIgnoreCase("Inventory Part, Document Texts")) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); - } - - //销售件 - if(copyDesc.equalsIgnoreCase("Sales Part, Connected Objects")) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - } - - //针对特殊PLM控制的的数据 设置对应的参数 - //1.Inventory Part, General - if(copyDesc.equalsIgnoreCase("Inventory Part, General")) { - //根据plm的设置填充数据 - if("Y".equals(copyGeneral)) { + try{ + //调用api方法获取事件的编码 + Map resultMap = InventoryPartApi.getCopyPartEventNo(srv); + String eventNo = resultMap.get("EVENT_NO"); + //调整选择的接口数据 + List copyPartItems = InventoryPartApi.getCopyPartItemsByEventNo(srv, eventNo); + //循环遍历 + for(CopyPartItem copyPartItem : copyPartItems) { + String copyDesc = copyPartItem.getCopyDesc(); + String ifsRowId = copyPartItem.getIfsRowId(); + String ifsRowVersion = copyPartItem.getIfsRowVersion(); + //处理Bom的数据都要传 + if(copyDesc.indexOf("Manufacturing Structure,") == 0) { //调用api设置成 必传 重复不添加 InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); } - } - - //2.Inventory Part, Default Locations - if(copyDesc.equalsIgnoreCase("Inventory Part, Default Locations")) { - //根据plm的设置填充数据 - if("Y".equals(copyDefaultLocation)) { + //处理Routing的数据都要传 + if(copyDesc.indexOf("Manufacturing Routings,") == 0) { //调用api设置成 必传 重复不添加 InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); } - } - - //3.Inventory Part, Characteristics - if(copyDesc.equalsIgnoreCase("Inventory Part, Characteristics")) { - //根据plm的设置填充数据 - if("Y".equals(copyCharacteristic)) { + //处理master Part数据都要传 + if(copyDesc.indexOf("Part Catalog,") == 0 || copyDesc.indexOf("Part,") == 0) { //调用api设置成 必传 重复不添加 InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); } - } - - //4.Inventory Part, Manufacturing - if(copyDesc.equalsIgnoreCase("Inventory Part, Manufacturing")) { - //根据plm的设置填充数据 - if("Y".equals(copyManufacturing)) { + //针对Connected Objects 特殊设置 不确定页面和页签 + //库存件 + if(copyDesc.equalsIgnoreCase("Inventory Part, Connected Objects")) { //调用api设置成 必传 重复不添加 InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { + } + //库存件 + if(copyDesc.equalsIgnoreCase("Inventory Part, Document Texts")) { //调用api设置成 必传 重复不添加 InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); } - } - //5.Purchase Part, General - if(copyDesc.equalsIgnoreCase("Purchase Part, General")) { - //根据plm的设置填充数据 - if("Y".equals(copyPPGeneral)) { + //销售件 + if(copyDesc.equalsIgnoreCase("Sales Part, Connected Objects")) { //调用api设置成 必传 重复不添加 InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); } - } - //6.Purchase Part, Document Texts - if(copyDesc.equalsIgnoreCase("Purchase Part, Document Texts")) { - //根据plm的设置填充数据 - if("Y".equals(copyPPDocumentTexts)) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + //针对特殊PLM控制的的数据 设置对应的参数 + //1.Inventory Part, General + if(copyDesc.equalsIgnoreCase("Inventory Part, General")) { + //根据plm的设置填充数据 + if("Y".equals(copyGeneral)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } } - } - //7.Purchase Part, Connected Objects - if(copyDesc.equalsIgnoreCase("Purchase Part, Connected Objects")) { - //根据plm的设置填充数据 - if("Y".equals(copyPPConnectedObjects)) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + //2.Inventory Part, Default Locations + if(copyDesc.equalsIgnoreCase("Inventory Part, Default Locations")) { + //根据plm的设置填充数据 + if("Y".equals(copyDefaultLocation)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } } - } - //8.Supplier for Purchase Part, General - if(copyDesc.equalsIgnoreCase("Supplier for Purchase Part, General")) { - //根据plm的设置填充数据 - if("Y".equals(copySPPGeneral)) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + //3.Inventory Part, Characteristics + if(copyDesc.equalsIgnoreCase("Inventory Part, Characteristics")) { + //根据plm的设置填充数据 + if("Y".equals(copyCharacteristic)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } } - } - //9.Supplier for Purchase Part, Document Texts - if(copyDesc.equalsIgnoreCase("Supplier for Purchase Part, Document Texts")) { - //根据plm的设置填充数据 - if("Y".equals(copySPPDocumentTexts)) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + //4.Inventory Part, Manufacturing + if(copyDesc.equalsIgnoreCase("Inventory Part, Manufacturing")) { + //根据plm的设置填充数据 + if("Y".equals(copyManufacturing)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } } - } - //10.Sales Part, General - if(copyDesc.equalsIgnoreCase("Sales Part, General")) { - //根据plm的设置填充数据 - if("Y".equals(copySPGeneral)) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + //5.Purchase Part, General + if(copyDesc.equalsIgnoreCase("Purchase Part, General")) { + //根据plm的设置填充数据 + if("Y".equals(copyPPGeneral)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } } - } - //11.Sales Part, Characteristics - if(copyDesc.equalsIgnoreCase("Sales Part, Characteristics")) { - //根据plm的设置填充数据 - if("Y".equals(copySPCharacteristics)) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + //6.Purchase Part, Document Texts + if(copyDesc.equalsIgnoreCase("Purchase Part, Document Texts")) { + //根据plm的设置填充数据 + if("Y".equals(copyPPDocumentTexts)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } } - } - //12.Sales Part, Document Texts - if(copyDesc.equalsIgnoreCase("Sales Part, Document Texts")) { - //根据plm的设置填充数据 - if("Y".equals(copySPDocumentTexts)) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + //7.Purchase Part, Connected Objects + if(copyDesc.equalsIgnoreCase("Purchase Part, Connected Objects")) { + //根据plm的设置填充数据 + if("Y".equals(copyPPConnectedObjects)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } } - } - //13.Sales Part, Language Description - if(copyDesc.equalsIgnoreCase("Sales Part, Language Description")) { - //根据plm的设置填充数据 - if("Y".equals(copySPLanguageDescription)) { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); - }else { - //调用api设置成 必传 重复不添加 - InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + //8.Supplier for Purchase Part, General + if(copyDesc.equalsIgnoreCase("Supplier for Purchase Part, General")) { + //根据plm的设置填充数据 + if("Y".equals(copySPPGeneral)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } + } + + //9.Supplier for Purchase Part, Document Texts + if(copyDesc.equalsIgnoreCase("Supplier for Purchase Part, Document Texts")) { + //根据plm的设置填充数据 + if("Y".equals(copySPPDocumentTexts)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } + } + + //10.Sales Part, General + if(copyDesc.equalsIgnoreCase("Sales Part, General")) { + //根据plm的设置填充数据 + if("Y".equals(copySPGeneral)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } + } + + //11.Sales Part, Characteristics + if(copyDesc.equalsIgnoreCase("Sales Part, Characteristics")) { + //根据plm的设置填充数据 + if("Y".equals(copySPCharacteristics)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } + } + + //12.Sales Part, Document Texts + if(copyDesc.equalsIgnoreCase("Sales Part, Document Texts")) { + //根据plm的设置填充数据 + if("Y".equals(copySPDocumentTexts)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } + } + + //13.Sales Part, Language Description + if(copyDesc.equalsIgnoreCase("Sales Part, Language Description")) { + //根据plm的设置填充数据 + if("Y".equals(copySPLanguageDescription)) { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "TRUE", "TRUE"); + }else { + //调用api设置成 必传 重复不添加 + InventoryPartApi.modifyIfsCopyPartItem(srv, ifsRowId, ifsRowVersion, "FALSE", "TRUE"); + } } } + //执行拷贝的操作 + InventoryPartApi.processIfsCopyPart(srv, oriContract, oriPartNo, contract, partNo, partDesc, "FALSE", eventNo); + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } - //执行拷贝的操作 - InventoryPartApi.processIfsCopyPart(srv, oriContract, oriPartNo, contract, partNo, partDesc, "FALSE", eventNo); + //打印日志 + logger.info("Copy Part 新增结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; } diff --git a/src/main/java/com/spring/ifs/bean/MasterServiceBean.java b/src/main/java/com/spring/ifs/bean/MasterServiceBean.java index c31eb2ab..700a85ab 100644 --- a/src/main/java/com/spring/ifs/bean/MasterServiceBean.java +++ b/src/main/java/com/spring/ifs/bean/MasterServiceBean.java @@ -33,19 +33,29 @@ public class MasterServiceBean { * @date 2024/12/9 13:28 * @version 1.0 */ - public Map getMasterPart(Server srv, PartIfsCatalog inData) throws APException { + public Map getMasterPart(Server srv, PartIfsCatalog inData) { //公共参数 + Map returnMap = new HashMap<>(); String partNo = inData.getPartNo(); - //获取参数 - Map resultMap = MasterPartApi.getMasterPart(srv, partNo); - //判断是否存在 - if(null == resultMap) { - resultMap.put("resultCode", "400"); - resultMap.put("resultMsg", "当前物料件不存在!"); - }else{ - resultMap.put("resultCode", "200"); + try { + //获取参数 + Map resultMap = MasterPartApi.getMasterPart(srv, partNo); + //判断是否存在 + if (null == resultMap) { + throw new RuntimeException("当前物料件不存在!"); + } else { + //设置IFS信息 + //设置ifs 信息 + inData.setIfsRowId(resultMap.get("OBJID")); + inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + } + returnMap.put("resultCode", "200"); + returnMap.put("obj", JSON.toJSONString(inData)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); } - return resultMap; + return returnMap; } /** @@ -88,7 +98,7 @@ public class MasterServiceBean { * @date 2024/12/12 15:40 * @version 1.0 */ - public Map modifyPartCatalog(Server srv, PartIfsCatalog inData) throws APException { + public Map modifyPartCatalog(Server srv, PartIfsCatalog inData) { logger.info("Part Catalog 修改开始:"+JSON.toJSONString(inData)); //公共参数 Map returnMap = new HashMap<>(); @@ -124,7 +134,7 @@ public class MasterServiceBean { * @date 2024/12/12 15:40 * @version 1.0 */ - public Map removePartCatalog(Server srv, PartIfsCatalog inData) throws APException { + public Map removePartCatalog(Server srv, PartIfsCatalog inData) { logger.info("Part Catalog 删除开始:"+JSON.toJSONString(inData)); //公共参数 Map returnMap = new HashMap<>();