diff --git a/src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java b/src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java index 0c0418f4..251a2cde 100644 --- a/src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java +++ b/src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java @@ -156,6 +156,7 @@ public class ToolDaoImpl implements ToolDao { StringBuilder sql = new StringBuilder(); sql.append("UPDATE tool_header SET tool_description = :toolDesc, c_tool_type = :toolType, c_calendar_id = :calendarId,"); sql.append(" c_sched_capacity = :schedCapacity, c_calibration_control = :calibrationControl, c_calibration_time = :calibrationTime, c_alternate_tool_id = :alternateToolId,"); + sql.append(" ifs_row_id = :ifsRowId, ifs_row_version = :ifsRowVersion,"); sql.append(" c_last_used = :lastUsed, last_update_by = :username, c_enabled_for_control_plan_db = :enabledForControlPlanDb, c_note_text = :noteText"); sql.append(" WHERE site = :site AND tool_id = :toolId"); return parameterJdbcTemplate.update(sql.toString(), new BeanPropertySqlParameterSource(inData)); diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java index cb834be5..fbb88e6e 100644 --- a/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java +++ b/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java @@ -186,10 +186,16 @@ public class ToolServiceImpl implements ToolService { String resultMsg = String.valueOf(resultMap.get("result_msg")); throw new RuntimeException(resultMsg); } + inData.setState("Active"); + inData.setCreateDate(new Date()); + //对象拷贝 + IfsToolData ifsToolData = new IfsToolData(); + //属性拷贝 + BeanUtils.copyProperties(inData, ifsToolData); - /* //2.校验存在调用接口 + //2.校验存在调用接口 String toolURL = apiUrl + "/tool/ifs/modifyToolDataToIfs"; - ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, inData); + ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, ifsToolData); if (!"200".equals(toolResponse.getCode())) { throw new RuntimeException("IFS Tool修改异常:" + toolResponse.getMsg()); } @@ -197,7 +203,7 @@ public class ToolServiceImpl implements ToolService { String objStr = String.valueOf(toolResponse.getObj()); IfsToolData ifsTool = JSON.parseObject(objStr, IfsToolData.class); inData.setIfsRowId(ifsTool.getIfsRowId()); - inData.setIfsRowVersion(ifsTool.getIfsRowVersion());*/ + inData.setIfsRowVersion(ifsTool.getIfsRowVersion()); //2.调用方法保存当前的数据 toolDao.updateToolInfo(inData); } @@ -241,13 +247,19 @@ public class ToolServiceImpl implements ToolService { String resultMsg = String.valueOf(resultMap.get("result_msg")); throw new RuntimeException(resultMsg); } + inData.setState("Active"); + inData.setCreateDate(new Date()); + //对象拷贝 + IfsToolData ifsToolData = new IfsToolData(); + //属性拷贝 + BeanUtils.copyProperties(inData, ifsToolData); //2.校验存在调用接口 - /*//判断是否存在替代的 + //判断是否存在替代的 String toolURL = apiUrl + "/tool/ifs/removeToolDataToIfs"; - ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, inData); + ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, ifsToolData); if (!"200".equals(toolResponse.getCode())) { throw new RuntimeException("IFS Tool删除异常:" + toolResponse.getMsg()); - }*/ + } //3.调用方法保存当前的数据 toolDao.deleteToolInfo(inData); toolDao.deleteToolInstanceByTool(inData);