diff --git a/src/main/java/com/spring/ifs/bean/MasterServiceBean.java b/src/main/java/com/spring/ifs/bean/MasterServiceBean.java index fe567cdd..744e4899 100644 --- a/src/main/java/com/spring/ifs/bean/MasterServiceBean.java +++ b/src/main/java/com/spring/ifs/bean/MasterServiceBean.java @@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.HashMap; import java.util.Map; /** @@ -39,7 +40,10 @@ public class MasterServiceBean { Map resultMap = MasterPartApi.getMasterPart(srv, partNo); //判断是否存在 if(null == resultMap) { - throw new RuntimeException("当前物料件不存在!"); + resultMap.put("resultCode", "400"); + resultMap.put("resultMsg", "当前物料件不存在!"); + }else{ + resultMap.put("resultCode", "200"); } return resultMap; } @@ -50,24 +54,32 @@ public class MasterServiceBean { * @date 2024/12/12 15:33 * @version 1.0 */ - public PartIfsCatalog syncPartCatalog(Server srv, PartIfsCatalog inData) throws APException { + public Map syncPartCatalog(Server srv, PartIfsCatalog inData) { 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) { - Map resultMap = MasterPartApi.insertMasterPart(srv, inData); - //设置ifs 信息 - inData.setIfsRowId(resultMap.get("OBJID")); - inData.setIfsRowVersion(resultMap.get("OBJVERSION")); - }else { - throw new RuntimeException("物料件已存在!"); + try{ + Map partMap = MasterPartApi.getMasterPart(srv, partNo); + //判断是否需要插入到ifs + if(partMap == null || partMap.size() == 0) { + Map resultMap = MasterPartApi.insertMasterPart(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("Part Catalog 新增结束:"+JSON.toJSONString(inData)); //返回结果集 - return inData; + return returnMap; } /**