diff --git a/src/main/java/com/spring/ifs/bean/RoutingServiceBeanTest.java b/src/main/java/com/spring/ifs/bean/RoutingServiceBeanTest.java index 53030129..90e9dbfe 100644 --- a/src/main/java/com/spring/ifs/bean/RoutingServiceBeanTest.java +++ b/src/main/java/com/spring/ifs/bean/RoutingServiceBeanTest.java @@ -2,8 +2,13 @@ package com.spring.ifs.bean; import com.alibaba.fastjson.JSON; import com.spring.ifs.api.IfsServer; +import com.spring.ifs.api.RoutingApi; import com.spring.ifs.api.RoutingApiTest; import com.spring.ifs.data.*; +import com.spring.modules.part.entity.APIEntity.RoutingIfsGuideLine; +import com.spring.modules.part.entity.APIEntity.RoutingIfsHeader; +import com.spring.modules.part.entity.APIEntity.RoutingIfsItem; +import com.spring.modules.part.entity.APIEntity.RoutingIfsTool; import ifs.fnd.ap.APException; import ifs.fnd.ap.Server; import org.slf4j.Logger; @@ -901,6 +906,110 @@ public class RoutingServiceBeanTest { return returnMap; } + /** + * @description: 查询工艺路线的组件信息 + * @author LR + * @date 2025/5/21 15:59 + * @version 1.0 + */ + public Map getRoutingItemsWithCopyPart(RoutingIfsHeader inData) { + //公共参数 + Map returnMap = new HashMap<>(); + String username = inData.getIfsUsername(); + String password = inData.getIfsPassword(); + String contract = inData.getContract(); + String partNo = inData.getPartNo(); + try{ + //获取连接 + Server srv = ifsServer.getIfsServer(username, password); + //查询结果集 + List resultList = RoutingApi.getRoutingItemsWithCopyPart(srv, contract, partNo); + //判断是否查询数据 + if(resultList.isEmpty()) { + throw new APException("不存在此Routing组件信息!"); + } + returnMap.put("resultCode", "200"); + //打印日志 + logger.info("Routing 明细查询数据:"+JSON.toJSONString(inData)); + returnMap.put("obj", JSON.toJSONString(resultList)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); + logger.info("异常信息:"+e.getMessage()); + } + //打印日志 + logger.info("Routing替代明细集合结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; + } + + /** + * @description: copy part 使用的方法 + * @author LR + * @date 2025/5/21 16:01 + * @version 1.0 + */ + public Map getRoutingToolsWithCopyPart(RoutingIfsHeader inData) { + logger.info("Routing Tools查询开始:"+JSON.toJSONString(inData)); + //公共参数 + Map returnMap = new HashMap<>(); + String username = inData.getIfsUsername(); + String password = inData.getIfsPassword(); + String contract = inData.getContract(); + String partNo = inData.getPartNo(); + try{ + //获取连接 + Server srv = ifsServer.getIfsServer(username, password); + //循环处理 + List resultList = RoutingApi.getRoutingToolsWithCopyPart(srv, contract, partNo); + returnMap.put("resultCode", "200"); + logger.info("Routing Tools查询到数据:"+JSON.toJSONString(inData)); + returnMap.put("obj", JSON.toJSONString(resultList)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); + logger.info("异常信息:"+e.getMessage()); + } + //打印日志 + logger.info("Routing Tools查询结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; + } + + + /** + * @description: copy part 使用的方法 + * @author LR + * @date 2025/5/21 16:05 + * @version 1.0 + */ + public Map getRoutingGuideLinesWithCopyPart(RoutingIfsHeader inData) { + logger.info("Routing GuideLines查询开始:"+JSON.toJSONString(inData)); + //公共参数 + Map returnMap = new HashMap<>(); + String username = inData.getIfsUsername(); + String password = inData.getIfsPassword(); + String contract = inData.getContract(); + String partNo = inData.getPartNo(); + try{ + //获取连接 + Server srv = ifsServer.getIfsServer(username, password); + //循环处理 + List resultList = RoutingApi.getRoutingGuideLinesWithCopyPart(srv, contract, partNo); + returnMap.put("resultCode", "200"); + logger.info("Routing GuideLines查询到数据:"+JSON.toJSONString(inData)); + returnMap.put("obj", JSON.toJSONString(resultList)); + } catch(APException e){ + returnMap.put("resultCode", "400"); + returnMap.put("resultMsg", e.getMessage()); + logger.info("异常信息:"+e.getMessage()); + } + //打印日志 + logger.info("Routing GuideLines查询结束:"+JSON.toJSONString(inData)); + //返回结果集 + return returnMap; + } + diff --git a/src/main/java/com/spring/ifs/controller/TestIfsController.java b/src/main/java/com/spring/ifs/controller/TestIfsController.java index 7bd30cbd..0c137ff4 100644 --- a/src/main/java/com/spring/ifs/controller/TestIfsController.java +++ b/src/main/java/com/spring/ifs/controller/TestIfsController.java @@ -2,12 +2,10 @@ package com.spring.ifs.controller; import com.spring.ifs.bean.*; import com.spring.ifs.data.*; +import com.spring.ifs.data.CopyPart; import com.spring.modules.base.entity.WorkCenterCost; import com.spring.modules.base.vo.PersonnelLevelVo; -import com.spring.modules.part.entity.APIEntity.PartIfsInventory; -import com.spring.modules.part.entity.APIEntity.RecipeIfsAlternative; -import com.spring.modules.part.entity.APIEntity.RecipeIfsHeader; -import com.spring.modules.part.entity.APIEntity.RecipeIfsItem; +import com.spring.modules.part.entity.APIEntity.*; import com.spring.modules.sys.service.CheckLdapDirectory; import ifs.fnd.ap.APException; import org.springframework.beans.factory.ListableBeanFactory; @@ -2175,5 +2173,72 @@ public class TestIfsController { } + /** + * @description: 获取copy part 后的routing item集合信息 + * @author LR + * @date 2025/5/22 13:19 + * @version 1.0 + */ + @PostMapping(value = "/getRoutingItemsWithCopyPart") + public Object getRoutingItemsWithCopyPart(@RequestBody RoutingIfsHeader inData) { + Map resultMap = new HashMap(); + try { + Map returnMap = routingServiceBean.getRoutingItemsWithCopyPart(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: 获取copy part 后的routing tool集合信息 + * @author LR + * @date 2025/5/22 13:19 + * @version 1.0 + */ + @PostMapping(value = "/getRoutingToolsWithCopyPart") + public Object getRoutingToolsWithCopyPart(@RequestBody RoutingIfsHeader inData) { + Map resultMap = new HashMap(); + try { + Map returnMap = routingServiceBean.getRoutingToolsWithCopyPart(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: 获取copy part 后的routing GuideLine集合信息 + * @author LR + * @date 2025/5/22 13:19 + * @version 1.0 + */ + @PostMapping(value = "/getRoutingGuideLinesWithCopyPart") + public Object getRoutingGuideLinesWithCopyPart(@RequestBody RoutingIfsHeader inData) { + Map resultMap = new HashMap(); + try { + Map returnMap = routingServiceBean.getRoutingGuideLinesWithCopyPart(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; + } + + + + } \ No newline at end of file diff --git a/src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsHeader.java b/src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsHeader.java index 0b1a364e..e08a5ace 100644 --- a/src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsHeader.java +++ b/src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsHeader.java @@ -69,6 +69,8 @@ public class RoutingIfsHeader { * */ private RoutingIfsAlternative routingIfsAlternative; + private String ifsUsername; + private String ifsPassword; public RoutingIfsHeader(RoutingAllFieldEntity data) { this.contract = data.getSite();