工具的属性模版

src/main/java/com/spring/modules/Tooling/data/PartCatalog.java

@@ -0,0 +1,235 @@
+package com.spring.modules.Tooling.data;
+
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName: PartIfsCatalog
+ * @Description:物料目录
+ * @author: LR
+ * @date: 2023年12月22日 上午10:14:06
+ * @Copyright:
+ */
+public class PartCatalog {
+	private int id;//
+	private String contract;//
+	private String partNo;//
+	private String partDesc;//
+	private String unitCode;// 单位
+	private String partMainGroup;//
+	private String weightNet;
+	private String uomForWeightNet;
+	private String volumeNet;
+	private String uomForVolumeNet;
+	private String conditionCodeUsageDb;//
+	private String multilevelTrackingDb;//
+	private String allowAsNotConsumedDb;//
+	private String lotTrackingCode;
+	private String lotQuantityRule;//
+	private String subLotRule;//
+	private String componentLotRule;//
+	private String infoText;// 备注
+	private String createdBy;// 创建人
+	private Date createdDate;// 创建时间
+	private String ifsRowKey;
+	private String ifsRowId;
+	private String ifsRowVersion;
+	private String histType;// 类型
+	
+	public PartCatalog() {
+		super();
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getContract() {
+		return contract;
+	}
+
+	public void setContract(String contract) {
+		this.contract = contract;
+	}
+
+	public String getPartNo() {
+		return partNo;
+	}
+
+	public void setPartNo(String partNo) {
+		this.partNo = partNo;
+	}
+
+	public String getPartDesc() {
+		return partDesc;
+	}
+
+	public void setPartDesc(String partDesc) {
+		this.partDesc = partDesc;
+	}
+
+	public String getUnitCode() {
+		return unitCode;
+	}
+
+	public void setUnitCode(String unitCode) {
+		this.unitCode = unitCode;
+	}
+
+	public String getPartMainGroup() {
+		return partMainGroup;
+	}
+
+	public void setPartMainGroup(String partMainGroup) {
+		this.partMainGroup = partMainGroup;
+	}
+
+	public String getWeightNet() {
+		return weightNet;
+	}
+
+	public void setWeightNet(String weightNet) {
+		this.weightNet = weightNet;
+	}
+
+	public String getUomForWeightNet() {
+		return uomForWeightNet;
+	}
+
+	public void setUomForWeightNet(String uomForWeightNet) {
+		this.uomForWeightNet = uomForWeightNet;
+	}
+
+	public String getVolumeNet() {
+		return volumeNet;
+	}
+
+	public void setVolumeNet(String volumeNet) {
+		this.volumeNet = volumeNet;
+	}
+
+	public String getUomForVolumeNet() {
+		return uomForVolumeNet;
+	}
+
+	public void setUomForVolumeNet(String uomForVolumeNet) {
+		this.uomForVolumeNet = uomForVolumeNet;
+	}
+
+	public String getConditionCodeUsageDb() {
+		return conditionCodeUsageDb;
+	}
+
+	public void setConditionCodeUsageDb(String conditionCodeUsageDb) {
+		this.conditionCodeUsageDb = conditionCodeUsageDb;
+	}
+
+	public String getMultilevelTrackingDb() {
+		return multilevelTrackingDb;
+	}
+
+	public void setMultilevelTrackingDb(String multilevelTrackingDb) {
+		this.multilevelTrackingDb = multilevelTrackingDb;
+	}
+
+	public String getAllowAsNotConsumedDb() {
+		return allowAsNotConsumedDb;
+	}
+
+	public void setAllowAsNotConsumedDb(String allowAsNotConsumedDb) {
+		this.allowAsNotConsumedDb = allowAsNotConsumedDb;
+	}
+
+	public String getLotTrackingCode() {
+		return lotTrackingCode;
+	}
+
+	public void setLotTrackingCode(String lotTrackingCode) {
+		this.lotTrackingCode = lotTrackingCode;
+	}
+
+	public String getLotQuantityRule() {
+		return lotQuantityRule;
+	}
+
+	public void setLotQuantityRule(String lotQuantityRule) {
+		this.lotQuantityRule = lotQuantityRule;
+	}
+
+	public String getSubLotRule() {
+		return subLotRule;
+	}
+
+	public void setSubLotRule(String subLotRule) {
+		this.subLotRule = subLotRule;
+	}
+
+	public String getComponentLotRule() {
+		return componentLotRule;
+	}
+
+	public void setComponentLotRule(String componentLotRule) {
+		this.componentLotRule = componentLotRule;
+	}
+
+	public String getInfoText() {
+		return infoText;
+	}
+
+	public void setInfoText(String infoText) {
+		this.infoText = infoText;
+	}
+
+	public String getCreatedBy() {
+		return createdBy;
+	}
+
+	public void setCreatedBy(String createdBy) {
+		this.createdBy = createdBy;
+	}
+
+	public Date getCreatedDate() {
+		return createdDate;
+	}
+
+	public void setCreatedDate(Date createdDate) {
+		this.createdDate = createdDate;
+	}
+
+	public String getIfsRowKey() {
+		return ifsRowKey;
+	}
+
+	public void setIfsRowKey(String ifsRowKey) {
+		this.ifsRowKey = ifsRowKey;
+	}
+
+	public String getIfsRowId() {
+		return ifsRowId;
+	}
+
+	public void setIfsRowId(String ifsRowId) {
+		this.ifsRowId = ifsRowId;
+	}
+
+	public String getIfsRowVersion() {
+		return ifsRowVersion;
+	}
+
+	public void setIfsRowVersion(String ifsRowVersion) {
+		this.ifsRowVersion = ifsRowVersion;
+	}
+
+	public String getHistType() {
+		return histType;
+	}
+
+	public void setHistType(String histType) {
+		this.histType = histType;
+	}
+
+}

src/main/java/com/spring/modules/Tooling/data/TechnicalClass.java

@@ -0,0 +1,89 @@
+package com.spring.modules.Tooling.data;
+
+/**
+ * 
+ * @ClassName: TechnicalClass
+ * @Description:技术等级的参数
+ * @author: LR
+ * @date: 2024年10月23日 下午5:37:27
+ * @Copyright:
+ */
+public class TechnicalClass extends PartCatalog {
+	private String luName; //
+	private String keyRef; //
+	private String technicalSpecNo; //
+	private String technicalClass; //
+	private String okYesNo; //
+	private String okSign; //
+	private String dtOk; //
+	private String technicalType;// 区分类型 物料件 还是工具
+
+	public TechnicalClass() {
+		super();
+	}
+
+	public String getLuName() {
+		return luName;
+	}
+
+	public void setLuName(String luName) {
+		this.luName = luName;
+	}
+
+	public String getKeyRef() {
+		return keyRef;
+	}
+
+	public void setKeyRef(String keyRef) {
+		this.keyRef = keyRef;
+	}
+
+	public String getTechnicalSpecNo() {
+		return technicalSpecNo;
+	}
+
+	public void setTechnicalSpecNo(String technicalSpecNo) {
+		this.technicalSpecNo = technicalSpecNo;
+	}
+
+	public String getTechnicalClass() {
+		return technicalClass;
+	}
+
+	public void setTechnicalClass(String technicalClass) {
+		this.technicalClass = technicalClass;
+	}
+
+	public String getOkYesNo() {
+		return okYesNo;
+	}
+
+	public void setOkYesNo(String okYesNo) {
+		this.okYesNo = okYesNo;
+	}
+
+	public String getOkSign() {
+		return okSign;
+	}
+
+	public void setOkSign(String okSign) {
+		this.okSign = okSign;
+	}
+
+	public String getDtOk() {
+		return dtOk;
+	}
+
+	public void setDtOk(String dtOk) {
+		this.dtOk = dtOk;
+	}
+
+	public String getTechnicalType() {
+		return technicalType;
+	}
+
+	public void setTechnicalType(String technicalType) {
+		this.technicalType = technicalType;
+	}
+
+}

src/main/java/com/spring/modules/Tooling/data/TechnicalClassAttribute.java

@@ -0,0 +1,81 @@
+package com.spring.modules.Tooling.data;
+
+/**
+ * 
+ * @ClassName: TechnicalClassAttribute
+ * @Description:技术等级的属性
+ * @author: LR
+ * @date: 2024年10月24日 下午3:57:14
+ * @Copyright:
+ */
+public class TechnicalClassAttribute extends TechnicalClass {
+	private String attribute;
+	private String valueNo; //
+	private String valueText; //
+	private String lowerLimit; //
+	private String upperLimit; //
+	private String info; //
+	private String attributeType; // 属性类型 numeric alpha
+
+	public TechnicalClassAttribute() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	public String getAttribute() {
+		return attribute;
+	}
+
+	public void setAttribute(String attribute) {
+		this.attribute = attribute;
+	}
+
+	public String getValueNo() {
+		return valueNo;
+	}
+
+	public void setValueNo(String valueNo) {
+		this.valueNo = valueNo;
+	}
+
+	public String getValueText() {
+		return valueText;
+	}
+
+	public void setValueText(String valueText) {
+		this.valueText = valueText;
+	}
+
+	public String getLowerLimit() {
+		return lowerLimit;
+	}
+
+	public void setLowerLimit(String lowerLimit) {
+		this.lowerLimit = lowerLimit;
+	}
+
+	public String getUpperLimit() {
+		return upperLimit;
+	}
+
+	public void setUpperLimit(String upperLimit) {
+		this.upperLimit = upperLimit;
+	}
+
+	public String getInfo() {
+		return info;
+	}
+
+	public void setInfo(String info) {
+		this.info = info;
+	}
+
+	public String getAttributeType() {
+		return attributeType;
+	}
+
+	public void setAttributeType(String attributeType) {
+		this.attributeType = attributeType;
+	}
+
+}

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

@@ -1,10 +1,9 @@
 package com.spring.modules.Tooling.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.spring.modules.Tooling.data.IfsToolData;
+import com.spring.modules.Tooling.dao.BaseConfigDao;
+import com.spring.modules.Tooling.data.*;
 import com.spring.modules.Tooling.dao.ToolDao;
-import com.spring.modules.Tooling.data.IfsToolInstanceData;
-import com.spring.modules.Tooling.data.IfsToolInstanceDateData;
 import com.spring.modules.Tooling.entity.IfsTool;
 import com.spring.modules.Tooling.entity.IfsToolInstance;
 import com.spring.modules.Tooling.entity.IfsToolInstanceDate;
@@ -37,6 +36,8 @@ public class ToolServiceImpl implements ToolService {
     private ToolDao toolDao;
     @Autowired
     private ProcedureDao procedureDao;
+    @Autowired
+    private BaseConfigDao baseConfigDao;
 
     @Value("${ifs-api.api-url}")
     private String apiUrl;
@@ -153,9 +154,67 @@ public class ToolServiceImpl implements ToolService {
             if (!"200".equals(toolResponse.getCode())) {
                 throw new RuntimeException("IFS ToolInstance新增异常：" + toolResponse.getMsg());
             }
+
+            //2.调用api处理属性部分的api数据
+            if(propertyNo != null && !propertyNo.equals("")){
+                //调用方法  传工具的属性
+                try {
+                    this.syncIfsToolInfoPropertyTemplate(site, toolId, propertyNo);
+                } catch(Exception e){
+                    //1.调用删除的api
+                    this.removeIfsToolInfo(ifsToolData);
+                    throw new RuntimeException("IFS Tool新增异常：" + e.getMessage());
+                }
+            }
         }
     }
 
+    /**
+    * @description: 删除IFS的工具信息
+    * @author LR
+    * @date 2024/10/29 14:17
+    * @version 1.0
+    */
+    public void removeIfsToolInfo(IfsToolData ifsTool){
+        //调用api删除上面方法传过去的工具信息
+        String toolURL = apiUrl + "/tool/ifs/removeToolDataToIfs";
+        ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, ifsTool);
+        if (!"200".equals(toolResponse.getCode())) {
+            throw new RuntimeException("IFS Tool删除异常：" + toolResponse.getMsg());
+        }
+    }
+
+    /**
+    * @description: 调用新增工具的属性模版
+    * @author LR
+    * @date 2024/10/28 13:59
+    * @version 1.0
+    */
+    public void syncIfsToolInfoPropertyTemplate(String site, String toolId, String propertyNo) {
+        //查询ifs的使用的账号
+        BaseConfigData baseConfig = baseConfigDao.getBaseConfigBySiteAndType("ALL", "tool", "default_ifs_account");
+        String okSign = baseConfig.getBaseData();
+        TechnicalClass technicalClass = new TechnicalClass();
+        String keyRef = "CONTRACT="+site+"^TOOL_ID="+toolId+"^";
+        String dtOk = DateUtils.getStringDate(new Date(), "yyyy-MM-dd");
+        technicalClass.setLuName("ManufTool");
+        technicalClass.setKeyRef(keyRef);
+        technicalClass.setTechnicalSpecNo("0");
+        technicalClass.setTechnicalClass(propertyNo);
+        technicalClass.setOkYesNo("Not Approved");
+        technicalClass.setOkSign(okSign);
+        technicalClass.setDtOk(dtOk);
+        //调用ifs的api
+        String toolURL = apiUrl + "/technical/class/syncTechnicalClass";
+        ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, technicalClass);
+        if (!"200".equals(toolResponse.getCode())) {
+            throw new RuntimeException("IFS Tool新增异常：" + toolResponse.getMsg());
+        }
+        // 更新 ifs_row_id ifs_row_version
+        String objStr = String.valueOf(toolResponse.getObj());
+        TechnicalClass ifsTool = JSON.parseObject(objStr, TechnicalClass.class);
+    }
+
     /**
     * @description: 调用存储过程  校验工具新增
     * @author LR
@@ -232,12 +291,72 @@ public class ToolServiceImpl implements ToolService {
         if(rawPropertyNo == null){
             rawPropertyNo = "";
         }
+        //判断是否调用
+        if(controlFlag){
+            //判断各种类型
+            //1.原值不存在 新值存在
+            if("".equals(rawPropertyNo) && !rawPropertyNo.equals(propertyNo)){
+                this.syncIfsToolInfoPropertyTemplate(site, toolId, propertyNo);
+            }else if ("".equals(rawPropertyNo) && rawPropertyNo.equals(propertyNo)){
+                //无需新增或者修改
+            }else if(!"".equals(rawPropertyNo) && !"".equals(propertyNo) && !rawPropertyNo.equals(propertyNo)){
+                //需要调用修改的接口即可
+                this.modifyIfsToolInfoPropertyTemplate(site, toolId, propertyNo);
+            }else if(!"".equals(rawPropertyNo) && "".equals(propertyNo)){
+                //需要调用删除的接口即可
+                this.removeIfsToolInfoPropertyTemplate(site, toolId);
+            }
+        }
         //3.调用存储过程处理 工具的属性模版数据
         this.processToolInfoPropertyTemplate(site, toolId, rawPropertyNo, propertyNo, 0);
         //4.调用方法保存当前的数据
         toolDao.updateToolInfo(inData);
     }
 
+    /**
+    * @description: 调用api的接口删除属性的模版
+    * @author LR
+    * @date 2024/10/28 14:44
+    * @version 1.0
+    */
+    public void removeIfsToolInfoPropertyTemplate(String site, String toolId) {
+        //查询ifs的使用的账号
+        TechnicalClass technicalClass = new TechnicalClass();
+        String keyRef = "CONTRACT="+site+"^TOOL_ID="+toolId+"^";
+        technicalClass.setLuName("ManufTool");
+        technicalClass.setKeyRef(keyRef);
+        //调用ifs的api
+        String toolURL = apiUrl + "/technical/class/removeTechnicalClass";
+        ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, technicalClass);
+        if (!"200".equals(toolResponse.getCode())) {
+            throw new RuntimeException("IFS Tool新增异常：" + toolResponse.getMsg());
+        }
+    }
+
+    /**
+    * @description: 调用api的接口
+    * @author LR
+    * @date 2024/10/28 14:42
+    * @version 1.0
+    */
+    public void modifyIfsToolInfoPropertyTemplate(String site, String toolId, String propertyNo) {
+        //查询ifs的使用的账号
+        TechnicalClass technicalClass = new TechnicalClass();
+        String keyRef = "CONTRACT="+site+"^TOOL_ID="+toolId+"^";
+        technicalClass.setLuName("ManufTool");
+        technicalClass.setKeyRef(keyRef);
+        technicalClass.setTechnicalClass(propertyNo);
+        //调用ifs的api
+        String toolURL = apiUrl + "/technical/class/modifyTechnicalClass";
+        ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, technicalClass);
+        if (!"200".equals(toolResponse.getCode())) {
+            throw new RuntimeException("IFS Tool新增异常：" + toolResponse.getMsg());
+        }
+        // 更新 ifs_row_id ifs_row_version
+        String objStr = String.valueOf(toolResponse.getObj());
+        TechnicalClass ifsTool = JSON.parseObject(objStr, TechnicalClass.class);
+    }
+
     /**
     * @description: 调用存储过程处理 工具的属性模版数据
     * @author LR
@@ -303,13 +422,8 @@ public class ToolServiceImpl implements ToolService {
         //属性拷贝
         BeanUtils.copyProperties(inData, ifsToolData);
         if (controlFlag) {
-            //2.校验存在调用接口
-            //判断是否存在替代的
-            String toolURL = apiUrl + "/tool/ifs/removeToolDataToIfs";
-            ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, ifsToolData);
-            if (!"200".equals(toolResponse.getCode())) {
-                throw new RuntimeException("IFS Tool删除异常：" + toolResponse.getMsg());
-            }
+            //1.校验删除调用接口
+           this.removeIfsToolInfo(ifsToolData);
         }
         //3.调用方法保存当前的数据
         toolDao.deleteToolInfo(inData);
@@ -392,6 +506,45 @@ public class ToolServiceImpl implements ToolService {
             //设置版本号
             inData.setIfsRowId(ifsTool.getIfsRowId());
             inData.setIfsRowVersion(ifsTool.getIfsRowVersion());
+
+            //2.调用api处理工具实例部分的属性数据
+            if(propertyNo != null && !propertyNo.equals("")){
+                try {
+                    this.syncIfsToolInstancePropertyTemplate(site, toolId, toolInstance, propertyNo);
+                } catch (Exception e){
+                    //2.调用IFS API接口
+                    this.removeIfsToolInstance(toolInstanceData);
+                    throw new RuntimeException(e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+    * @description: 同步库工具实例的属性
+    * @author LR
+    * @date 2024/10/29 16:32
+    * @version 1.0
+    */
+    public void syncIfsToolInstancePropertyTemplate(String site, String toolId, String toolInstance, String propertyNo) {
+        //查询ifs的使用的账号
+        BaseConfigData baseConfig = baseConfigDao.getBaseConfigBySiteAndType("ALL", "tool_instance", "default_ifs_account");
+        String okSign = baseConfig.getBaseData();
+        TechnicalClass technicalClass = new TechnicalClass();
+        String keyRef = "CONTRACT="+site+"^TOOL_ID="+toolId+"^TOOL_INSTANCE="+toolInstance+"^";
+        String dtOk = DateUtils.getStringDate(new Date(), "yyyy-MM-dd");
+        technicalClass.setLuName("ManufToolDetail");
+        technicalClass.setKeyRef(keyRef);
+        technicalClass.setTechnicalSpecNo("0");
+        technicalClass.setTechnicalClass(propertyNo);
+        technicalClass.setOkYesNo("Not Approved");
+        technicalClass.setOkSign(okSign);
+        technicalClass.setDtOk(dtOk);
+        //调用ifs的api
+        String toolURL = apiUrl + "/technical/class/syncTechnicalClass";
+        ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, technicalClass);
+        if (!"200".equals(toolResponse.getCode())) {
+            throw new RuntimeException("IFS Tool新增异常：" + toolResponse.getMsg());
         }
     }
 
