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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-09-22 17:34:26 +08:00
parent 35d96da6ba
commit b30a546522
13 changed files with 417 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,6 +336,33 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
WQLObject reDtlTab = WQLObject.getWQLObject("EM_BI_DeviceRepairDtl"); // 设备维修单明细表
WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 档案表
WQLObject lifeTab = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle"); // 设备生命周期表
WQLObject recordTab = WQLObject.getWQLObject("EM_BI_DeviceRepairRecord"); // 设备维修单情况记录表
// 校验设备维修情况不能为空
String fault_comment = whereJson.getString("fault_comment"); // 故障描述
String fault_cause = whereJson.getString("fault_cause"); // 故障原因
String fault_analysis = whereJson.getString("fault_analysis"); // 问题分析
String measure = whereJson.getString("measure"); // 处理措施
if (ObjectUtil.isEmpty(fault_comment)) throw new BadRequestException("故障描述不能为空");
if (ObjectUtil.isEmpty(fault_cause)) throw new BadRequestException("故障原因不能为空");
if (ObjectUtil.isEmpty(fault_analysis)) throw new BadRequestException("问题分析不能为空");
if (ObjectUtil.isEmpty(measure)) throw new BadRequestException("处理措施不能为空");
JSONObject jsonRord = recordTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonRord)) {
recordTab.delete("repair_id = '"+whereJson.getString("repair_id")+"'");
}
// 重新插入表
JSONObject jsonObject = new JSONObject();
jsonObject.put("repair_record_id", IdUtil.getSnowflake(1,1).nextId());
jsonObject.put("repair_id", whereJson.getString("repair_id"));
jsonObject.put("devicerecord_id", whereJson.getString("devicerecord_id"));
jsonObject.put("inputdate", DateUtil.today());
jsonObject.put("fault_comment", fault_comment);
jsonObject.put("fault_cause", fault_cause);
jsonObject.put("fault_analysis", fault_analysis);
jsonObject.put("measure", measure);
recordTab.insert(jsonObject);
// 1.判断维修单明细中是否完成 都为是，不是则报错
JSONArray reDtlArr = reDtlTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").getResultJSONArray(0);
@@ -379,6 +406,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
WQLObject reMstTab = WQLObject.getWQLObject("EM_BI_DeviceRepairMst"); // 设备维修单主表
WQLObject reDtlTab = WQLObject.getWQLObject("EM_BI_DeviceRepairDtl"); // 设备维修单明细表
WQLObject recordTab = WQLObject.getWQLObject("EM_BI_DeviceRepairRecord"); // 设备维修单情况记录表
// 1.更新维修主表
JSONObject jsonReMst = reMstTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0);
@@ -394,6 +422,23 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
reDtlTab.update(jsonRedtl);
}
// 3.插入设备维修单情况记录表
JSONObject jsonRd = recordTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonRd)) {
recordTab.delete("repair_id = '"+whereJson.getString("repair_id")+"'");
}
JSONObject json = new JSONObject();
json.put("repair_record_id", IdUtil.getSnowflake(1,1).nextId());
json.put("repair_id", whereJson.getString("repair_id"));
json.put("devicerecord_id", whereJson.getString("devicerecord_id"));
json.put("inputdate", DateUtil.today());
json.put("fault_comment", whereJson.getString("fault_comment"));
json.put("fault_cause", whereJson.getString("fault_cause"));
json.put("fault_analysis", whereJson.getString("fault_analysis"));
json.put("measure", whereJson.getString("measure"));
recordTab.insert(json);
}
@Override

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
View File

@@ -266,13 +266,18 @@
file.device_name,
file.extend_code,
d1.name AS dept_name,
d2.name AS use_name
d2.name AS use_name,
r.fault_comment,
r.fault_cause,
r.fault_analysis,
r.measure
FROM
EM_BI_DeviceRepairMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN EM_BI_DeviceRepairRecord r ON r.repair_id = mst.repair_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql
View File

