root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-10-10 19:35:55 +08:00
parent 7e97657f16
commit 900b4a9e1e
6 changed files with 116 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java
View File

@@ -200,7 +200,7 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
@Override
@Transactional(rollbackFor = Exception.class)
public void repair(JSONObject whereJson) {
String devicerecord_id = whereJson.getString("devicerecord_id");
JSONArray rows = whereJson.getJSONArray("rows");
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser();
@@ -210,42 +210,52 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
WQLObject requestTab = WQLObject.getWQLObject("EM_BI_DeviceRepairRequest"); // 设备报修单
WQLObject reMstTab = WQLObject.getWQLObject("EM_BI_DeviceRepairMst"); // 设备维修单主表
// 1.更新设备档案表
JSONObject jsonFile = fileTab.query("devicerecord_id = '" + devicerecord_id + "' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonFile)) throw new BadRequestException("设备档案不存在");
jsonFile.put("status","20");
fileTab.update(jsonFile);
for(int i=0;i<rows.size();i++){
JSONObject jo =rows.getJSONObject(i);
String devicerecord_id = jo.getString("devicerecord_id");
String status = jo.getString("status");
if(!"01".equals(status)){
continue;
}
// 1.更新设备档案表
JSONObject jsonFile = fileTab.query("devicerecord_id = '" + devicerecord_id + "' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonFile)) {
throw new BadRequestException("设备档案不存在");
}
jsonFile.put("status","20");
fileTab.update(jsonFile);
// 2.更新设备报修单
JSONObject jsonRequest = requestTab.query("request_id = '" + whereJson.getString("request_id") + "'").uniqueResult(0);
jsonRequest.put("is_passed", "1");
jsonRequest.put("status", "02");
jsonRequest.put("process_id", currentUserId);
jsonRequest.put("process_name", nickName);
jsonRequest.put("process_time", DateUtil.now());
requestTab.update(jsonRequest);
// 2.更新设备报修单
JSONObject jsonRequest = requestTab.query("request_id = '" + jo.getString("request_id") + "'").uniqueResult(0);
jsonRequest.put("is_passed", "1");
jsonRequest.put("status", "02");
jsonRequest.put("process_id", currentUserId);
jsonRequest.put("process_name", nickName);
jsonRequest.put("process_time", DateUtil.now());
requestTab.update(jsonRequest);
// 3.插入设备维修单主表
JSONObject jsonReMst = new JSONObject();
jsonReMst.put("repair_id", IdUtil.getSnowflake(1,1).nextId());
jsonReMst.put("repair_code", CodeUtil.getNewCode("REPAIR_CODE"));
jsonReMst.put("devicerecord_id", jsonRequest.get("devicerecord_id"));
jsonReMst.put("maintenancecycle", "02");
jsonReMst.put("invstatus", "01");
jsonReMst.put("product_person_name", jsonRequest.getString("product_person_name"));
jsonReMst.put("fault_desc", jsonRequest.getString("fault_desc"));
jsonReMst.put("fault_level", jsonRequest.getString("fault_level"));
jsonReMst.put("plan_start_date", DateUtil.today());
jsonReMst.put("detail_count", 0);
jsonReMst.put("source_bill_id", jsonRequest.get("request_id"));
jsonReMst.put("source_bill_type", "BXD");
jsonReMst.put("source_bill_code", jsonRequest.getString("request_code"));
jsonReMst.put("input_optid", currentUserId);
jsonReMst.put("input_optname", nickName);
jsonReMst.put("input_time", DateUtil.now());
jsonReMst.put("sysdeptid", deptId);
jsonReMst.put("syscompanyid",deptId);
reMstTab.insert(jsonReMst);
// 3.插入设备维修单主表
JSONObject jsonReMst = new JSONObject();
jsonReMst.put("repair_id", IdUtil.getSnowflake(1,1).nextId());
jsonReMst.put("repair_code", CodeUtil.getNewCode("REPAIR_CODE"));
jsonReMst.put("devicerecord_id", jsonRequest.get("devicerecord_id"));
jsonReMst.put("maintenancecycle", "02");
jsonReMst.put("invstatus", "01");
jsonReMst.put("product_person_name", jsonRequest.getString("product_person_name"));
jsonReMst.put("fault_desc", jsonRequest.getString("fault_desc"));
jsonReMst.put("fault_level", jsonRequest.getString("fault_level"));
jsonReMst.put("plan_start_date", DateUtil.today());
jsonReMst.put("detail_count", 0);
jsonReMst.put("source_bill_id", jsonRequest.get("request_id"));
jsonReMst.put("source_bill_type", "BXD");
jsonReMst.put("source_bill_code", jsonRequest.getString("request_code"));
jsonReMst.put("input_optid", currentUserId);
jsonReMst.put("input_optname", nickName);
jsonReMst.put("input_time", DateUtil.now());
jsonReMst.put("sysdeptid", deptId);
jsonReMst.put("syscompanyid",deptId);
reMstTab.insert(jsonReMst);
}
}
@Override
@@ -256,13 +266,22 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
WQLObject requestTab = WQLObject.getWQLObject("EM_BI_DeviceRepairRequest"); // 设备报修单
JSONObject jsonRequest = requestTab.query("request_id = '" + whereJson.getString("request_id") + "'").uniqueResult(0);
jsonRequest.put("is_passed", "0");
jsonRequest.put("status", "99");
jsonRequest.put("process_id",currentUserId );
jsonRequest.put("process_name",nickName );
jsonRequest.put("process_time",DateUtil.now());
requestTab.update(jsonRequest);
JSONArray rows = whereJson.getJSONArray("rows");
for(int i=0;i<rows.size();i++){
JSONObject jo =rows.getJSONObject(i);
String status = jo.getString("status");
if(!"01".equals(status)){
continue;
}
JSONObject jsonRequest = requestTab.query("request_id = '" + jo.getString("request_id") + "'").uniqueResult(0);
jsonRequest.put("is_passed", "0");
jsonRequest.put("status", "99");
jsonRequest.put("process_id",currentUserId );
jsonRequest.put("process_name",nickName );
jsonRequest.put("process_time",DateUtil.now());
requestTab.update(jsonRequest);
}
}
@Override