@@ -495,12 +648,72 @@ public class ToolServiceImpl implements ToolService {
         if(rawPropertyNo == null){
             rawPropertyNo = "";
         }
+        //判断是否调用
+        if(controlFlag){
+            //判断各种类型
+            //1.原值不存在 新值存在
+            if("".equals(rawPropertyNo) && !rawPropertyNo.equals(propertyNo)){
+                this.syncIfsToolInstancePropertyTemplate(site, toolId, toolInstance, propertyNo);
+            }else if ("".equals(rawPropertyNo) && rawPropertyNo.equals(propertyNo)){
+                //无需新增或者修改
+            }else if(!"".equals(rawPropertyNo) && !"".equals(propertyNo) && !rawPropertyNo.equals(propertyNo)){
+                //需要调用修改的接口即可
+                this.modifyIfsToolInstancePropertyTemplate(site, toolId, toolInstance, propertyNo);
+            }else if(!"".equals(rawPropertyNo) && "".equals(propertyNo)){
+                //需要调用删除的接口即可
+                this.removeIfsToolInstancePropertyTemplate(site, toolId, toolInstance);
+            }
+        }
         //3.调用存储过程处理 工具的属性模版数据
         this.processToolInstancePropertyTemplate(site, toolId, toolInstance, rawPropertyNo, propertyNo, 0);
         //4.调用方法保存当前的数据
         toolDao.updateToolInstance(inData);
     }
 
