diff --git a/src/main/java/com/spring/ifs/bean/RecipeServiceBean.java b/src/main/java/com/spring/ifs/bean/RecipeServiceBean.java index 44e0257d..0259bdbb 100644 --- a/src/main/java/com/spring/ifs/bean/RecipeServiceBean.java +++ b/src/main/java/com/spring/ifs/bean/RecipeServiceBean.java @@ -533,7 +533,6 @@ public class RecipeServiceBean { return returnMap; } - /** * @description: 同步配方项目到IFS系统 * @author LR @@ -554,7 +553,7 @@ public class RecipeServiceBean { //查询结果集 List itemList = RecipeApi.getRecipeItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); // - if(itemList != null || itemList.size() > 0){ + if(itemList != null && itemList.size() > 0){ throw new APException("已存在此查Recipe组件信息!"); } //调用api diff --git a/src/main/java/com/spring/ifs/bean/RecipeServiceBeanTest.java b/src/main/java/com/spring/ifs/bean/RecipeServiceBeanTest.java index 12b88b83..6289efc6 100644 --- a/src/main/java/com/spring/ifs/bean/RecipeServiceBeanTest.java +++ b/src/main/java/com/spring/ifs/bean/RecipeServiceBeanTest.java @@ -570,6 +570,51 @@ public class RecipeServiceBeanTest { return returnMap; } + /** + * @description: 同步配方项目到IFS系统 + * @author LR + * @date 2024/12/30 15:12 + * @version 1.0 + */ + public Map syncRecipeItem(RecipeIfsItem inData) { + logger.info("Recipe替代明细新增开始:"+JSON.toJSONString(inData)); + //公共参数 + Map returnMap = new HashMap<>(); + String username = inData.getIfsUsername(); + String password = inData.getIfsPassword(); + String contract = inData.getContract(); + String partNo = inData.getPartNo(); + String engChgLevel = inData.getEngChgLevel(); + String bomType = inData.getBomType(); + String alternativeNo = inData.getAlternativeNo(); + String lineItemNo = inData.getLineItemNo(); + try{ + //获取连接 + Server srv = ifsServer.getIfsServer(username, password); + //查询结果集 + List itemList = RecipeApi.getRecipeItems(srv, contract, partNo, engChgLevel, bomType, alternativeNo, lineItemNo); + // + if(itemList != null || itemList.size() > 0){ + throw new APException("已存在此查Recipe组件信息!"); + } + //调用api + Map tempMap = RecipeApi.insertRecipeItem(srv, inData); + //设置ifs 信息 + inData.setIfsRowId(tempMap.get("OBJID")); + inData.setIfsRowVersion(tempMap.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("异常信息:"+e.getMessage()); + } + //打印日志 + logger.info("Recipe替代明细新增结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; + } + /** * @description: 修改查Recipe的明细 * @author LR diff --git a/src/main/java/com/spring/ifs/controller/TestIfsController.java b/src/main/java/com/spring/ifs/controller/TestIfsController.java index b1c5afb2..da519d3a 100644 --- a/src/main/java/com/spring/ifs/controller/TestIfsController.java +++ b/src/main/java/com/spring/ifs/controller/TestIfsController.java @@ -1979,6 +1979,21 @@ public class TestIfsController { return resultMap; } + @PostMapping("/syncRecipeItem") + public Object syncRecipeItem(@RequestBody RecipeIfsItem inData) throws APException { + Map resultMap = new HashMap(); + try { + Map returnMap = recipeServiceBean.syncRecipeItem(inData); + resultMap.put("returnMap", returnMap); + resultMap.put("code", 200); + resultMap.put("msg", "操作成功!"); + } catch (Exception e) { + resultMap.put("code", 400); + resultMap.put("msg", e.getMessage()); + } + return resultMap; + } + /** * @description: 修改Recipe Item 信息 * @author LR