@@ -54,7 +54,9 @@
MAX(class.class_name) AS class_name,
MAX(file.device_code) AS device_code,
MAX(file.device_model) AS device_model,
re.devicerecord_id
re.devicerecord_id,
file.device_name,
file.extend_code
FROM
EM_BI_DeviceRepairRequest re
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = re.devicerecord_id
@@ -106,7 +108,6 @@
pari.outsourceaskfor_optid,
pari.confirm_time,
pari.audit_time,
pari.product_person_name,
pari.update_optname
FROM
EM_BI_DeviceRepairRequest re

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenanceplanmstController.java
View File

@@ -47,6 +47,13 @@ public class DevicemaintenanceplanmstController {
return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice(whereJson, page), HttpStatus.OK);
}
@GetMapping("/queryDevice2")
@Log("查询设备档案2")
@ApiOperation("查询设备档案2")
public ResponseEntity<Object> queryDevice2(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice2(whereJson, page), HttpStatus.OK);
}
@PostMapping
@Log("新增设备保养计划维护")
@ApiOperation("新增设备保养计划维护")

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenanceplanmstService.java
View File

@@ -82,6 +82,15 @@ public interface DevicemaintenanceplanmstService {
*/
Map<String, Object> queryDevice(Map whereJson, Pageable page);
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
Map<String, Object> queryDevice2(Map whereJson, Pageable page);
/**
* 获取明细
*

33
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
View File

@@ -45,6 +45,7 @@ import cn.hutool.core.util.ObjectUtil;
@Slf4j
public class DevicemaintenanceplanmstServiceImpl implements DevicemaintenanceplanmstService {
private final ClassstandardService classstandardService;
private final DeptService deptService;
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
@@ -244,6 +245,38 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
return json;
}
@Override
public Map<String, Object> queryDevice2(Map whereJson, Pageable page) {
DeptService deptService = SpringContextHolder.getBean(DeptService.class);
String device_code = MapUtil.getStr(whereJson, "device_code");
// 查询设备档案
HashMap<String, String> map = new HashMap<>();
map.put("flag", "4");
if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%"+device_code+"%");
String dept_id = MapUtil.getStr(whereJson, "dept_id");
if (!StrUtil.isEmpty(dept_id)) {
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds);
}
String use_id = MapUtil.getStr(whereJson, "use_id");
if (!StrUtil.isEmpty(use_id)) {
String useIds = deptService.getChildIdStr(Long.parseLong(use_id));
map.put("useIds", useIds);
}
// 获取当前登陆用户
Long currentUserId = SecurityUtils.getCurrentUserId();
String dept_str = deptService.getChildIdStr(currentUserId);
if (ObjectUtil.isNotEmpty(dept_str)) {
map.put("dept_str",dept_str);
}
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "file.update_time DESC");
return json;
}
@Override
@Transactional(rollbackFor = Exception.class)
public JSONArray getDtl(JSONObject whereJson) {

37
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql
View File

@@ -15,6 +15,7 @@
#################################################
输入.flag TYPEAS s_string
输入.classIds TYPEAS f_string
输入.dept_str TYPEAS f_string
输入.deptIds TYPEAS f_string
输入.useIds TYPEAS f_string
输入.device_code TYPEAS s_string
@@ -154,5 +155,41 @@
ENDQUERY
ENDIF
IF 输入.flag = "4"
PAGEQUERY
SELECT
file.*,
class.class_name,
work.workprocedure_name,
d1.name AS dept_name,
d2.name AS use_name
FROM
EM_BI_EquipmentFile file
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN pdm_bi_workprocedure work ON file.workprocedure_id = work.workprocedure_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
WHERE
file.is_delete = '0'
AND file.status not in (90,91)
AND d2.dept_id in 输入.dept_str
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
file.device_name like 输入.device_code)
ENDOPTION
OPTION 输入.deptIds <> ""
d1.dept_id in 输入.deptIds
ENDOPTION
OPTION 输入.useIds <> ""
d2.dept_id in 输入.useIds
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF