From 374b2b2e505de4dc126aab63ec02d87b4dcf5621 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 15 Sep 2022 15:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E4=BF=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DevicerepairrequestServiceImpl.java | 13 +- .../sb/repair/devicerepairrequest/index.vue | 2 +- .../wms/sb/repair/devicevprs/FaultDialog.vue | 236 ++++++++++++ .../wms/sb/repair/devicevprs/PicDialog.vue | 177 +++++++++ .../views/wms/sb/repair/devicevprs/index.vue | 360 ++++++++++++++++++ 5 files changed, 782 insertions(+), 6 deletions(-) create mode 100644 mes/qd/src/views/wms/sb/repair/devicevprs/FaultDialog.vue create mode 100644 mes/qd/src/views/wms/sb/repair/devicevprs/PicDialog.vue create mode 100644 mes/qd/src/views/wms/sb/repair/devicevprs/index.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java index eb76a5b3..d2863b71 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java @@ -109,10 +109,18 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); + JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); + Long deptId = currentUser.getDeptId(); + dto.setRequest_id(IdUtil.getSnowflake(1, 1).nextId()); + dto.setRequest_code(CodeUtil.getNewCode("BXD_CODE")); + dto.setFault_time(now); + dto.setStatus("01"); dto.setCreate_id(currentUserId); dto.setCreate_name(nickName); dto.setCreate_time(now); + dto.setSyscompanyid(deptId); + dto.setSysdeptid(deptId); WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairrequest"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); @@ -125,11 +133,6 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic DevicerepairrequestDto entity = this.findById(dto.getRequest_id()); if (entity == null) throw new BadRequestException("被删除或无权限,操作失败!"); - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - - String now = DateUtil.now(); - WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairrequest"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.update(json); diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue index a52f09b9..37a67744 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue @@ -138,7 +138,7 @@ export default { mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '设备报修', + title: '设备报修处理', url: 'api/devicerepairrequest', idField: 'request_id', sort: 'request_id,desc', diff --git a/mes/qd/src/views/wms/sb/repair/devicevprs/FaultDialog.vue b/mes/qd/src/views/wms/sb/repair/devicevprs/FaultDialog.vue new file mode 100644 index 00000000..cfa07c13 --- /dev/null +++ b/mes/qd/src/views/wms/sb/repair/devicevprs/FaultDialog.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/mes/qd/src/views/wms/sb/repair/devicevprs/PicDialog.vue b/mes/qd/src/views/wms/sb/repair/devicevprs/PicDialog.vue new file mode 100644 index 00000000..146241f4 --- /dev/null +++ b/mes/qd/src/views/wms/sb/repair/devicevprs/PicDialog.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue b/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue new file mode 100644 index 00000000..4f4e6593 --- /dev/null +++ b/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue @@ -0,0 +1,360 @@ + + + + +