From 7e169b815185a1c6be70c55230b030e926aee484 Mon Sep 17 00:00:00 2001 From: DouDou <877258667@qq.com> Date: Fri, 6 Sep 2024 16:41:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=AE=9E=E4=BE=8BIFS?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/Tooling/dao/impl/ToolDaoImpl.java | 5 ++- .../Tooling/data/IfsToolInstanceData.java | 10 +++++ .../Tooling/service/impl/ToolServiceImpl.java | 40 +++++++++++++------ 3 files changed, 40 insertions(+), 15 deletions(-) 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 251a2cde..68a8adc5 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 @@ -175,10 +175,10 @@ public class ToolDaoImpl implements ToolDao { StringBuilder sql = new StringBuilder(); sql.append("INSERT INTO tool_detail(site, tool_id, tool_instance_id, work_center_no, c_desc, c_last_calibration_date,"); sql.append(" c_object_id, c_normal_production_line, c_note_text, c_tool_discrimination, c_tool_linearity, c_tool_repeatability, c_tool_bias, c_tool_stability,"); - sql.append(" c_tool_reproducibility, c_next_calibration_date, c_state)"); + sql.append(" c_tool_reproducibility, c_next_calibration_date, c_state, ifs_row_id, ifs_row_version)"); sql.append(" VALUES(:site, :toolId, :toolInstance, :normalWorkCenterNo, :description, :lastCalibrationDate,"); sql.append(" :objectId, :normalProductionLine, :noteText, :toolDiscrimination, :toolLinearity, :toolRepeatability, :toolBias, :toolStability,"); - sql.append(" :toolReproducibility, :nextCalibrationDate, :state)"); + sql.append(" :toolReproducibility, :nextCalibrationDate, :state, :ifsRowId, :ifsRowVersion)"); parameterJdbcTemplate.update(sql.toString(), new BeanPropertySqlParameterSource(inData)); } @@ -189,6 +189,7 @@ public class ToolDaoImpl implements ToolDao { sql.append(" c_next_calibration_date = :nextCalibrationDate, c_state = :state,"); sql.append(" c_object_id = :objectId, c_normal_production_line = :normalProductionLine, c_note_text = :noteText, c_tool_discrimination = :toolDiscrimination,"); sql.append(" c_tool_linearity = :toolLinearity, c_tool_repeatability = :toolRepeatability, c_tool_bias = :toolBias,"); + sql.append(" ifs_row_id = :ifsRowId, ifs_row_version = :ifsRowVersion,"); sql.append(" c_tool_stability = :toolStability, c_tool_reproducibility = :toolReproducibility"); sql.append(" WHERE site = :site AND tool_id = :toolId AND tool_instance_id = :toolInstance"); return parameterJdbcTemplate.update(sql.toString(), new BeanPropertySqlParameterSource(inData)); diff --git a/src/main/java/com/spring/modules/Tooling/data/IfsToolInstanceData.java b/src/main/java/com/spring/modules/Tooling/data/IfsToolInstanceData.java index cafeb8da..a5019eaa 100644 --- a/src/main/java/com/spring/modules/Tooling/data/IfsToolInstanceData.java +++ b/src/main/java/com/spring/modules/Tooling/data/IfsToolInstanceData.java @@ -3,6 +3,7 @@ package com.spring.modules.Tooling.data; public class IfsToolInstanceData extends IfsToolData { private String toolInstance; private String description; + private String desc; private String lastCalibrationDate; private String nextCalibrationDate;// private String objectId; @@ -42,6 +43,15 @@ public class IfsToolInstanceData extends IfsToolData { public void setDescription(String description) { this.description = description; + this.desc = description; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; } public String getNormalWorkCenterDesc() { 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 fbb88e6e..d63df674 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 @@ -309,6 +309,8 @@ public class ToolServiceImpl implements ToolService { } //2.校验存在调用接口 toolInstanceData = new IfsToolInstanceDateData(); + inData.setCreateDate(new Date()); + inData.setState("Active"); //拷贝属性 设置参数 BeanUtils.copyProperties(inData, toolInstanceData); String lastCalibrationTime = ""; @@ -318,16 +320,17 @@ public class ToolServiceImpl implements ToolService { } toolInstanceData.setLastCalibrationDate(lastCalibrationTime); - /*//2.校验存在调用接口 + //2.校验存在调用接口 String toolURL = apiUrl + "/tool/ifs/syncToolInstanceToIfs"; - ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, inData); + ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, toolInstanceData); if (!"200".equals(toolResponse.getCode())) { throw new RuntimeException("IFS ToolInstance新增异常：" + toolResponse.getMsg()); } String objStr = String.valueOf(toolResponse.getObj()); - IfsToolData ifsTool = JSON.parseObject(objStr, IfsToolData.class);*/ - inData.setCreateDate(new Date()); - inData.setState("Active"); + IfsToolData ifsTool = JSON.parseObject(objStr, IfsToolData.class); + //设置版本号 + inData.setIfsRowId(ifsTool.getIfsRowId()); + inData.setIfsRowVersion(ifsTool.getIfsRowVersion()); //2.调用方法保存当前的数据 toolDao.insertToolInstance(inData); } @@ -377,6 +380,8 @@ public class ToolServiceImpl implements ToolService { String resultMsg = String.valueOf(resultMap.get("result_msg")); throw new RuntimeException(resultMsg); } + inData.setCreateDate(new Date()); + inData.setState("Active"); toolInstanceData = new IfsToolInstanceDateData(); //拷贝属性 设置参数 @@ -387,16 +392,19 @@ public class ToolServiceImpl implements ToolService { inData.setNextCalibrationDate(lastCalibrationDate); } toolInstanceData.setLastCalibrationDate(lastCalibrationTime); - /* //2.校验存在调用接口 + inData.setCreateDate(new Date()); + inData.setState("Active"); + //2.校验存在调用接口 String toolURL = apiUrl + "/tool/ifs/modifyToolInstanceToIfs"; - ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, inData); + ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, toolInstanceData); if (!"200".equals(toolResponse.getCode())) { throw new RuntimeException("IFS ToolInstance修改异常：" + toolResponse.getMsg()); } String objStr = String.valueOf(toolResponse.getObj()); - IfsToolData ifsTool = JSON.parseObject(objStr, IfsToolData.class);*/ - inData.setCreateDate(new Date()); - inData.setState("Active"); + IfsToolData ifsTool = JSON.parseObject(objStr, IfsToolData.class); + //设置版本号 + inData.setIfsRowId(ifsTool.getIfsRowId()); + inData.setIfsRowVersion(ifsTool.getIfsRowVersion()); //2.调用方法保存当前的数据 toolDao.updateToolInstance(inData); } @@ -434,14 +442,20 @@ public class ToolServiceImpl implements ToolService { if(toolInstanceData == null){ throw new RuntimeException("当前工具实例不存在!"); } + inData.setCreateDate(new Date()); + inData.setState("Active"); //1.校验是否可以删除 目前不用校验 + toolInstanceData = new IfsToolInstanceDateData(); + //拷贝属性 设置参数 + BeanUtils.copyProperties(inData, toolInstanceData); + //2.校验存在调用接口 - /* String toolURL = apiUrl + "/tool/ifs/removeToolInstanceToIfs"; - ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, inData); + String toolURL = apiUrl + "/tool/ifs/removeToolInstanceToIfs"; + ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, toolInstanceData); if (!"200".equals(toolResponse.getCode())) { throw new RuntimeException("IFS ToolInstance删除异常：" + toolResponse.getMsg()); - }*/ + } //2.调用方法保存当前的数据 toolDao.deleteToolInstance(inData); }