From 38b68fd2581eb370ab46d6865d16a77aa4a15ab6 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 30 Sep 2022 15:19:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceBigScreenServiceImpl.java | 20 +++- .../impl/DevicerepairmstServiceImpl.java | 10 ++ .../sb/repair/wql/EM_BI_DEVICEREPAIR001.wql | 5 + .../wms/sb/repair/devicegridcheck/index.vue | 38 ++++++ .../sb/repair/devicerepaorout/OutDialog.vue | 111 ++++++++++++++++++ .../wms/sb/repair/devicerepaorout/index.vue | 12 +- .../src/views/wms/sb/stat/task/bigScreen.vue | 16 +-- 7 files changed, 194 insertions(+), 18 deletions(-) create mode 100644 mes/qd/src/views/wms/sb/repair/devicerepaorout/OutDialog.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java index 17fd4253..cbc37a3b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java @@ -93,7 +93,7 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService { json.put("dept_name_jm", "0"); } // 当前日期 - json.put("device_date", run_date); + json.put("device_date", run_date.substring(5, 10)); resultArr.add(json); } @@ -298,8 +298,13 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService { jsonObject.put("not_num", jsonObject.getString("need_num")); // 完成率：已保养台数/需保养台数 - String div = NumberUtil.div(jsonObject.getShort("end_num"), jsonObject.getShort("need_num")).toString(); - jsonObject.put("confirm_rate", NumberUtil.round(NumberUtil.mul(div, "100"), 2)); + try { + String div = NumberUtil.div(jsonObject.getShort("end_num"), jsonObject.getShort("need_num")).toString(); + jsonObject.put("confirm_rate", NumberUtil.round(NumberUtil.mul(div, "100"), 2)); + } catch (Exception e) { + jsonObject.put("confirm_rate", "0.0"); + } + resultArr.add(jsonObject); } @@ -418,12 +423,17 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService { String one_all_time = "0"; // 一台设备30天的维修时间 JSONArray jsonReArr = WQL.getWO("EM_DEVICEBIGSCREEN_03").addParamMap(map).process().getResultJSONArray(0); for (int k = 0; k < jsonReArr.size(); k++) { - JSONObject jsonObject = jsonReArr.getJSONObject(k); + Object o = jsonReArr.get(k); + JSONObject jsonObject = JSONObject.parseObject(o.toString()); Date date_finish_time = DateUtil.parse(jsonObject.getString("finish_time")); // 报修完成时间 Date date_create_time = DateUtil.parse(jsonObject.getString("create_time")); // 报修时间 // 一台设备一天的维修时间 - long one_day_time = DateUtil.between(date_create_time, date_finish_time, DateUnit.HOUR, false); + long one_day_time = 0; + try { + one_day_time = DateUtil.between(date_create_time, date_finish_time, DateUnit.HOUR, false); + } catch (Exception e) { + } one_all_time = NumberUtil.add(one_all_time,String.valueOf(one_day_time)).toString(); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java index fdb43c4a..1c352b1e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java @@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import org.nl.exception.BadRequestException; import org.nl.modules.security.service.dto.JwtUserDto; +import org.nl.modules.system.service.DeptService; import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; @@ -552,6 +553,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { JSONObject jsonMst = reMstTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0); jsonMst.put("invstatus", "05"); + jsonMst.put("outsourceback_remark", whereJson.getString("outsourceback_remark")); jsonMst.put("outsourceback_optid", currentUserId); jsonMst.put("outsourceback_optname", nickName); jsonMst.put("outsourceback_time", DateUtil.now()); @@ -996,6 +998,8 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { @Override public Map query5(Map whereJson, Pageable page) { + DeptService deptService = SpringContextHolder.getBean(DeptService.class); + String device_code = MapUtil.getStr(whereJson, "device_code"); String repair_code = MapUtil.getStr(whereJson, "repair_code"); String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle"); @@ -1022,6 +1026,12 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", classIds); } + // 归属部门 + 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); + } JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC"); return json; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql index 2432db15..ab83df9e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql @@ -27,6 +27,7 @@ 输入.sparepart_only_id TYPEAS s_string 输入.material_code TYPEAS s_string 输入.devicerecord_id TYPEAS s_string + 输入.deptIds TYPEAS f_string [临时表] @@ -423,6 +424,10 @@ mst.plan_start_date <= 输入.end_time ENDOPTION + OPTION 输入.deptIds <> "" + d2.dept_id in 输入.deptIds + ENDOPTION + ENDSELECT ENDPAGEQUERY ENDIF diff --git a/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue b/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue index e2d43a8b..f8321e44 100644 --- a/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue @@ -20,6 +20,15 @@ placeholder="请选择" /> + + + { + parentNode.children = res.content.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + setTimeout(() => { + callback() + }, 200) + }) + } + }, + getDepts() { + getDepts({ enabled: true }).then(res => { + this.depts = res.content.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + }) + } } } diff --git a/mes/qd/src/views/wms/sb/repair/devicerepaorout/OutDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepaorout/OutDialog.vue new file mode 100644 index 00000000..73fc05ec --- /dev/null +++ b/mes/qd/src/views/wms/sb/repair/devicerepaorout/OutDialog.vue @@ -0,0 +1,111 @@ + + + + diff --git a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue index c4d908bf..d56890c8 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue @@ -134,6 +134,7 @@ + @@ -149,11 +150,12 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import crudMaterialbase from '@/api/wms/basedata/master/materialbase' +import OutDialog from '@/views/wms/sb/repair/devicerepaorout/OutDialog' export default { name: 'Devicerepaorout', dicts: ['EM_DEVICE_WX_INVTYPE', 'EM_DEVICE_WX_INVSTATUS', 'EM_FAULT_LEVEL'], - components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect }, + components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, OutDialog }, mixins: [presenter(), header(), crud()], cruds() { return CRUD({ @@ -175,6 +177,8 @@ export default { return { classes: [], class_idStr: null, + OutDialog: false, + openParam: null, materOpt_code: '23', permission: { } @@ -253,10 +257,8 @@ export default { if (data.invstatus !== '04') { return this.crud.notify('只能对委外维修状态的单据验收', CRUD.NOTIFICATION_TYPE.INFO) } - crudDevicerepairmst.checkRepair(data).then(res => { - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.crud.toQuery() - }) + this.openParam = data + this.OutDialog = true } } } diff --git a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue index 1baaee5e..40f75cf4 100644 --- a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue +++ b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue @@ -2,21 +2,21 @@ @@ -127,10 +127,10 @@ export default { /* 去除表头边框 */ border: none; } -.t_btn2 >>> .el-table__row>td { - /* 去除表格线 */ +/*.t_btn2 >>> .el-table__row>td { + !* 去除表格线 *! border: none; -} +}*/ .t_btn2 >>> .el-table th { /* 设置表头的颜色和字体颜色 */ background-color: #012957;