+    /**
+    * @description: 删除工具实例下的属性模版
+    * @author LR
+    * @date 2024/10/29 17:38
+    * @version 1.0
+    */
+    public void removeIfsToolInstancePropertyTemplate(String site, String toolId, String toolInstance) {
+        //查询ifs的使用的账号
+        TechnicalClass technicalClass = new TechnicalClass();
+        String keyRef = "CONTRACT="+site+"^TOOL_ID="+toolId+"^TOOL_INSTANCE="+toolInstance+"^";
+        technicalClass.setLuName("ManufToolDetail");
+        technicalClass.setKeyRef(keyRef);
+        //调用ifs的api
+        String toolURL = apiUrl + "/technical/class/removeTechnicalClass";
+        ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, technicalClass);
+        if (!"200".equals(toolResponse.getCode())) {
+            throw new RuntimeException("IFS Tool新增异常：" + toolResponse.getMsg());
+        }
+    }
+
+    /**
+    * @description: 修改工具实例的属性模版
+    * @author LR
+    * @date 2024/10/29 17:29
+    * @version 1.0
+    */
+    public void modifyIfsToolInstancePropertyTemplate(String site, String toolId, String toolInstance, String propertyNo) {
+        //查询ifs的使用的账号
+        TechnicalClass technicalClass = new TechnicalClass();
+        String keyRef = "CONTRACT="+site+"^TOOL_ID="+toolId+"^TOOL_INSTANCE="+toolInstance+"^";
+        technicalClass.setLuName("ManufToolDetail");
+        technicalClass.setKeyRef(keyRef);
+        technicalClass.setTechnicalClass(propertyNo);
+        //调用ifs的api
+        String toolURL = apiUrl + "/technical/class/modifyTechnicalClass";
+        ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, technicalClass);
+        if (!"200".equals(toolResponse.getCode())) {
+            throw new RuntimeException("IFS Tool新增异常：" + toolResponse.getMsg());
+        }
+        // 更新 ifs_row_id ifs_row_version
+        String objStr = String.valueOf(toolResponse.getObj());
+        TechnicalClass ifsTool = JSON.parseObject(objStr, TechnicalClass.class);
+    }
+
     /**
     * @description: 调用存储过程修改工具实例
     * @author LR
@@ -538,21 +751,32 @@ public class ToolServiceImpl implements ToolService {
         inData.setState("Active");
         //1.校验是否可以删除 目前不用校验
 
-        toolInstanceData = new IfsToolInstanceDateData();
+        toolInstanceData = new IfsToolInstanceData();
         //拷贝属性 设置参数
         BeanUtils.copyProperties(inData, toolInstanceData);
 
         if (controlFlag) {
-            //2.校验存在调用接口
+            //2.调用IFS API接口
+            this.removeIfsToolInstance(toolInstanceData);
+        }
+        //2.调用方法保存当前的数据
+        toolDao.deleteToolInstance(inData);
+    }
+
+    /**
+     * @description: 删除IFS的工具信息
+     * @author LR
+     * @date 2024/10/29 14:17
+     * @version 1.0
+     */
+    public void removeIfsToolInstance(IfsToolInstanceData ifsTool){
         String toolURL = apiUrl + "/tool/ifs/removeToolInstanceToIfs";
-            ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, toolInstanceData);
+        ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, ifsTool);
         if (!"200".equals(toolResponse.getCode())) {
             throw new RuntimeException("IFS ToolInstance删除异常：" + toolResponse.getMsg());
         }
     }
-        //2.调用方法保存当前的数据
-        toolDao.deleteToolInstance(inData);
-    }
+
 
     @Override
     @Transactional