wilson
/
ccl-plm-java
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

工具的功能

master
DouDou 2 years ago
parent
dd47e5cc3a
commit
663b6daf9d
2 changed files with 50 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java
  2. 57
      src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java

7
src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java
View File

@ -106,8 +106,8 @@ public class ToolDaoImpl implements ToolDao {
StringBuilder sql = new StringBuilder();
Map<String, Object> paramMap = new HashMap<String, Object>();
sql.append("SELECT id, site, tool_id, tool_instance, begin_date, end_date,");
sql.append(" ifs_row_id, ifs_row_version FROM tool_detail_phase_date");
sql.append(" WHERE td.site = :site AND td.tool_id = :toolId AND tool_instance = :toolInstance");
sql.append(" ifs_row_id, ifs_row_version FROM tool_detail_phase_date thd");
sql.append(" WHERE thd.site = :site AND thd.tool_id = :toolId AND thd.tool_instance = :toolInstance");
paramMap.put("site", site);
paramMap.put("toolId", toolId);
paramMap.put("toolInstance", toolInstance);
@ -184,7 +184,8 @@ public class ToolDaoImpl implements ToolDao {
@Override
public int updateToolInstance(IfsToolInstance inData) {
StringBuilder sql = new StringBuilder();
sql.append("UPDATE tool_detail SET work_center_no = :normalWorkCenterNo, c_desc = :desc, c_last_calibration_date = :lastCalibrationDate,");
sql.append("UPDATE tool_detail SET work_center_no = :normalWorkCenterNo, c_desc = :description, c_last_calibration_date = :lastCalibrationDate,");
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(" c_tool_stability = :toolStability, c_tool_reproducibility = :toolReproducibility");

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

@ -343,6 +343,9 @@ public class ToolServiceImpl implements ToolService {
String toolId = inData.getToolId();
String toolInstance = inData.getToolInstance();
Date lastCalibrationDate = inData.getLastCalibrationDate();
String objectId = inData.getObjectId();
String normalWorkCenterNo = inData.getNormalWorkCenterNo();
String normalProductionLine = inData.getNormalProductionLine();
//查询是否存在
IfsToolInstanceData toolInstanceData = toolDao.getToolInstanceByToolInstance(site, toolId, toolInstance);
//如果存在
@ -350,27 +353,58 @@ public class ToolServiceImpl implements ToolService {
throw new RuntimeException("当前工具实例不存在!");
}
//1.调用存储过程检查工具实例的修改
Map<String, Object> resultMap = this.checkUpdateToolInstance(site, toolId, toolInstance, objectId, normalWorkCenterNo, normalProductionLine);
//判断是否检验成功
String resultCode = String.valueOf(resultMap.get("result_code"));
if ("400".equalsIgnoreCase(resultCode)) {
String resultMsg = String.valueOf(resultMap.get("result_msg"));
throw new RuntimeException(resultMsg);
}
toolInstanceData = new IfsToolInstanceDateData();
//拷贝属性 设置参数
BeanUtils.copyProperties(inData, toolInstanceData);
String lastCalibrationTime = "";
if(lastCalibrationDate != null){
lastCalibrationTime = DateUtils.getStringDate(lastCalibrationDate, "yyyy-MM-dd");
inData.setNextCalibrationDate(lastCalibrationDate);
}
toolInstanceData.setLastCalibrationDate(lastCalibrationTime);
//1.校验存在调用接口
/* //2.校验存在调用接口
String toolURL = apiUrl + "/tool/ifs/modifyToolInstanceToIfs";
ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, inData);
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);
IfsToolData ifsTool = JSON.parseObject(objStr, IfsToolData.class);*/
inData.setCreateDate(new Date());
inData.setState("Active");
//2.调用方法保存当前的数据
toolDao.updateToolInstance(inData);
}
/**
* @description: 调用存储过程修改工具实例
* @author LR
* @date 2024/9/5 16:38
* @version 1.0
*/
public Map<String, Object> checkUpdateToolInstance(String site, String toolId, String toolInstance, String objectId, String normalWorkCenterNo, String normalProductionLine) {
List<Object> params = new ArrayList<>();
params.add(site);
params.add(toolId);
params.add(toolInstance);
params.add(objectId);
params.add(normalWorkCenterNo);
params.add(normalProductionLine);
//调用存储过程
List<Map<String, Object>> resultList = procedureDao.getProcedureData("checkUpdateToolInstance", params);
//处理返回的结果
return resultList.get(0);
}
@Override
@Transactional
public void removeToolInstance(IfsToolInstance inData) {
@ -384,13 +418,14 @@ public class ToolServiceImpl implements ToolService {
if(toolInstanceData == null){
throw new RuntimeException("当前工具实例不存在!");
}
//1.校验是否可以删除 目前不用校验
//1.校验存在调用接口
String toolURL = apiUrl + "/tool/ifs/removeToolInstanceToIfs";
//2.校验存在调用接口
/* String toolURL = apiUrl + "/tool/ifs/removeToolInstanceToIfs";
ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, inData);
if (!"200".equals(toolResponse.getCode())) {
throw new RuntimeException("IFS ToolInstance删除异常：" + toolResponse.getMsg());
}
}*/
//2.调用方法保存当前的数据
toolDao.deleteToolInstance(inData);
}
@ -423,7 +458,7 @@ public class ToolServiceImpl implements ToolService {
String resultMsg = String.valueOf(resultMap.get("result_msg"));
throw new RuntimeException(resultMsg);
}
IfsToolInstanceDateData instanceDateData = new IfsToolInstanceDateData();
/* IfsToolInstanceDateData instanceDateData = new IfsToolInstanceDateData();
//属性拷贝
BeanUtils.copyProperties(inData, instanceDateData);
//设置时间的信息
@ -439,7 +474,7 @@ public class ToolServiceImpl implements ToolService {
String objStr = String.valueOf(toolResponse.getObj());
IfsToolInstanceDateData ifsTool = JSON.parseObject(objStr, IfsToolInstanceDateData.class);
inData.setIfsRowId(ifsTool.getIfsRowId());
inData.setIfsRowVersion(ifsTool.getIfsRowVersion());
inData.setIfsRowVersion(ifsTool.getIfsRowVersion());*/
//保存新增的数据
toolDao.insertToolInstanceDate(inData);
}
@ -492,7 +527,7 @@ public class ToolServiceImpl implements ToolService {
String resultMsg = String.valueOf(resultMap.get("result_msg"));
throw new RuntimeException(resultMsg);
}
IfsToolInstanceDateData instanceDateData = new IfsToolInstanceDateData();
/* IfsToolInstanceDateData instanceDateData = new IfsToolInstanceDateData();
//属性拷贝
BeanUtils.copyProperties(inData, instanceDateData);
//设置时间的信息
@ -508,7 +543,7 @@ public class ToolServiceImpl implements ToolService {
String objStr = String.valueOf(toolResponse.getObj());
IfsToolInstanceDateData ifsTool = JSON.parseObject(objStr, IfsToolInstanceDateData.class);
inData.setIfsRowId(ifsTool.getIfsRowId());
inData.setIfsRowVersion(ifsTool.getIfsRowVersion());
inData.setIfsRowVersion(ifsTool.getIfsRowVersion());*/
//保存新增的数据
toolDao.updateToolInstanceDate(inData);
}
@ -545,14 +580,14 @@ public class ToolServiceImpl implements ToolService {
int id = inData.getId();
IfsToolInstanceDateData instanceDateData = new IfsToolInstanceDateData();
//属性拷贝
/*//属性拷贝
BeanUtils.copyProperties(inData, instanceDateData);
//2.校验存在调用接口
String toolURL = apiUrl + "/tool/ifs/removeToolInstanceDateToIfs";
ResponseData toolResponse = HttpClientUtil.doPostByRawWithPLM(toolURL, instanceDateData);
if (!"200".equals(toolResponse.getCode())) {
throw new RuntimeException("IFS ToolInstanceDate删除异常：" + toolResponse.getMsg());
}
}*/
//保存新增的数据
toolDao.deleteToolInstanceDate(inData);
}

Write Preview
Loading…
Cancel
Save