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-11-30 10:19:00 +08:00
parent e5632397fe
commit 06aed20ca8
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicefaultcaeServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class DevicefaultcaeServiceImpl implements DevicefaultcaeService {
map.put("classIds", classIds); map.put("classIds", classIds);
} }
JSONObject json = WQL.getWO("EM_DEVICEFAULTCAE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "dept.name,file.device_code"); JSONObject json = WQL.getWO("EM_DEVICEFAULTCAE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "dept_name,device_code");
/* // 处理平均故障间隔时间 && 平均故障修复时间*/ /* // 处理平均故障间隔时间 && 平均故障修复时间*/
JSONArray content = json.getJSONArray("content"); JSONArray content = json.getJSONArray("content");
for (int i = 0; i < content.size(); i++) { for (int i = 0; i < content.size(); i++) {

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

@@ -55,8 +55,8 @@
MAX(file.device_code) AS device_code, MAX(file.device_code) AS device_code,
MAX(file.device_model) AS device_model, MAX(file.device_model) AS device_model,
re.devicerecord_id, re.devicerecord_id,
file.device_name, MAX( file.device_name ) AS device_name,
file.extend_code MAX( file.extend_code ) AS extend_code
FROM FROM
EM_BI_DeviceRepairRequest re EM_BI_DeviceRepairRequest re
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = re.devicerecord_id LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = re.devicerecord_id
@@ -90,6 +90,7 @@
OPTION 输入.end_time <> "" OPTION 输入.end_time <> ""
re.fault_time <= 输入.end_time re.fault_time <= 输入.end_time
ENDOPTION ENDOPTION
GROUP BY re.devicerecord_id
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF

11
mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue
View File

@@ -142,12 +142,6 @@ export default {
user: 'user' user: 'user'
}) })
}, },
created() {
this.getDepts()
this.query.use_id = this.user.dept.id
this.getSupDepts(this.user.dept.id)
this.crud.toQuery()
},
methods: { methods: {
clickChange(item) { clickChange(item) {
this.tableRadio = item this.tableRadio = item
@@ -175,7 +169,10 @@ export default {
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
}, },
open() { open() {
this.crud.resetQuery(true) this.getDepts()
this.query.use_id = this.user.dept.id
this.getSupDepts(this.user.dept.id)
this.crud.toQuery()
}, },
close() { close() {
this.crud.resetQuery(false) this.crud.resetQuery(false)