ifs jar代码提交

src/main/java/com/spring/ifs/api/BomApi.java

@@ -568,7 +568,7 @@ public class BomApi {
         inParam.put("COMPONENT_PART", componentPart); // 子零件
         inParam.put("QTY_PER_ASSEMBLY", qtyPerAssembly); // 单位用量
         if ("byProduct".equalsIgnoreCase(productFlag)) {
-            inParam.put("CONSUMPTION_ITEM", "Consumed"); // 消耗项目
+            inParam.put("CONSUMPTION_ITEM", consumptionItem); // 消耗项目
         }else {
             inParam.put("ISSUE_TYPE", issueType); // 生产属性
             inParam.put("CONSUMPTION_ITEM", consumptionItem); // 消耗项目
@@ -638,7 +638,7 @@ public class BomApi {
         inParam.put("QTY_PER_ASSEMBLY", qtyPerAssembly); // 单位用量
         inParam.put("COMPONENT_SCRAP", componentScrap); // 报废
         if ("byProduct".equalsIgnoreCase(productFlag)) {
-            inParam.put("CONSUMPTION_ITEM", "Consumed"); // 消耗项目
+            inParam.put("CONSUMPTION_ITEM", consumptionItem); // 消耗项目
         }else {
             inParam.put("ISSUE_TYPE", issueType); // 生产属性
             inParam.put("CONSUMPTION_ITEM", consumptionItem); // 消耗项目

src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java

@@ -300,13 +300,26 @@ public class ToolServiceImpl implements ToolService {
 
         if (controlFlag) {
             //2.校验存在调用接口
-            String toolURL = apiUrl + "/tool/ifs/modifyToolDataToIfs";
+           /* String toolURL = apiUrl + "/tool/ifs/modifyToolDataToIfs";
             ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, ifsToolData);
             if (!"200".equals(toolResponse.getCode())) {
                 throw new RuntimeException("IFS Tool修改异常：" + toolResponse.getMsg());
+            }*/
+
+            //获取当前操作的账号
+            String username = ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername();
+            SysUserEntity ifsUser = sysUserDao.selectOne(new QueryWrapper<SysUserEntity>().eq("username", username));
+            if (ifsUser == null || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsUsername()) || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsPassword())) {
+                throw new RuntimeException("获取用户的IFS账号密码为空值!");
             }
+            String ifsUsername = ifsUser.getIfsUsername();
+            String ifsPassword = ifsUser.getIfsPassword();
+            //获取链接
+            Server srv = ifsServer.getIfsServer(ifsUsername, ifsPassword);
+            //调用新的api方法
+            Map<String, String> returnMap = toolServiceBean.modifyToolHeader(srv, ifsToolData);
             // 更新 ifs_row_id ifs_row_version
-            String objStr = String.valueOf(toolResponse.getObj());
+            String objStr = String.valueOf(returnMap.get("obj"));
             ToolInfo ifsTool = JSON.parseObject(objStr, ToolInfo.class);
             inData.setIfsRowId(ifsTool.getIfsRowId());
             inData.setIfsRowVersion(ifsTool.getIfsRowVersion());