diff --git a/src/main/java/com/spring/ifs/bean/MasterServiceBean.java b/src/main/java/com/spring/ifs/bean/MasterServiceBean.java index 744e4899..c31eb2ab 100644 --- a/src/main/java/com/spring/ifs/bean/MasterServiceBean.java +++ b/src/main/java/com/spring/ifs/bean/MasterServiceBean.java @@ -88,26 +88,34 @@ public class MasterServiceBean { * @date 2024/12/12 15:40 * @version 1.0 */ - public PartIfsCatalog modifyPartCatalog(Server srv, PartIfsCatalog inData) throws APException { + public Map modifyPartCatalog(Server srv, PartIfsCatalog inData) throws APException { logger.info("Part Catalog 修改开始:"+JSON.toJSONString(inData)); //公共参数 + Map returnMap = new HashMap<>(); String partNo = inData.getPartNo(); - //查询数据 - Map partMap = MasterPartApi.getMasterPart(srv, partNo); - //判断是否需要插入到ifs - if(partMap == null && partMap.size() == 0) { - throw new RuntimeException("物料件不存在!"); - }else { - //设置ifs 信息 - inData.setIfsRowId(partMap.get("IFSROWID")); - inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); - Map resultMap = MasterPartApi.modifyMasterPart(srv, inData); - //设置ifs 信息 - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); + try { + //查询数据 + Map partMap = MasterPartApi.getMasterPart(srv, partNo); + //判断是否需要插入到ifs + if (partMap == null && partMap.size() == 0) { + throw new RuntimeException("物料件不存在!"); + } else { + //设置ifs 信息 + inData.setIfsRowId(partMap.get("IFSROWID")); + inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); + Map resultMap = MasterPartApi.modifyMasterPart(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("Part Catalog 修改结束:"+JSON.toJSONString(inData)); //返回结果集 - return inData; + return returnMap; } /** @@ -116,22 +124,32 @@ public class MasterServiceBean { * @date 2024/12/12 15:40 * @version 1.0 */ - public void removePartCatalog(Server srv, PartIfsCatalog inData) throws APException { + public Map removePartCatalog(Server srv, PartIfsCatalog inData) throws APException { logger.info("Part Catalog 删除开始:"+JSON.toJSONString(inData)); //公共参数 + Map returnMap = new HashMap<>(); String partNo = inData.getPartNo(); //查询数据 - Map partMap = MasterPartApi.getMasterPart(srv, partNo); - //判断是否需要插入到ifs - if(partMap == null && partMap.size() == 0) { - throw new RuntimeException("物料件不存在!"); - }else { - //设置ifs 信息 - inData.setIfsRowId(partMap.get("IFSROWID")); - inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); - MasterPartApi.removeMasterPart(srv, inData); + try{ + Map partMap = MasterPartApi.getMasterPart(srv, partNo); + //判断是否需要插入到ifs + if(partMap == null && partMap.size() == 0) { + throw new RuntimeException("物料件不存在!"); + }else { + //设置ifs 信息 + inData.setIfsRowId(partMap.get("IFSROWID")); + inData.setIfsRowVersion(partMap.get("IFSROWVERSION")); + MasterPartApi.removeMasterPart(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("Part Catalog 删除结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; }