From 0fc2178dd939e136b3df5742e527feb0eeeec4c2 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 23 Oct 2023 15:10:51 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1.=20=E4=BF=9D=E5=85=BB/=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80/=E6=B6=A6=E6=BB=91=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=9D=E5=85=BB/=E7=82=B9=E6=A3=80/=E6=B6=A6=E6=BB=91?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=8E=E4=BA=BA=E5=91=98=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB2.=20=E4=BF=9D=E5=85=BB/=E7=82=B9=E6=A3=80/?=
 =?UTF-8?q?=E6=B6=A6=E6=BB=91/=E7=BB=B4=E4=BF=AE=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8D=95=E6=8D=AE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E4=B8=80=E8=A1=8C3.=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=95=85=E9=9A=9C=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=80=89=E6=8B=A94.=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E5=85=81=E8=AE=B8=E7=82=B9=E5=87=BB=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=AE=E5=8D=95=E5=8D=95=E5=8F=B7=EF=BC=8C=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF5.=20=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE=E5=8D=95=E6=97=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?;=E6=9F=A5=E7=9C=8B=E8=B7=9F=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9B=BE=E7=89=87=EF=BC=9A=E5=8F=AA=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=9B=BE=E7=89=87=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/hd/nladmin-system/pom.xml                 |   7 +
 .../org/nl/common/utils/ImageCompress.java    |  58 +++++++
 .../auToTask/bean/AutoCreateLubricate.java    |  28 ++++
 .../auToTask/bean/AutoCreateRepair.java       |  29 ++++
 .../auToTask/bean/AutoCreateSportCheck.java   |  28 ++++
 .../auToTask/bean/AutoCreateUpkeep.java       |  28 ++++
 .../impl/DevicelubricatemstServiceImpl.java   |  49 ++++++
 .../rest/DevicerepairmstController.java       |   6 +
 .../rest/DevicerepairrequestController.java   |  38 +++++
 .../service/DevicerepairmstService.java       |   6 +
 .../impl/DevicerepairmstServiceImpl.java      |  54 +++++++
 .../impl/DevicesportcheckmstServiceImpl.java  |  47 ++++++
 .../impl/DevicemaintenancemstServiceImpl.java |  48 +++++-
 .../em/EmBiLubriDeviceController.java         | 113 +++++++++++++
 .../em/EmBiSportDeviceController.java         | 113 +++++++++++++
 .../em/EmBiUpkeepDeviceController.java        | 113 +++++++++++++
 .../impl/DevicefaultclassServiceImpl.java     |   9 ++
 .../em/wql/EM_BI_DEVICEFAULTCLASS.wql         |   5 +
 .../service/em/EmBiLubriDeviceService.java    |  28 ++++
 .../service/em/EmBiSportDeviceService.java    |  28 ++++
 .../service/em/EmBiUpkeepDeviceService.java   |  28 ++++
 .../service/em/dao/EmBiLubriDevice.java       |  38 +++++
 .../service/em/dao/EmBiSportDevice.java       |  38 +++++
 .../service/em/dao/EmBiUpkeepDevice.java      |  38 +++++
 .../em/dao/mapper/EmBiLubriDeviceMapper.java  |  24 +++
 .../em/dao/mapper/EmBiLubriDeviceMapper.xml   |  34 ++++
 .../em/dao/mapper/EmBiSportDeviceMapper.java  |  24 +++
 .../em/dao/mapper/EmBiSportDeviceMapper.xml   |  34 ++++
 .../em/dao/mapper/EmBiUpkeepDeviceMapper.java |  24 +++
 .../em/dao/mapper/EmBiUpkeepDeviceMapper.xml  |  34 ++++
 .../em/impl/EmBiLubriDeviceServiceImpl.java   |  33 ++++
 .../em/impl/EmBiSportDeviceServiceImpl.java   |  33 ++++
 .../em/impl/EmBiUpKeepDeviceServiceImpl.java  |  33 ++++
 .../lubricate/devicelubricate/AddDialog.vue   |  25 +++
 .../lubricate/devicelubricate/index.vue       |   3 +
 .../repair/devicerepair/AddDialog.vue         |  24 ++-
 .../repair/devicerepair/devicerepairmst.js    |  10 +-
 .../repair/devicevprs/FaultDialog.vue         |  33 ++++
 .../device_manage/repair/devicevprs/index.vue | 115 +++++++++++--
 .../sportcheck/devicesportcheck/AddDialog.vue |  26 +++
 .../sportcheck/devicesportcheck/index.vue     |   3 +
 .../upkeep/devicemaintenance/AddDialog.vue    |  26 +++
 .../upkeep/devicemaintenance/index.vue        |   3 +
 .../lubripersondevice/SelectDeviceDialog.vue  | 124 ++++++++++++++
 .../em/lubripersondevice/dictDetail.vue       | 152 ++++++++++++++++++
 .../em/lubripersondevice/index.vue            | 136 ++++++++++++++++
 .../em/lubripersondevice/lubripersondevice.js |  67 ++++++++
 .../sportpersondevice/SelectDeviceDialog.vue  | 124 ++++++++++++++
 .../em/sportpersondevice/dictDetail.vue       | 152 ++++++++++++++++++
 .../em/sportpersondevice/index.vue            | 136 ++++++++++++++++
 .../em/sportpersondevice/sportpersondevice.js |  67 ++++++++
 .../upkeeppersondevice/SelectDeviceDialog.vue | 124 ++++++++++++++
 .../em/upkeeppersondevice/dictDetail.vue      | 152 ++++++++++++++++++
 .../em/upkeeppersondevice/index.vue           | 136 ++++++++++++++++
 .../upkeeppersondevice/upkeeppersondevice.js  |  67 ++++++++
 55 files changed, 2941 insertions(+), 14 deletions(-)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/common/utils/ImageCompress.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiLubriDeviceController.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiSportDeviceController.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiUpkeepDeviceController.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiLubriDeviceService.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiSportDeviceService.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiUpkeepDeviceService.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiLubriDevice.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiSportDevice.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiUpkeepDevice.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiLubriDeviceMapper.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiLubriDeviceMapper.xml
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiSportDeviceMapper.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiSportDeviceMapper.xml
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiUpkeepDeviceMapper.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiUpkeepDeviceMapper.xml
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiLubriDeviceServiceImpl.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiSportDeviceServiceImpl.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiUpKeepDeviceServiceImpl.java
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/SelectDeviceDialog.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/dictDetail.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/index.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/lubripersondevice.js
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/SelectDeviceDialog.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/dictDetail.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/index.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/sportpersondevice.js
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/SelectDeviceDialog.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/dictDetail.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/index.vue
 create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/upkeeppersondevice.js

diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml
index 4032a6fd..8294f83f 100644
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -104,6 +104,13 @@
             <version>1.6</version>
         </dependency>
 
+        <!-- 图片缩略图 -->
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.8</version>
+        </dependency>
+
         <!--        https://onew.me/logback/2018/09/17/logback_win.html-->
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/ImageCompress.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/ImageCompress.java
new file mode 100644
index 00000000..c185dc69
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/ImageCompress.java
@@ -0,0 +1,58 @@
+package org.nl.common.utils;
+
+
+import net.coobird.thumbnailator.Thumbnails;
+import org.nl.modules.common.exception.BadRequestException;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.math.BigDecimal;
+
+/*
+ * @author ZZQ
+ * @Date 2022/11/18 4:17 下午
+ */
+public class ImageCompress {
+
+
+    public static Long imgCompress(File file,Long desFileSize,Double accuracy,int threshold){
+        if (threshold>5){
+            return file.length();
+        }
+        long length = file.length();
+        //小于目标压缩文件大小的2倍就不压缩了
+        if (length>desFileSize*1024*2){
+            try {
+                BufferedImage bim = ImageIO.read(file);
+                int imgWidth = bim.getWidth();
+                int imgHeight = bim.getHeight();
+                int desWidth = new BigDecimal(imgWidth).multiply(
+                        new BigDecimal(accuracy)).intValue();
+                int desHeight = new BigDecimal(imgHeight).multiply(
+                        new BigDecimal(accuracy)).intValue();
+                Thumbnails.of(file.getPath()).size(desWidth, desHeight).outputQuality(accuracy).toFile(file.getPath());
+                //如果不满足要求,递归直至满足要求
+                imgCompress(file, desFileSize, accuracy,threshold);
+            }catch (Exception ex){
+                ex.printStackTrace();
+            }
+        }
+        return file.length();
+    };
+    public static Long imgCompress(String path,Long desFileSize,Double accuracy){
+        File file;
+        try {
+            file = new File(path);
+            String suffix = FileUtil.getExtensionName(file.getName());
+            if (!"图片".equals(FileUtil.getFileType(suffix))) {
+                return file.length();
+            }
+        }catch (Exception ex){
+         throw  new BadRequestException("文件不存在");
+        }
+        int i = 0;
+        //小于目标压缩文件大小的2倍就不压缩了
+        return imgCompress(file, desFileSize==null?100L:desFileSize, accuracy==null?0.8:accuracy,i);
+    };
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateLubricate.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateLubricate.java
index a92863a9..54284b60 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateLubricate.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateLubricate.java
@@ -7,14 +7,22 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.wms.masterdata_manage.service.em.EmBiLubriDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiLubriDevice;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 自动创建润滑单
@@ -25,6 +33,13 @@ import java.util.Date;
 @Component
 @RequiredArgsConstructor
 public class AutoCreateLubricate {
+
+    @Autowired
+    private EmBiLubriDeviceService emBiLubriDeviceService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
     public void run() {
         WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 档案表
         WQLObject planMstTab = WQLObject.getWQLObject("em_bi_devicelubricateplanmst"); // 设备润滑计划主表
@@ -171,6 +186,19 @@ public class AutoCreateLubricate {
         jsonMainMst.put("input_time", DateUtil.now());
         jsonMainMst.put("sysdeptid", deptId);
         jsonMainMst.put("syscompanyid", deptId);
+
+        // 判断此设备是否有对应的润滑人
+        JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + json.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+        List<EmBiLubriDevice> repairDeviceDaoList = emBiLubriDeviceService.list(
+                new QueryWrapper<EmBiLubriDevice>().lambda()
+                        .eq(EmBiLubriDevice::getDevice_code, jsonFile.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(repairDeviceDaoList)) {
+            SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+            jsonMainMst.put("update_optname", userDao.getPerson_name());
+        }
         mainMstTab.insert(jsonMainMst);
 
         // 保养单明细表
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateRepair.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateRepair.java
index 4f47b2c4..184dfba6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateRepair.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateRepair.java
@@ -7,14 +7,22 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.wms.masterdata_manage.service.em.EmBiRepairDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiRepairDevice;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 自动创建维修单
@@ -25,6 +33,13 @@ import java.util.Date;
 @Component
 @RequiredArgsConstructor
 public class AutoCreateRepair {
+
+    @Autowired
+    private EmBiRepairDeviceService emBiRepairDeviceService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
     public void run() {
         WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 档案表
         WQLObject planMstTab = WQLObject.getWQLObject("EM_BI_DeviceRepairPlanMst"); // 设备维修计划主表
@@ -179,6 +194,20 @@ public class AutoCreateRepair {
         jsonRepaiMst.put("input_time", DateUtil.now());
         jsonRepaiMst.put("sysdeptid", deptId);
         jsonRepaiMst.put("syscompanyid", deptId);
+
+        // 判断此设备是否有对应的维修人
+        JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + json.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+        List<EmBiRepairDevice> repairDeviceDaoList = emBiRepairDeviceService.list(
+                new QueryWrapper<EmBiRepairDevice>().lambda()
+                        .eq(EmBiRepairDevice::getDevice_code, jsonFile.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(repairDeviceDaoList)) {
+            SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+            jsonRepaiMst.put("update_optname", userDao.getPerson_name());
+        }
+
         repaiMstTab.insert(jsonRepaiMst);
 
         // 维修单明细表
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateSportCheck.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateSportCheck.java
index c06a6c9b..1bbbcbae 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateSportCheck.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateSportCheck.java
@@ -7,14 +7,22 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.wms.masterdata_manage.service.em.EmBiSportDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiSportDevice;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 自动创建点检单
@@ -25,6 +33,13 @@ import java.util.Date;
 @Component
 @RequiredArgsConstructor
 public class AutoCreateSportCheck {
+
+    @Autowired
+    private EmBiSportDeviceService emBiSportDeviceService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
     public void run() {
         WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 档案表
         WQLObject planMstTab = WQLObject.getWQLObject("em_bi_devicesportcheckplanmst"); // 设备点检计划主表
@@ -169,6 +184,19 @@ public class AutoCreateSportCheck {
         jsonMainMst.put("input_time", DateUtil.now());
         jsonMainMst.put("sysdeptid", deptId);
         jsonMainMst.put("syscompanyid", deptId);
+
+        // 判断此设备是否有对应的点检人
+        JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + json.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+        List<EmBiSportDevice> repairDeviceDaoList = emBiSportDeviceService.list(
+                new QueryWrapper<EmBiSportDevice>().lambda()
+                        .eq(EmBiSportDevice::getDevice_code, jsonFile.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(repairDeviceDaoList)) {
+            SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+            jsonMainMst.put("update_optname", userDao.getPerson_name());
+        }
         mainMstTab.insert(jsonMainMst);
 
         // 保养单明细表
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateUpkeep.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateUpkeep.java
index ff0b10e8..c01c7a42 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateUpkeep.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/auToTask/bean/AutoCreateUpkeep.java
@@ -7,14 +7,22 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.wms.masterdata_manage.service.em.EmBiUpkeepDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiUpkeepDevice;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 自动创建保养单
@@ -25,6 +33,13 @@ import java.util.Date;
 @Component
 @RequiredArgsConstructor
 public class AutoCreateUpkeep {
+
+    @Autowired
+    private EmBiUpkeepDeviceService emBiUpkeepDeviceService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
     public void run() {
         WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 档案表
         WQLObject planMstTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenancePlanMst"); // 设备保养计划主表
@@ -169,6 +184,19 @@ public class AutoCreateUpkeep {
         jsonMainMst.put("input_time", DateUtil.now());
         jsonMainMst.put("sysdeptid", deptId);
         jsonMainMst.put("syscompanyid", deptId);
+
+        // 判断此设备是否有对应的保养人
+        JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + json.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+        List<EmBiUpkeepDevice> repairDeviceDaoList = emBiUpkeepDeviceService.list(
+                new QueryWrapper<EmBiUpkeepDevice>().lambda()
+                        .eq(EmBiUpkeepDevice::getDevice_code, jsonFile.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(repairDeviceDaoList)) {
+            SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+            jsonMainMst.put("update_optname", userDao.getPerson_name());
+        }
         mainMstTab.insert(jsonMainMst);
 
         // 保养单明细表
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java
index c9e1bef6..02fd471f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java
@@ -9,6 +9,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.SecurityUtils;
@@ -20,7 +21,13 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.lubricate.service.DevicelubricatemstService;
 import org.nl.wms.device_manage.lubricate.service.dto.DevicelubricatemstDto;
 import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.service.em.EmBiLubriDeviceService;
+import org.nl.wms.masterdata_manage.service.em.EmBiSportDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiLubriDevice;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiSportDevice;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -44,6 +51,12 @@ public class DevicelubricatemstServiceImpl implements DevicelubricatemstService
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private EmBiLubriDeviceService emBiLubriDeviceService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
@@ -161,6 +174,24 @@ public class DevicelubricatemstServiceImpl implements DevicelubricatemstService
         jsonMst.put("input_time", now);
         jsonMst.put("sysdeptid", 1);
         jsonMst.put("syscompanyid", 1);
+        jsonMst.put("update_optname", whereJson.getString("update_optname"));
+
+        // 判断此设备是否有对应的润滑人
+        if (ObjectUtil.isEmpty(whereJson.getString("update_optname"))) {
+            JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + whereJson.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+            List<EmBiLubriDevice> repairDeviceDaoList = emBiLubriDeviceService.list(
+                    new QueryWrapper<EmBiLubriDevice>().lambda()
+                            .eq(EmBiLubriDevice::getDevice_code, jsonFile.getString("device_code"))
+            );
+
+            if (repairDeviceDaoList.size() > 1) throw new BadRequestException("此设备对应润滑人员超过2人，请检查!");
+
+            if (ObjectUtil.isNotEmpty(repairDeviceDaoList)){
+                SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+                jsonMst.put("update_optname", userDao.getPerson_name());
+            }
+        }
         mstTab.insert(jsonMst);
 
         // 插入明细表
@@ -190,6 +221,24 @@ public class DevicelubricatemstServiceImpl implements DevicelubricatemstService
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
         jsonMst.put("detail_count", tableData.size());
+        jsonMst.put("update_optname", whereJson.getString("update_optname"));
+
+        // 判断此设备是否有对应的润滑人
+        if (ObjectUtil.isEmpty(whereJson.getString("update_optname"))) {
+            JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + whereJson.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+            List<EmBiLubriDevice> repairDeviceDaoList = emBiLubriDeviceService.list(
+                    new QueryWrapper<EmBiLubriDevice>().lambda()
+                            .eq(EmBiLubriDevice::getDevice_code, jsonFile.getString("device_code"))
+            );
+
+            if (repairDeviceDaoList.size() > 1) throw new BadRequestException("此设备对应润滑人员超过2人，请检查!");
+
+            if (ObjectUtil.isNotEmpty(repairDeviceDaoList)){
+                SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+                jsonMst.put("update_optname", userDao.getPerson_name());
+            }
+        }
         mstTab.update(jsonMst);
 
         // 插入明细表
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java
index 15e6ae61..c5ae1d50 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java
@@ -197,4 +197,10 @@ public class DevicerepairmstController {
         devicerepairmstService.createExcel(whereJson,response);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @ApiOperation("获取人员")
+    @PostMapping("/getUser")
+    public ResponseEntity<Object> getUser(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(devicerepairmstService.getUser(whereJson),HttpStatus.OK);
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java
index 10befe65..d86e44ba 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java
@@ -2,11 +2,19 @@
 package org.nl.wms.device_manage.repair.rest;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.ImageCompress;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.common.utils.FileUtil;
+import org.nl.modules.tools.domain.LocalStorage;
+import org.nl.modules.tools.service.LocalStorageService;
+import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.device_manage.repair.service.DevicerepairrequestService;
 import org.nl.wms.device_manage.repair.service.dto.DevicerepairrequestDto;
 import org.springframework.data.domain.Pageable;
@@ -14,6 +22,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
 
@@ -30,6 +39,8 @@ public class DevicerepairrequestController {
 
     private final DevicerepairrequestService devicerepairrequestService;
 
+    private final LocalStorageService localStorageService;
+
     @GetMapping
     @ApiOperation("查询设备报修")
     //@PreAuthorize("@el.check('devicerepairrequest:list')")
@@ -86,4 +97,31 @@ public class DevicerepairrequestController {
     public ResponseEntity<Object> localStorage(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(devicerepairrequestService.localStorage(whereJson, page), HttpStatus.OK);
     }
+
+    @PostMapping({"/pictures/{request_id}"})
+    @ApiOperation("故障图上传")
+    public ResponseEntity<Object> upload(@RequestParam MultipartFile file, @PathVariable String request_id) {
+        LocalStorage localStorage = this.localStorageService.create((String) null, file);
+        Long compressSize = ImageCompress.imgCompress(localStorage.getPath(), 100L, 0.8);
+        localStorage.setSize(FileUtil.getSize(compressSize));
+        this.localStorageService.update(localStorage);
+
+        JSONObject mstObj = WQLObject.getWQLObject("EM_BI_DeviceRepairRequest").query("request_id = '" + request_id + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(mstObj)) throw new BadRequestException("未找到报修单!");
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        //更新存储表的来源标识
+        JSONObject param = new JSONObject();
+        param.put("source_bill_id", request_id);
+        param.put("source_bill_code", mstObj.getString("request_code"));
+        param.put("source_bill_table", "EM_BI_DeviceRepairRequest");
+        param.put("source_bill_table_pk", "request_id");
+        param.put("is_delete", "0");
+        param.put("create_id", currentUserId);
+        param.put("create_name", SecurityUtils.getCurrentNickName());
+        //本地存储【tool_local_storage】
+        WQLObject storateTab = WQLObject.getWQLObject("tool_local_storage");
+        //storateTab.delete("source_bill_id = '"+inspection_id+"'");
+        storateTab.update(param, "storage_id = '" + localStorage.getId() + "'");
+        return new ResponseEntity(localStorage, HttpStatus.OK);
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/DevicerepairmstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/DevicerepairmstService.java
index ee0103e1..28dd2b66 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/DevicerepairmstService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/DevicerepairmstService.java
@@ -212,4 +212,10 @@ public interface DevicerepairmstService {
      */
     Map<String, Object> query5(Map whereJson, Pageable page);
 
+    /**
+     * 获取人员
+     * @param whereJson 、
+     * @return 、
+     */
+    Object getUser(JSONObject whereJson);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java
index 2b0753ff..71effa24 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java
@@ -14,6 +14,7 @@ import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.SecurityUtils;
@@ -26,11 +27,15 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.ios.service.iostorInv.EmBiIostorinvOutService;
 import org.nl.wms.device_manage.repair.service.DevicerepairmstService;
 import org.nl.wms.device_manage.repair.service.dto.DevicerepairmstDto;
+import org.nl.wms.masterdata_manage.service.em.EmBiRepairDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiRepairDevice;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
 import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.nl.wms.system_manage.service.tableData.ColumnInfoService;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -67,6 +72,12 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
     @Autowired
     private IStIvtBsrealstorattrService storattrService; // 仓库服务
 
+    @Autowired
+    private EmBiRepairDeviceService emBiRepairDeviceService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String device_code = MapUtil.getStr(whereJson, "device_code");
@@ -187,6 +198,23 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
         jsonMst.put("input_time", DateUtil.now());
         jsonMst.put("sysdeptid", 1);
         jsonMst.put("syscompanyid", 1);
+
+        // 判断此设备是否有对应的维修人
+        if (ObjectUtil.isEmpty(whereJson.getString("update_optname"))) {
+            JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + whereJson.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+            List<EmBiRepairDevice> repairDeviceDaoList = emBiRepairDeviceService.list(
+                    new QueryWrapper<EmBiRepairDevice>().lambda()
+                            .eq(EmBiRepairDevice::getDevice_code, jsonFile.getString("device_code"))
+            );
+
+            if (repairDeviceDaoList.size() > 1) throw new BadRequestException("此设备对应维修人员超过2人，请检查!");
+
+            if (ObjectUtil.isNotEmpty(repairDeviceDaoList)){
+                SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+                jsonMst.put("update_optname", userDao.getPerson_name());
+            }
+        }
         mstTab.insert(jsonMst);
 
         // 插入明细表
@@ -223,6 +251,23 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
         jsonMst.put("estimaterepair_times", whereJson.getString("estimaterepair_times"));
         jsonMst.put("update_optname", whereJson.getString("update_optname"));
         jsonMst.put("detail_count", tableData.size());
+
+        // 判断此设备是否有对应的维修人
+        if (ObjectUtil.isEmpty(whereJson.getString("update_optname"))) {
+            JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + whereJson.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+            List<EmBiRepairDevice> repairDeviceDaoList = emBiRepairDeviceService.list(
+                    new QueryWrapper<EmBiRepairDevice>().lambda()
+                            .eq(EmBiRepairDevice::getDevice_code, jsonFile.getString("device_code"))
+            );
+
+            if (repairDeviceDaoList.size() > 1) throw new BadRequestException("此设备对应维修人员超过2人，请检查!");
+
+            if (ObjectUtil.isNotEmpty(repairDeviceDaoList)){
+                SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+                jsonMst.put("update_optname", userDao.getPerson_name());
+            }
+        }
         mstTab.update(jsonMst);
 
         // 插入明细表
@@ -1187,4 +1232,13 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
         JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIR_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC");
         return json;
     }
+
+    @Override
+    public Object getUser(JSONObject whereJson) {
+        List<SysUser> list = iSysUserService.list(
+                new QueryWrapper<SysUser>().lambda()
+                        .eq(SysUser::getIs_used, "1")
+        );
+        return list;
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java
index aaacb92f..8b4e6733 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java
@@ -9,6 +9,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.SecurityUtils;
@@ -20,7 +21,11 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.sportcheck.service.DevicesportcheckmstService;
 import org.nl.wms.device_manage.sportcheck.service.dto.DevicesportcheckmstDto;
 import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.service.em.EmBiSportDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiSportDevice;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -44,6 +49,12 @@ public class DevicesportcheckmstServiceImpl implements DevicesportcheckmstServic
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private EmBiSportDeviceService emBiSportDeviceService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
@@ -161,6 +172,24 @@ public class DevicesportcheckmstServiceImpl implements DevicesportcheckmstServic
         jsonMst.put("input_time", now);
         jsonMst.put("sysdeptid", 1);
         jsonMst.put("syscompanyid", 1);
+        jsonMst.put("update_optname", whereJson.getString("update_optname"));
+
+        // 判断此设备是否有对应的点检人
+        if (ObjectUtil.isEmpty(whereJson.getString("update_optname"))) {
+            JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + whereJson.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+            List<EmBiSportDevice> repairDeviceDaoList = emBiSportDeviceService.list(
+                    new QueryWrapper<EmBiSportDevice>().lambda()
+                            .eq(EmBiSportDevice::getDevice_code, jsonFile.getString("device_code"))
+            );
+
+            if (repairDeviceDaoList.size() > 1) throw new BadRequestException("此设备对应点检人员超过2人，请检查!");
+
+            if (ObjectUtil.isNotEmpty(repairDeviceDaoList)){
+                SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+                jsonMst.put("update_optname", userDao.getPerson_name());
+            }
+        }
         mstTab.insert(jsonMst);
 
         // 插入明细表
@@ -190,6 +219,24 @@ public class DevicesportcheckmstServiceImpl implements DevicesportcheckmstServic
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
         jsonMst.put("detail_count", tableData.size());
+        jsonMst.put("update_optname", whereJson.getString("update_optname"));
+
+        // 判断此设备是否有对应的点检人
+        if (ObjectUtil.isEmpty(whereJson.getString("update_optname"))) {
+            JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + whereJson.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+            List<EmBiSportDevice> repairDeviceDaoList = emBiSportDeviceService.list(
+                    new QueryWrapper<EmBiSportDevice>().lambda()
+                            .eq(EmBiSportDevice::getDevice_code, jsonFile.getString("device_code"))
+            );
+
+            if (repairDeviceDaoList.size() > 1) throw new BadRequestException("此设备对应点检人员超过2人，请检查!");
+
+            if (ObjectUtil.isNotEmpty(repairDeviceDaoList)){
+                SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+                jsonMst.put("update_optname", userDao.getPerson_name());
+            }
+        }
         mstTab.update(jsonMst);
 
         // 插入明细表
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
index d5511f4a..3a260874 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
@@ -9,6 +9,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.SecurityUtils;
@@ -20,13 +21,16 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.upkeep.service.DevicemaintenancemstService;
 import org.nl.wms.device_manage.upkeep.service.dto.DevicemaintenancemstDto;
 import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.service.em.EmBiUpkeepDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiUpkeepDevice;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +49,12 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private EmBiUpkeepDeviceService emBiUpkeepDeviceService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
@@ -162,6 +172,24 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         jsonMst.put("input_time", now);
         jsonMst.put("sysdeptid", 1);
         jsonMst.put("syscompanyid", 1);
+        jsonMst.put("update_optname", whereJson.getString("update_optname"));
+
+        // 判断此设备是否有对应的保养人
+        if (ObjectUtil.isEmpty(whereJson.getString("update_optname"))) {
+            JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + whereJson.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+            List<EmBiUpkeepDevice> repairDeviceDaoList = emBiUpkeepDeviceService.list(
+                    new QueryWrapper<EmBiUpkeepDevice>().lambda()
+                            .eq(EmBiUpkeepDevice::getDevice_code, jsonFile.getString("device_code"))
+            );
+
+            if (repairDeviceDaoList.size() > 1) throw new BadRequestException("此设备对应保养人员超过2人，请检查!");
+
+            if (ObjectUtil.isNotEmpty(repairDeviceDaoList)){
+                SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+                jsonMst.put("update_optname", userDao.getPerson_name());
+            }
+        }
         mstTab.insert(jsonMst);
 
         // 插入明细表
@@ -191,6 +219,24 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
         jsonMst.put("detail_count", tableData.size());
+        jsonMst.put("update_optname", whereJson.getString("update_optname"));
+
+        // 判断此设备是否有对应的保养人
+        if (ObjectUtil.isEmpty(whereJson.getString("update_optname"))) {
+            JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + whereJson.get("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);
+
+            List<EmBiUpkeepDevice> repairDeviceDaoList = emBiUpkeepDeviceService.list(
+                    new QueryWrapper<EmBiUpkeepDevice>().lambda()
+                            .eq(EmBiUpkeepDevice::getDevice_code, jsonFile.getString("device_code"))
+            );
+
+            if (repairDeviceDaoList.size() > 1) throw new BadRequestException("此设备对应保养人员超过2人，请检查!");
+
+            if (ObjectUtil.isNotEmpty(repairDeviceDaoList)){
+                SysUser userDao = iSysUserService.getById(repairDeviceDaoList.get(0).getUser_id());
+                jsonMst.put("update_optname", userDao.getPerson_name());
+            }
+        }
         mstTab.update(jsonMst);
 
         // 插入明细表
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiLubriDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiLubriDeviceController.java
new file mode 100644
index 00000000..bf731bdf
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiLubriDeviceController.java
@@ -0,0 +1,113 @@
+
+package org.nl.wms.masterdata_manage.controller.em;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.jsonwebtoken.lang.Assert;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.EmBiLubriDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiLubriDevice;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Liu xy
+* @date 2022-05-26
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "润滑人与设备档案维护")
+@RequestMapping("/api/embilubridevice")
+@Slf4j
+public class EmBiLubriDeviceController {
+
+    @Autowired
+    private EmBiLubriDeviceService emBiLubriDeviceService;
+
+    @GetMapping
+    @Log("查询人员设备维护")
+    public ResponseEntity<Object> query(DeviceUserQuery query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  emBiLubriDeviceService.queryAll(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
+    }
+
+    @GetMapping("/device")
+    @Log("查询设备")
+    //("查询设备")
+    public ResponseEntity<Object> device(DeviceUserQuery query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  emBiLubriDeviceService.queryAllDevice(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增人员设备维护")
+    public ResponseEntity<Object> create(@RequestBody JSONObject entity){
+        Assert.notNull(entity,"请求参数不能为空");
+
+        EmBiLubriDevice one = emBiLubriDeviceService.getOne(
+                new QueryWrapper<EmBiLubriDevice>().lambda()
+                        .eq(EmBiLubriDevice::getUser_id, entity.getString("user_id"))
+                        .eq(EmBiLubriDevice::getDevice_code, entity.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
+
+        EmBiLubriDevice emBiRepairDevice = entity.toJavaObject(EmBiLubriDevice.class);
+        emBiRepairDevice.setPerson_id(IdUtil.getStringId());
+        emBiLubriDeviceService.save(emBiRepairDevice);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改人员设备维护")
+    public ResponseEntity<Object> update(@RequestBody JSONObject entity){
+
+        EmBiLubriDevice one = emBiLubriDeviceService.getOne(
+                new QueryWrapper<EmBiLubriDevice>().lambda()
+                        .eq(EmBiLubriDevice::getUser_id, entity.getString("user_id"))
+                        .eq(EmBiLubriDevice::getDevice_code, entity.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
+
+        EmBiLubriDevice emBiRepairDevice = emBiLubriDeviceService.getById(entity.getString("person_id"));
+        emBiRepairDevice.setDevice_code(entity.getString("device_code"));
+        emBiLubriDeviceService.updateById(emBiRepairDevice);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+
+    @Log("删除人员设备维护")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        if (ids != null && ids.length>0){
+            emBiLubriDeviceService.removeByIds(Arrays.asList(ids));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiSportDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiSportDeviceController.java
new file mode 100644
index 00000000..768bb4a5
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiSportDeviceController.java
@@ -0,0 +1,113 @@
+
+package org.nl.wms.masterdata_manage.controller.em;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.jsonwebtoken.lang.Assert;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.EmBiSportDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiSportDevice;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Liu xy
+* @date 2022-05-26
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "点检人与设备档案维护")
+@RequestMapping("/api/embisportdevice")
+@Slf4j
+public class EmBiSportDeviceController {
+
+    @Autowired
+    private EmBiSportDeviceService emBiSportDeviceService;
+
+    @GetMapping
+    @Log("查询人员设备维护")
+    public ResponseEntity<Object> query(DeviceUserQuery query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  emBiSportDeviceService.queryAll(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
+    }
+
+    @GetMapping("/device")
+    @Log("查询设备")
+    //("查询设备")
+    public ResponseEntity<Object> device(DeviceUserQuery query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  emBiSportDeviceService.queryAllDevice(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增人员设备维护")
+    public ResponseEntity<Object> create(@RequestBody JSONObject entity){
+        Assert.notNull(entity,"请求参数不能为空");
+
+        EmBiSportDevice one = emBiSportDeviceService.getOne(
+                new QueryWrapper<EmBiSportDevice>().lambda()
+                        .eq(EmBiSportDevice::getUser_id, entity.getString("user_id"))
+                        .eq(EmBiSportDevice::getDevice_code, entity.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
+
+        EmBiSportDevice emBiRepairDevice = entity.toJavaObject(EmBiSportDevice.class);
+        emBiRepairDevice.setPerson_id(IdUtil.getStringId());
+        emBiSportDeviceService.save(emBiRepairDevice);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改人员设备维护")
+    public ResponseEntity<Object> update(@RequestBody JSONObject entity){
+
+        EmBiSportDevice one = emBiSportDeviceService.getOne(
+                new QueryWrapper<EmBiSportDevice>().lambda()
+                        .eq(EmBiSportDevice::getUser_id, entity.getString("user_id"))
+                        .eq(EmBiSportDevice::getDevice_code, entity.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
+
+        EmBiSportDevice emBiRepairDevice = emBiSportDeviceService.getById(entity.getString("person_id"));
+        emBiRepairDevice.setDevice_code(entity.getString("device_code"));
+        emBiSportDeviceService.updateById(emBiRepairDevice);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+
+    @Log("删除人员设备维护")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        if (ids != null && ids.length>0){
+            emBiSportDeviceService.removeByIds(Arrays.asList(ids));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiUpkeepDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiUpkeepDeviceController.java
new file mode 100644
index 00000000..95a3b0b4
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiUpkeepDeviceController.java
@@ -0,0 +1,113 @@
+
+package org.nl.wms.masterdata_manage.controller.em;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.jsonwebtoken.lang.Assert;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.EmBiUpkeepDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiUpkeepDevice;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Liu xy
+* @date 2022-05-26
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "保养人与设备档案维护")
+@RequestMapping("/api/embiupkeepdevice")
+@Slf4j
+public class EmBiUpkeepDeviceController {
+
+    @Autowired
+    private EmBiUpkeepDeviceService emBiUpkeepDeviceService;
+
+    @GetMapping
+    @Log("查询人员设备维护")
+    public ResponseEntity<Object> query(DeviceUserQuery query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  emBiUpkeepDeviceService.queryAll(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
+    }
+
+    @GetMapping("/device")
+    @Log("查询设备")
+    //("查询设备")
+    public ResponseEntity<Object> device(DeviceUserQuery query, PageQuery page){
+        Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
+        List<Map> list =  emBiUpkeepDeviceService.queryAllDevice(query);
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return new ResponseEntity<>(build,HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增人员设备维护")
+    public ResponseEntity<Object> create(@RequestBody JSONObject entity){
+        Assert.notNull(entity,"请求参数不能为空");
+
+        EmBiUpkeepDevice one = emBiUpkeepDeviceService.getOne(
+                new QueryWrapper<EmBiUpkeepDevice>().lambda()
+                        .eq(EmBiUpkeepDevice::getUser_id, entity.getString("user_id"))
+                        .eq(EmBiUpkeepDevice::getDevice_code, entity.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
+
+        EmBiUpkeepDevice emBiRepairDevice = entity.toJavaObject(EmBiUpkeepDevice.class);
+        emBiRepairDevice.setPerson_id(IdUtil.getStringId());
+        emBiUpkeepDeviceService.save(emBiRepairDevice);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改人员设备维护")
+    public ResponseEntity<Object> update(@RequestBody JSONObject entity){
+
+        EmBiUpkeepDevice one = emBiUpkeepDeviceService.getOne(
+                new QueryWrapper<EmBiUpkeepDevice>().lambda()
+                        .eq(EmBiUpkeepDevice::getUser_id, entity.getString("user_id"))
+                        .eq(EmBiUpkeepDevice::getDevice_code, entity.getString("device_code"))
+        );
+
+        if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复");
+
+        EmBiUpkeepDevice emBiRepairDevice = emBiUpkeepDeviceService.getById(entity.getString("person_id"));
+        emBiRepairDevice.setDevice_code(entity.getString("device_code"));
+        emBiUpkeepDeviceService.updateById(emBiRepairDevice);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+
+    @Log("删除人员设备维护")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        if (ids != null && ids.length>0){
+            emBiUpkeepDeviceService.removeByIds(Arrays.asList(ids));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java
index 396dd9bf..a2a141b1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java
@@ -54,6 +54,7 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String device_faultclass_code = MapUtil.getStr(whereJson, "device_faultclass_code");
         String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String faultclass_type_id = MapUtil.getStr(whereJson, "faultclass_type_id");
         String class_idStr = (String) whereJson.get("class_idStr");
 
         HashMap<String, String> map = new HashMap<>();
@@ -68,6 +69,14 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService {
             String classIds = classstandardService.getAllChildIdStr(class_idStr);
             map.put("classIds", classIds);
         }
+        if (!StrUtil.isEmpty(faultclass_type_id)) {
+            map.put("faultclass_type_id", faultclass_type_id);
+            String classIds = classstandardService.getChildIdStr(faultclass_type_id);
+            map.put("classIds2", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds2", classIds);
+        }
         JSONObject json = WQL.getWO("EM_BI_DEVICEFAULTCLASS").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.device_faultclass_code DESC");
         return json;
     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql
index fedd8d61..60042ede 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/wql/EM_BI_DEVICEFAULTCLASS.wql
@@ -15,6 +15,7 @@
 	#################################################
 	输入.flag					        TYPEAS s_string
 	输入.classIds					    TYPEAS f_string
+	输入.classIds2					    TYPEAS f_string
 	输入.device_faultclass_code		    TYPEAS s_string
 
 
@@ -57,6 +58,10 @@
                     class.class_id in 输入.classIds
                 ENDOPTION
 
+                OPTION 输入.classIds2 <> ""
+                    class2.class_id in 输入.classIds2
+                ENDOPTION
+
                 OPTION 输入.device_faultclass_code <> ""
                     (mst.device_faultclass_code like 输入.device_faultclass_code or
                      mst.device_faultclass_name like 输入.device_faultclass_code)
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiLubriDeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiLubriDeviceService.java
new file mode 100644
index 00000000..4e7a5837
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiLubriDeviceService.java
@@ -0,0 +1,28 @@
+package org.nl.wms.masterdata_manage.service.em;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiLubriDevice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface EmBiLubriDeviceService extends IService<EmBiLubriDevice> {
+
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    List<Map> queryAll(DeviceUserQuery whereJson);
+
+    List<Map> queryAllDevice(DeviceUserQuery whereJson);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiSportDeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiSportDeviceService.java
new file mode 100644
index 00000000..ccbb0aae
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiSportDeviceService.java
@@ -0,0 +1,28 @@
+package org.nl.wms.masterdata_manage.service.em;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiSportDevice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface EmBiSportDeviceService extends IService<EmBiSportDevice> {
+
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    List<Map> queryAll(DeviceUserQuery whereJson);
+
+    List<Map> queryAllDevice(DeviceUserQuery whereJson);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiUpkeepDeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiUpkeepDeviceService.java
new file mode 100644
index 00000000..260e5fe0
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/EmBiUpkeepDeviceService.java
@@ -0,0 +1,28 @@
+package org.nl.wms.masterdata_manage.service.em;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiUpkeepDevice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface EmBiUpkeepDeviceService extends IService<EmBiUpkeepDevice> {
+
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @return Map<String,Object>
+     */
+    List<Map> queryAll(DeviceUserQuery whereJson);
+
+    List<Map> queryAllDevice(DeviceUserQuery whereJson);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiLubriDevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiLubriDevice.java
new file mode 100644
index 00000000..2d6ceabd
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiLubriDevice.java
@@ -0,0 +1,38 @@
+package org.nl.wms.masterdata_manage.service.em.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 人员设备关系表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("em_bi_repairpersondevicelubri")
+public class EmBiLubriDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private String person_id;
+    /**
+     * 用户id
+     */
+    private String user_id;
+
+    /**
+     * 设备编码
+     */
+    private String device_code;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiSportDevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiSportDevice.java
new file mode 100644
index 00000000..53d0f44d
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiSportDevice.java
@@ -0,0 +1,38 @@
+package org.nl.wms.masterdata_manage.service.em.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 人员设备关系表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("em_bi_repairpersondevicesport")
+public class EmBiSportDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private String person_id;
+    /**
+     * 用户id
+     */
+    private String user_id;
+
+    /**
+     * 设备编码
+     */
+    private String device_code;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiUpkeepDevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiUpkeepDevice.java
new file mode 100644
index 00000000..7a5ecd59
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/EmBiUpkeepDevice.java
@@ -0,0 +1,38 @@
+package org.nl.wms.masterdata_manage.service.em.dao;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 人员设备关系表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("em_bi_repairpersondeviceupkeep")
+public class EmBiUpkeepDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private String person_id;
+    /**
+     * 用户id
+     */
+    private String user_id;
+
+    /**
+     * 设备编码
+     */
+    private String device_code;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiLubriDeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiLubriDeviceMapper.java
new file mode 100644
index 00000000..4064262f
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiLubriDeviceMapper.java
@@ -0,0 +1,24 @@
+package org.nl.wms.masterdata_manage.service.em.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiLubriDevice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface EmBiLubriDeviceMapper extends BaseMapper<EmBiLubriDevice> {
+
+    List<Map> queryAll(@Param("query") DeviceUserQuery query);
+
+    List<Map> queryAllDevice(@Param("query") DeviceUserQuery query);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiLubriDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiLubriDeviceMapper.xml
new file mode 100644
index 00000000..67293998
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiLubriDeviceMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiLubriDeviceMapper">
+
+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+        sys_user
+        <where>
+            is_used = '1'
+            <if test="query.username != null and query.username  != ''">
+                and username =  #{query.username}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryAllDevice" resultType="java.util.Map">
+        SELECT
+        device.device_code,
+        device.device_name,
+        use1.person_name,
+        mps.person_id
+        FROM
+        em_bi_repairpersondevicelubri mps
+        LEFT JOIN em_bi_equipmentfile device ON device.device_code = mps.device_code
+        LEFT JOIN sys_user use1 ON use1.user_id = mps.user_id
+        <where>
+            mps.user_id =  #{query.user_id}
+        </where>
+
+    </select>
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiSportDeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiSportDeviceMapper.java
new file mode 100644
index 00000000..dfdd9fc7
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiSportDeviceMapper.java
@@ -0,0 +1,24 @@
+package org.nl.wms.masterdata_manage.service.em.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiSportDevice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface EmBiSportDeviceMapper extends BaseMapper<EmBiSportDevice> {
+
+    List<Map> queryAll(@Param("query") DeviceUserQuery query);
+
+    List<Map> queryAllDevice(@Param("query") DeviceUserQuery query);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiSportDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiSportDeviceMapper.xml
new file mode 100644
index 00000000..75698060
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiSportDeviceMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiSportDeviceMapper">
+
+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+        sys_user
+        <where>
+            is_used = '1'
+            <if test="query.username != null and query.username  != ''">
+                and username =  #{query.username}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryAllDevice" resultType="java.util.Map">
+        SELECT
+        device.device_code,
+        device.device_name,
+        use1.person_name,
+        mps.person_id
+        FROM
+        em_bi_repairpersondevicesport mps
+        LEFT JOIN em_bi_equipmentfile device ON device.device_code = mps.device_code
+        LEFT JOIN sys_user use1 ON use1.user_id = mps.user_id
+        <where>
+            mps.user_id =  #{query.user_id}
+        </where>
+
+    </select>
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiUpkeepDeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiUpkeepDeviceMapper.java
new file mode 100644
index 00000000..85862fb9
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiUpkeepDeviceMapper.java
@@ -0,0 +1,24 @@
+package org.nl.wms.masterdata_manage.service.em.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiUpkeepDevice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+public interface EmBiUpkeepDeviceMapper extends BaseMapper<EmBiUpkeepDevice> {
+
+    List<Map> queryAll(@Param("query") DeviceUserQuery query);
+
+    List<Map> queryAllDevice(@Param("query") DeviceUserQuery query);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiUpkeepDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiUpkeepDeviceMapper.xml
new file mode 100644
index 00000000..0dc117c9
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/dao/mapper/EmBiUpkeepDeviceMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiUpkeepDeviceMapper">
+
+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+        sys_user
+        <where>
+            is_used = '1'
+            <if test="query.username != null and query.username  != ''">
+                and username =  #{query.username}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryAllDevice" resultType="java.util.Map">
+        SELECT
+        device.device_code,
+        device.device_name,
+        use1.person_name,
+        mps.person_id
+        FROM
+        em_bi_repairpersondeviceupkeep mps
+        LEFT JOIN em_bi_equipmentfile device ON device.device_code = mps.device_code
+        LEFT JOIN sys_user use1 ON use1.user_id = mps.user_id
+        <where>
+            mps.user_id =  #{query.user_id}
+        </where>
+
+    </select>
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiLubriDeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiLubriDeviceServiceImpl.java
new file mode 100644
index 00000000..636561d5
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiLubriDeviceServiceImpl.java
@@ -0,0 +1,33 @@
+package org.nl.wms.masterdata_manage.service.em.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.EmBiLubriDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiLubriDevice;
+import org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiLubriDeviceMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Service
+public class EmBiLubriDeviceServiceImpl extends ServiceImpl<EmBiLubriDeviceMapper, EmBiLubriDevice> implements EmBiLubriDeviceService {
+
+    @Override
+    public List<Map> queryAll(DeviceUserQuery query) {
+        return this.baseMapper.queryAll(query);
+    }
+
+    @Override
+    public List<Map> queryAllDevice(DeviceUserQuery query) {
+        return this.baseMapper.queryAllDevice(query);
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiSportDeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiSportDeviceServiceImpl.java
new file mode 100644
index 00000000..3b8bca6f
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiSportDeviceServiceImpl.java
@@ -0,0 +1,33 @@
+package org.nl.wms.masterdata_manage.service.em.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.EmBiSportDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiSportDevice;
+import org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiSportDeviceMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Service
+public class EmBiSportDeviceServiceImpl extends ServiceImpl<EmBiSportDeviceMapper, EmBiSportDevice> implements EmBiSportDeviceService {
+
+    @Override
+    public List<Map> queryAll(DeviceUserQuery query) {
+        return this.baseMapper.queryAll(query);
+    }
+
+    @Override
+    public List<Map> queryAllDevice(DeviceUserQuery query) {
+        return this.baseMapper.queryAllDevice(query);
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiUpKeepDeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiUpKeepDeviceServiceImpl.java
new file mode 100644
index 00000000..2477483f
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/em/impl/EmBiUpKeepDeviceServiceImpl.java
@@ -0,0 +1,33 @@
+package org.nl.wms.masterdata_manage.service.em.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
+import org.nl.wms.masterdata_manage.service.em.EmBiUpkeepDeviceService;
+import org.nl.wms.masterdata_manage.service.em.dao.EmBiUpkeepDevice;
+import org.nl.wms.masterdata_manage.service.em.dao.mapper.EmBiUpkeepDeviceMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员设备关系表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-06-06
+ */
+@Service
+public class EmBiUpKeepDeviceServiceImpl extends ServiceImpl<EmBiUpkeepDeviceMapper, EmBiUpkeepDevice> implements EmBiUpkeepDeviceService {
+
+    @Override
+    public List<Map> queryAll(DeviceUserQuery query) {
+        return this.baseMapper.queryAll(query);
+    }
+
+    @Override
+    public List<Map> queryAllDevice(DeviceUserQuery query) {
+        return this.baseMapper.queryAllDevice(query);
+    }
+}
diff --git a/mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/AddDialog.vue b/mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/AddDialog.vue
index 9c06a160..ca445b24 100644
--- a/mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/AddDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/AddDialog.vue
@@ -49,6 +49,24 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="润滑人" prop="update_optname">
+            <el-select
+              v-model="form.update_optname"
+              clearable
+              filterable
+              size="mini"
+              placeholder="请选择/搜索"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in optNameList"
+                :label="item.person_name"
+                :value="item.person_name"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row>
@@ -141,6 +159,7 @@ import crudDevicelubricatemst from '@/views/wms/device_manage/lubricate/devicelu
 import DeviceDialog from '@/views/wms/device_manage/lubricate/devicelubricateplan/DeviceDialog'
 import ItemDialog from '@/views/wms/device_manage/lubricate/devicelubricateplan/ItemDialog'
 import CRUD, { form, crud } from '@crud/crud'
+import crudDevicerepairmst from '@/views/wms/device_manage/repair/devicerepair/devicerepairmst'
 
 export default {
   name: 'AddDialog',
@@ -161,6 +180,7 @@ export default {
       dialogVisible: false,
       deviceDialog: false,
       itemDialog: false,
+      optNameList: [],
       rules: {
         plan_start_date: [
           { required: true, message: '计划开始日期不能为空', trigger: 'blur' }
@@ -181,6 +201,11 @@ export default {
       }
     }
   },
+  created() {
+    crudDevicerepairmst.getUser({}).then(res => {
+      this.optNameList = res
+    })
+  },
   methods: {
     [CRUD.HOOK.beforeSubmit]() {
       const arr = this.form.tableData
diff --git a/mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/index.vue b/mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/index.vue
index 9720d30b..f427133b 100644
--- a/mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/index.vue
+++ b/mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/index.vue
@@ -220,6 +220,9 @@ export default {
       if (data.invstatus !== '01') {
         return this.crud.notify('只能对生成状态的单据提交', CRUD.NOTIFICATION_TYPE.INFO)
       }
+      if (data.update_optname === '') {
+        return this.crud.notify('润滑人不允许为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
       crudDevicelubricatemst.putIn(data).then(res => {
         this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
diff --git a/mes/qd/src/views/wms/device_manage/repair/devicerepair/AddDialog.vue b/mes/qd/src/views/wms/device_manage/repair/devicerepair/AddDialog.vue
index d19602a6..97ba6b82 100644
--- a/mes/qd/src/views/wms/device_manage/repair/devicerepair/AddDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/repair/devicerepair/AddDialog.vue
@@ -77,8 +77,24 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-show="crud.status.edit !== 0 || crud.status.view !== 0 " label="维修人" prop="update_optname">
+      <!--<el-form-item v-show="crud.status.edit !== 0 || crud.status.view !== 0 " label="维修人" prop="update_optname">
         <el-input v-show="crud.status.edit !== 0 || crud.status.view !== 0 " v-model.trim="form.update_optname" style="width: 200px;" :disabled="crud.status.view > 0" />
+      </el-form-item>-->
+      <el-form-item label="维修人" prop="update_optname">
+        <el-select
+          v-model="form.update_optname"
+          clearable
+          filterable
+          size="mini"
+          placeholder="请选择/搜索"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in optNameList"
+            :label="item.person_name"
+            :value="item.person_name"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item v-show="crud.status.edit === 1" label="预计修复时间(小时)" prop="estimaterepair_times">
         <el-input-number v-show="crud.status.edit === 1" v-model="form.estimaterepair_times" :disabled="crud.status.view > 0" :precision="1" :min="0" :max="999" style="width: 200px" :controls="false" />
@@ -185,6 +201,7 @@ export default {
       dialogVisible: false,
       deviceDialog: false,
       itemDialog: false,
+      optNameList: [],
       rules: {
         plan_start_date: [
           { required: true, message: '计划维修日期不能为空', trigger: 'blur' }
@@ -208,6 +225,11 @@ export default {
       }
     }
   },
+  created() {
+    crudDevicerepairmst.getUser({}).then(res => {
+      this.optNameList = res
+    })
+  },
   methods: {
     [CRUD.HOOK.beforeSubmit]() {
     /*  const arr = this.form.tableData
diff --git a/mes/qd/src/views/wms/device_manage/repair/devicerepair/devicerepairmst.js b/mes/qd/src/views/wms/device_manage/repair/devicerepair/devicerepairmst.js
index a8280bb5..c60df778 100644
--- a/mes/qd/src/views/wms/device_manage/repair/devicerepair/devicerepairmst.js
+++ b/mes/qd/src/views/wms/device_manage/repair/devicerepair/devicerepairmst.js
@@ -160,4 +160,12 @@ export function getIosMst(data) {
   })
 }
 
-export default { findByCode, add, edit, del, getDtl, submit, startRepair, endRepair, submitRepair, confirmRepair, submitResuft, getResult, outRepair, checkRepair, uditRepair, getNormBom, getFileBom, submitReceive, getDeviceInfo, getIosMst }
+export function getUser(data) {
+  return request({
+    url: 'api/devicerepairmst/getUser',
+    method: 'post',
+    data
+  })
+}
+
+export default { findByCode, add, edit, del, getDtl, submit, startRepair, endRepair, submitRepair, confirmRepair, submitResuft, getResult, outRepair, checkRepair, uditRepair, getNormBom, getFileBom, submitReceive, getDeviceInfo, getIosMst, getUser }
diff --git a/mes/qd/src/views/wms/device_manage/repair/devicevprs/FaultDialog.vue b/mes/qd/src/views/wms/device_manage/repair/devicevprs/FaultDialog.vue
index 4562e665..8d4c73df 100644
--- a/mes/qd/src/views/wms/device_manage/repair/devicevprs/FaultDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/repair/devicevprs/FaultDialog.vue
@@ -34,6 +34,16 @@
           placeholder="请选择"
         />
       </el-form-item>
+
+      <el-form-item label="故障标签">
+        <treeselect
+          v-model="query.faultclass_type_id"
+          :load-options="loadClass"
+          :options="classes2"
+          style="width: 200px;"
+          placeholder="请选择"
+        />
+      </el-form-item>
       <rrOperation />
     </el-form>
 
@@ -62,6 +72,7 @@
       <el-table-column prop="class_name" label="设备类别" />
       <el-table-column prop="device_faultclass_code" label="设备故障分类编码" />
       <el-table-column prop="device_faultclass_name" label="设备故障分类名称" />
+      <el-table-column prop="class_name_faultclass" label="故障类型" />
       <el-table-column prop="solutions" label="解决措施" />
       <el-table-column prop="remark" label="备注" />
     </el-table>
@@ -115,6 +126,7 @@ export default {
       tableRadio: null,
       checkrow: null,
       classes: [],
+      classes2: [],
       class_idStr: null,
       materOpt_code: '23',
       materOpt_code_2: '26',
@@ -138,6 +150,7 @@ export default {
       this.class_idStr = res.class_idStr
       this.crud.query.class_idStr = this.class_idStr
       this.queryClassId()
+      this.queryClassId2()
     })
     const data = {
       'materOpt_code': this.materOpt_code_2
@@ -215,6 +228,19 @@ export default {
         })
       })
     },
+    queryClassId2() {
+      const param = {
+        'class_idStr': '3'
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes2 = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
     getSubTypes(id) {
       crudClassstandard.getClassSuperior2(id).then(res => {
         const date = res.content
@@ -222,6 +248,13 @@ export default {
         this.classes = date
       })
     },
+    getSubTypes2(id) {
+      crudClassstandard.getClassSuperior2(id).then(res => {
+        const date = res.content
+        this.buildClass(date)
+        this.classes2 = date
+      })
+    },
     buildClass(classes) {
       classes.forEach(data => {
         if (data.children) {
diff --git a/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue b/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue
index 89e52723..f16943b2 100644
--- a/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue
+++ b/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue
@@ -94,8 +94,19 @@
         >
           不维修
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-upload"
+          :disabled="crud.selections.length !== 1"
+          @click="uploadImage"
+        >
+          上传图片
+        </el-button>
       </crudOperation>
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0 || crud.status.view > 0" :title="crud.status.title" width="800px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
           <el-row>
             <el-col :span="12">
@@ -143,7 +154,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="班组配合人:" prop="product_person_name">
-                <el-input v-model.trim="form.product_person_name" style="width: 200px;" />
+                <el-input v-model.trim="form.product_person_name" style="width: 200px;" :disabled="crud.status.view > 0" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -151,7 +162,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="故障描述:" prop="fault_desc">
-                <el-input v-model.trim="form.fault_desc" style="width: 650px;" rows="2" type="textarea" />
+                <el-input v-model.trim="form.fault_desc" style="width: 650px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -159,7 +170,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="备注:" prop="remark">
-                <el-input v-model.trim="form.remark" style="width: 650px;" rows="2" type="textarea" />
+                <el-input v-model.trim="form.remark" style="width: 650px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -172,12 +183,16 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" min-width="35" />
-        <el-table-column fixed="left" prop="request_code" min-width="140" label="报修单号" show-overflow-tooltip />
-       <!-- <el-table-column fixed="left" prop="path" label="故障图片" min-width="90">
+        <el-table-column fixed="left" prop="path" label="故障图片" min-width="90">
           <template slot-scope="scope">
             <el-button type="primary" icon="el-icon-folder-opened" circle @click="Picconfirm(scope.$index, scope.row)" />
           </template>
-        </el-table-column>-->
+        </el-table-column>
+        <el-table-column fixed="left" prop="request_code" min-width="140" label="报修单号" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.request_code }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="device_code" label="设备编码" min-width="120" show-overflow-tooltip />
         <el-table-column prop="device_name" label="设备名称" min-width="150" show-overflow-tooltip />
         <el-table-column prop="extend_code" label="设备自编码" min-width="100" show-overflow-tooltip />
@@ -209,6 +224,37 @@
       <!--分页组件-->
       <pagination />
     </div>
+
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+      @close="handleClose"
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        :headers="headers"
+        class="upload-demo"
+        :auto-upload="false"
+        drag
+        :action="baseApi +'/api/devicerepairrequest/pictures/'+request_id"
+        multiple
+        :before-upload="beforeUpload"
+        :on-exceed="handleExceed"
+        :on-error="handleError"
+        :on-success="handleSuccess"
+      >
+        <i class="el-icon-upload" />
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div slot="tip" class="el-upload__tip">只能上传不超过50MB的文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="info" @click="dialogVisible = false">取消</el-button>
+        <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+      </div>
+    </el-dialog>
+
     <PicDialog ref="child" :dialog-show.sync="PicDialog" />
     <DeviceDialog :dialog-show.sync="deviceDialog" :is-single="true" @tableChanged2="tableChanged2" />
     <FaultDialog :dialog-show.sync="faultDialog" :is-single="true" :open-param="openParam" @tableChanged="tableChanged" />
@@ -232,6 +278,7 @@ import DeviceDialog from '@/views/wms/device_manage/repair/devicevprs/DeviceDial
 import FaultDialog from '@/views/wms/device_manage/repair/devicevprs/FaultDialog'
 import { mapGetters } from 'vuex'
 import crudDept from '@/views/system/dept/dept'
+import { getToken } from '@/utils/auth'
 
 const defaultForm = { material_type_id: null, product_person_name: null, device_faultclass_name: null, device_code: null, request_id: null, request_code: null, devicerecord_id: null, fault_time: null, device_faultclass_id: null, fault_desc: null, fault_level: null, remark: null, status: null, create_id: null, create_name: null, create_time: null, is_passed: null, process_id: null, process_name: null, process_time: null, finish_id: null, finish_name: null, finish_time: null, is_delete: null, sysdeptid: null, syscompanyid: null }
 export default {
@@ -258,13 +305,16 @@ export default {
   data() {
     return {
       openParam: null,
+      request_id: '',
       deviceDialog: false,
       faultDialog: false,
+      dialogVisible: false,
       classes: [],
       class_idStr: null,
       depts: [],
       checkrows: [],
       materOpt_code: '23',
+      headers: { 'Authorization': getToken() },
       statusList: [
         { 'label': '生成', 'value': '01' },
         { 'label': '维修中', 'value': '02' },
@@ -293,9 +343,10 @@ export default {
     }
   },
   computed: {
-    ...mapGetters({
-      user: 'user'
-    })
+    ...mapGetters([
+      'baseApi',
+      'fileUploadApi'
+    ])
   },
   created() {
     const param = {
@@ -417,7 +468,6 @@ export default {
       })
     },
     Picconfirm(index, row) {
-
       this.$refs.child.setForm(row.request_code)
       this.PicDialog = true
     },
@@ -474,6 +524,49 @@ export default {
           data.children = null
         }
       })
+    },
+    uploadImage() {
+      const _selectData = this.$refs.table.selection
+      if (_selectData.length === 0 || _selectData.length > 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      const data = _selectData[0]
+      this.request_id = data.request_id
+      this.dialogVisible = true
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    beforeUpload(file) {
+      let isLt2M = true
+      isLt2M = file.size / 1024 / 1024 < 50
+      if (!isLt2M) {
+        this.loading = false
+        this.$message.error('上传文件大小不能超过 50MB!')
+      }
+      return isLt2M
+    },
+    handleExceed(files, fileList) {
+      this.crud.notify('当前限制最多能选择 1 个文件', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    handleSuccess(files, fileList) {
+      this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      this.$refs.upload.clearFiles()
+      this.dialogVisible = false
+      this.crud.toQuery()
+    },
+    handleError(e, file, fileList) {
+      const msg = JSON.parse(e.message)
+      this.$notify({
+        title: msg.message,
+        type: 'error',
+        duration: 2500
+      })
+      this.loading = false
+    },
+    submitUpload() {
+      const flag = this.$refs.upload.submit()
     }
   }
 }
diff --git a/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/AddDialog.vue b/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/AddDialog.vue
index 3b0df6dc..e50a7337 100644
--- a/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/AddDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/AddDialog.vue
@@ -49,6 +49,25 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="点检人" prop="update_optname">
+            <el-select
+              v-model="form.update_optname"
+              clearable
+              filterable
+              size="mini"
+              placeholder="请选择/搜索"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in optNameList"
+                :label="item.person_name"
+                :value="item.person_name"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row>
@@ -141,6 +160,7 @@ import crudDevicesportcheckmst from '@/views/wms/device_manage/sportcheck/device
 import DeviceDialog from '@/views/wms/device_manage/sportcheck/devicesportcheckplan/DeviceDialog'
 import ItemDialog from '@/views/wms/device_manage/sportcheck/devicesportcheckplan/ItemDialog'
 import CRUD, { form, crud } from '@crud/crud'
+import crudDevicerepairmst from '@/views/wms/device_manage/repair/devicerepair/devicerepairmst'
 
 export default {
   name: 'AddDialog',
@@ -161,6 +181,7 @@ export default {
       dialogVisible: false,
       deviceDialog: false,
       itemDialog: false,
+      optNameList: [],
       rules: {
         plan_start_date: [
           { required: true, message: '计划开始日期不能为空', trigger: 'blur' }
@@ -181,6 +202,11 @@ export default {
       }
     }
   },
+  created() {
+    crudDevicerepairmst.getUser({}).then(res => {
+      this.optNameList = res
+    })
+  },
   methods: {
     [CRUD.HOOK.beforeSubmit]() {
       const arr = this.form.tableData
diff --git a/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/index.vue b/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/index.vue
index 408a22fb..ead99d4d 100644
--- a/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/index.vue
+++ b/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/index.vue
@@ -220,6 +220,9 @@ export default {
       if (data.invstatus !== '01') {
         return this.crud.notify('只能对生成状态的单据提交', CRUD.NOTIFICATION_TYPE.INFO)
       }
+      if (data.update_optname === '') {
+        return this.crud.notify('点检人不允许为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
       crudDevicesportcheckmst.putIn(data).then(res => {
         this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue
index 0621c722..9e2bccff 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue
@@ -49,6 +49,25 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="保养人" prop="update_optname">
+            <el-select
+              v-model="form.update_optname"
+              clearable
+              filterable
+              size="mini"
+              placeholder="请选择/搜索"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in optNameList"
+                :label="item.person_name"
+                :value="item.person_name"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row>
@@ -141,6 +160,7 @@ import crudDevicemaintenancemst from '@/views/wms/device_manage/upkeep/devicemai
 import DeviceDialog from '@/views/wms/device_manage/upkeep/devicemaintenanceplan/DeviceDialog'
 import ItemDialog from '@/views/wms/device_manage/upkeep/devicemaintenanceplan/ItemDialog'
 import CRUD, { form, crud } from '@crud/crud'
+import crudDevicerepairmst from '@/views/wms/device_manage/repair/devicerepair/devicerepairmst'
 
 export default {
   name: 'AddDialog',
@@ -161,6 +181,7 @@ export default {
       dialogVisible: false,
       deviceDialog: false,
       itemDialog: false,
+      optNameList: [],
       rules: {
         plan_start_date: [
           { required: true, message: '计划开始日期不能为空', trigger: 'blur' }
@@ -181,6 +202,11 @@ export default {
       }
     }
   },
+  created() {
+    crudDevicerepairmst.getUser({}).then(res => {
+      this.optNameList = res
+    })
+  },
   methods: {
     [CRUD.HOOK.beforeSubmit]() {
       const arr = this.form.tableData
diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue
index f151efe5..219dce55 100644
--- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue
+++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue
@@ -222,6 +222,9 @@ export default {
       if (data.invstatus !== '01') {
         return this.crud.notify('只能对生成状态的单据提交', CRUD.NOTIFICATION_TYPE.INFO)
       }
+      if (data.update_optname === '') {
+        return this.crud.notify('保养人不允许为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
       crudDevicemaintenancemst.putIn(data).then(res => {
         this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/SelectDeviceDialog.vue b/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/SelectDeviceDialog.vue
new file mode 100644
index 00000000..5553447c
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/SelectDeviceDialog.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog
+    title="设备选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <label class="el-form-item-label">设备搜索</label>
+    <el-input
+      v-model="query.device_code"
+      clearable
+      size="small"
+      placeholder="请输入设备编码或名称"
+      style="width: 220px;"
+      class="filter-item"
+    />
+    <rrOperation :crud="crud" />
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;margin-top: 15px"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @selection-change="crud.selectionChangeHandler"
+      @current-change="clickChange"
+    >
+      <el-table-column label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="device_code" label="设备编码" />
+      <el-table-column prop="device_name" label="设备名称" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/equipmentfile'
+
+export default {
+  name: 'SelectDeviceDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '设备选择', url: 'api/equipmentfile', crudMethod: { ...equipmentfile }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      tableRadio: null,
+      dialogVisible: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    setForm(user_id) {
+      this.user_id = user_id
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.afterRefresh]() {
+      return true
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      if (this.tableRadio === null) {
+        this.$message('至少选择一条设备信息')
+        return
+      }
+      console.log(this.crud.selections)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged3', this.tableRadio)
+    },
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/dictDetail.vue b/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/dictDetail.vue
new file mode 100644
index 00000000..1db82bfd
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/dictDetail.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div v-if="query.user_id === ''">
+      <div class="my-code">点击查看设备详情</div>
+    </div>
+    <div v-else>
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.label"
+            clearable
+            size="mini"
+            placeholder="输入字典标签查询"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="toQuery"
+          />
+          <rrOperation />
+        </div>
+      </div>
+      <!--表单组件-->
+      <el-dialog
+        append-to-body
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="设备编码" prop="device_code">
+            <template scope="scope">
+              <el-input v-model="form.device_code" disabled style="width: 250px;" clearable >
+                <el-button slot="append" icon="el-icon-plus" @click="queryDevice(scope.$index, scope.row)" />
+              </el-input>
+            </template>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column label="所属人员" min-width="100" show-overflow-tooltip>
+          {{ query.person_name }}
+        </el-table-column>
+        <el-table-column prop="device_code" label="设备编码" align="center" width="120" show-overflow-tooltip />
+        <el-table-column
+          v-permission="['admin','dict:edit','dict:del']"
+          label="操作"
+          align="center"
+          width="115px"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <SelectDeviceDialog ref="selectDeviceDialog" :dialog-show.sync="deviceShow" @tableChanged3="tableChanged3" />
+
+  </div>
+</template>
+
+<script>
+import crudPersoncorrdevice from '@/views/wms/masterdata_manage/em/lubripersondevice/lubripersondevice'
+import CRUD, { form, header, presenter } from '@crud/crud'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+import SelectDeviceDialog from './SelectDeviceDialog'
+
+const defaultForm = {
+  device_code: null
+}
+
+export default {
+  components: { pagination, rrOperation, udOperation, SelectDeviceDialog },
+  cruds() {
+    return [
+      CRUD({
+        title: '设备详情',
+        url: 'api/embilubridevice/device',
+        query: { code: '' },
+        idField: 'person_id',
+        sort: ['person_id,asc', 'person_id,desc'],
+        crudMethod: { ...crudPersoncorrdevice },
+        optShow: {
+          add: true,
+          edit: true,
+          del: true,
+          reset: false
+        },
+        queryOnPresenterCreated: false
+      })
+    ]
+  },
+  mixins: [
+    presenter(),
+    header(),
+    form(function() {
+      return Object.assign({}, defaultForm)
+    })],
+  data() {
+    return {
+      dictId: null,
+      deviceShow: false,
+      rules: {
+        device_code: [
+          { required: true, message: '请输入设备号', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    queryDevice() {
+      this.deviceShow = true
+    },
+    tableChanged3(row) {
+      this.form.device_code = row.device_code
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/index.vue
new file mode 100644
index 00000000..d3e7d055
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/index.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container">
+    <!-- 字典列表 -->
+    <el-row :gutter="10">
+      <el-col :xs="13" :sm="13" :md="13" :lg="13" :xl="13" style="margin-bottom: 10px">
+        <el-card class="box-card">
+          <!--工具栏-->
+          <div class="head-container">
+            <div v-if="crud.props.searchToggle">
+              <!-- 搜索 -->
+              <el-input v-model="query.username" clearable size="mini" placeholder="输入人员名称" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+              <rrOperation />
+            </div>
+            <crudOperation :permission="permission" />
+          </div>
+          <!--表格渲染-->
+          <el-table
+            ref="table"
+            v-loading="crud.loading"
+            :data="crud.data"
+            highlight-current-row
+            style="width: 100%;"
+            @selection-change="crud.selectionChangeHandler"
+            @current-change="handleCurrentChange">
+            <el-table-column prop="username" label="用户名" />
+            <el-table-column prop="person_name" label="名称" />
+            <el-table-column prop="gender" label="性别" />
+            <el-table-column prop="phone" label="手机号码" width="110" />
+            <el-table-column prop="email" label="邮箱" width="140" />
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </el-card>
+      </el-col>
+      <!-- 字典详情列表 -->
+      <el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>设备详情</span>
+            <el-button
+              v-if="this.rowDtl !== null"
+              class="filter-item"
+              size="mini"
+              style="float: right;padding: 4px 10px"
+              type="primary"
+              icon="el-icon-plus"
+              @click="$refs.dictDetail && $refs.dictDetail.crud.toAdd()"
+            >新增</el-button>
+          </div>
+          <dictDetail ref="dictDetail" :permission="permission" />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import dictDetail from './dictDetail.vue'
+import crudPersoncorrdevice from '@/views/wms/masterdata_manage/em/lubripersondevice/lubripersondevice'
+
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+
+const defaultForm = {}
+
+export default {
+  name: 'Lubripersondevice',
+  components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
+  cruds() {
+    return [
+      CRUD({
+        title: '润滑人与设备档案维护',
+        url: 'api/embilubridevice',
+        idField: 'jockey_id',
+        crudMethod: { ...crudPersoncorrdevice },
+        optShow: {
+          add: false,
+          edit: false,
+          del: false,
+          download: false,
+          reset: true
+        }
+      })
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      rowDtl: null,
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        code: [
+          { required: true, message: '请输入编码', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    checkPermission,
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.$refs.dictDetail) {
+        this.$refs.dictDetail.query.user_id = ''
+        this.rowDtl = null
+        this.$refs.dictDetail.crud.toQuery()
+      }
+      return true
+    },
+    // 选中字典后，设置字典详情数据
+    handleCurrentChange(val) {
+      if (val) {
+        this.rowDtl = val
+        this.$refs.dictDetail.query.user_id = val.user_id
+        this.$refs.dictDetail.query.person_name = val.person_name
+        this.$refs.dictDetail.form.user_id = val.user_id
+        this.$refs.dictDetail.crud.toQuery()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/lubripersondevice.js b/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/lubripersondevice.js
new file mode 100644
index 00000000..2f89353d
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/lubripersondevice/lubripersondevice.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/embilubridevice',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/embilubridevice/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/embilubridevice',
+    method: 'put',
+    data
+  })
+}
+
+export function addPersons(data) {
+  return request({
+    url: 'api/embilubridevice/addPersons',
+    method: 'post',
+    data
+  })
+}
+
+export function getHeader(data) {
+  return request({
+    url: 'api/embilubridevice/getHeader',
+    method: 'post',
+    data
+  })
+}
+
+export function getDeviceIdByUserId(data) {
+  return request({
+    url: 'api/embilubridevice/getDeviceIdByUserId',
+    method: 'post',
+    data
+  })
+}
+
+export function addDevices(data) {
+  return request({
+    url: 'api/embilubridevice/addDevices',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteRow(data) {
+  return request({
+    url: 'api/embilubridevice/deleteRow',
+    method: 'delete',
+    data
+  })
+}
+
+export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices }
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/SelectDeviceDialog.vue b/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/SelectDeviceDialog.vue
new file mode 100644
index 00000000..5553447c
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/SelectDeviceDialog.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog
+    title="设备选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <label class="el-form-item-label">设备搜索</label>
+    <el-input
+      v-model="query.device_code"
+      clearable
+      size="small"
+      placeholder="请输入设备编码或名称"
+      style="width: 220px;"
+      class="filter-item"
+    />
+    <rrOperation :crud="crud" />
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;margin-top: 15px"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @selection-change="crud.selectionChangeHandler"
+      @current-change="clickChange"
+    >
+      <el-table-column label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="device_code" label="设备编码" />
+      <el-table-column prop="device_name" label="设备名称" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/equipmentfile'
+
+export default {
+  name: 'SelectDeviceDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '设备选择', url: 'api/equipmentfile', crudMethod: { ...equipmentfile }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      tableRadio: null,
+      dialogVisible: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    setForm(user_id) {
+      this.user_id = user_id
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.afterRefresh]() {
+      return true
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      if (this.tableRadio === null) {
+        this.$message('至少选择一条设备信息')
+        return
+      }
+      console.log(this.crud.selections)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged3', this.tableRadio)
+    },
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/dictDetail.vue b/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/dictDetail.vue
new file mode 100644
index 00000000..72cd5e97
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/dictDetail.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div v-if="query.user_id === ''">
+      <div class="my-code">点击查看设备详情</div>
+    </div>
+    <div v-else>
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.label"
+            clearable
+            size="mini"
+            placeholder="输入字典标签查询"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="toQuery"
+          />
+          <rrOperation />
+        </div>
+      </div>
+      <!--表单组件-->
+      <el-dialog
+        append-to-body
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="设备编码" prop="device_code">
+            <template scope="scope">
+              <el-input v-model="form.device_code" disabled style="width: 250px;" clearable >
+                <el-button slot="append" icon="el-icon-plus" @click="queryDevice(scope.$index, scope.row)" />
+              </el-input>
+            </template>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column label="所属人员" min-width="100" show-overflow-tooltip>
+          {{ query.person_name }}
+        </el-table-column>
+        <el-table-column prop="device_code" label="设备编码" align="center" width="120" show-overflow-tooltip />
+        <el-table-column
+          v-permission="['admin','dict:edit','dict:del']"
+          label="操作"
+          align="center"
+          width="115px"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <SelectDeviceDialog ref="selectDeviceDialog" :dialog-show.sync="deviceShow" @tableChanged3="tableChanged3" />
+
+  </div>
+</template>
+
+<script>
+import crudPersoncorrdevice from '@/views/wms/masterdata_manage/em/sportpersondevice/sportpersondevice'
+import CRUD, { form, header, presenter } from '@crud/crud'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+import SelectDeviceDialog from './SelectDeviceDialog'
+
+const defaultForm = {
+  device_code: null
+}
+
+export default {
+  components: { pagination, rrOperation, udOperation, SelectDeviceDialog },
+  cruds() {
+    return [
+      CRUD({
+        title: '设备详情',
+        url: 'api/embisportdevice/device',
+        query: { code: '' },
+        idField: 'person_id',
+        sort: ['person_id,asc', 'person_id,desc'],
+        crudMethod: { ...crudPersoncorrdevice },
+        optShow: {
+          add: true,
+          edit: true,
+          del: true,
+          reset: false
+        },
+        queryOnPresenterCreated: false
+      })
+    ]
+  },
+  mixins: [
+    presenter(),
+    header(),
+    form(function() {
+      return Object.assign({}, defaultForm)
+    })],
+  data() {
+    return {
+      dictId: null,
+      deviceShow: false,
+      rules: {
+        device_code: [
+          { required: true, message: '请输入设备号', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    queryDevice() {
+      this.deviceShow = true
+    },
+    tableChanged3(row) {
+      this.form.device_code = row.device_code
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/index.vue
new file mode 100644
index 00000000..2c5c35ef
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/index.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container">
+    <!-- 字典列表 -->
+    <el-row :gutter="10">
+      <el-col :xs="13" :sm="13" :md="13" :lg="13" :xl="13" style="margin-bottom: 10px">
+        <el-card class="box-card">
+          <!--工具栏-->
+          <div class="head-container">
+            <div v-if="crud.props.searchToggle">
+              <!-- 搜索 -->
+              <el-input v-model="query.username" clearable size="mini" placeholder="输入人员名称" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+              <rrOperation />
+            </div>
+            <crudOperation :permission="permission" />
+          </div>
+          <!--表格渲染-->
+          <el-table
+            ref="table"
+            v-loading="crud.loading"
+            :data="crud.data"
+            highlight-current-row
+            style="width: 100%;"
+            @selection-change="crud.selectionChangeHandler"
+            @current-change="handleCurrentChange">
+            <el-table-column prop="username" label="用户名" />
+            <el-table-column prop="person_name" label="名称" />
+            <el-table-column prop="gender" label="性别" />
+            <el-table-column prop="phone" label="手机号码" width="110" />
+            <el-table-column prop="email" label="邮箱" width="140" />
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </el-card>
+      </el-col>
+      <!-- 字典详情列表 -->
+      <el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>设备详情</span>
+            <el-button
+              v-if="this.rowDtl !== null"
+              class="filter-item"
+              size="mini"
+              style="float: right;padding: 4px 10px"
+              type="primary"
+              icon="el-icon-plus"
+              @click="$refs.dictDetail && $refs.dictDetail.crud.toAdd()"
+            >新增</el-button>
+          </div>
+          <dictDetail ref="dictDetail" :permission="permission" />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import dictDetail from './dictDetail.vue'
+import crudPersoncorrdevice from '@/views/wms/masterdata_manage/em/sportpersondevice/sportpersondevice'
+
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+
+const defaultForm = {}
+
+export default {
+  name: 'Sportpersondevice',
+  components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
+  cruds() {
+    return [
+      CRUD({
+        title: '点检人与设备档案维护',
+        url: 'api/embisportdevice',
+        idField: 'jockey_id',
+        crudMethod: { ...crudPersoncorrdevice },
+        optShow: {
+          add: false,
+          edit: false,
+          del: false,
+          download: false,
+          reset: true
+        }
+      })
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      rowDtl: null,
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        code: [
+          { required: true, message: '请输入编码', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    checkPermission,
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.$refs.dictDetail) {
+        this.$refs.dictDetail.query.user_id = ''
+        this.rowDtl = null
+        this.$refs.dictDetail.crud.toQuery()
+      }
+      return true
+    },
+    // 选中字典后，设置字典详情数据
+    handleCurrentChange(val) {
+      if (val) {
+        this.rowDtl = val
+        this.$refs.dictDetail.query.user_id = val.user_id
+        this.$refs.dictDetail.query.person_name = val.person_name
+        this.$refs.dictDetail.form.user_id = val.user_id
+        this.$refs.dictDetail.crud.toQuery()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/sportpersondevice.js b/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/sportpersondevice.js
new file mode 100644
index 00000000..59ec87fc
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/sportpersondevice/sportpersondevice.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/embisportdevice',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/embisportdevice/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/embisportdevice',
+    method: 'put',
+    data
+  })
+}
+
+export function addPersons(data) {
+  return request({
+    url: 'api/embisportdevice/addPersons',
+    method: 'post',
+    data
+  })
+}
+
+export function getHeader(data) {
+  return request({
+    url: 'api/embisportdevice/getHeader',
+    method: 'post',
+    data
+  })
+}
+
+export function getDeviceIdByUserId(data) {
+  return request({
+    url: 'api/embisportdevice/getDeviceIdByUserId',
+    method: 'post',
+    data
+  })
+}
+
+export function addDevices(data) {
+  return request({
+    url: 'api/embisportdevice/addDevices',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteRow(data) {
+  return request({
+    url: 'api/embisportdevice/deleteRow',
+    method: 'delete',
+    data
+  })
+}
+
+export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices }
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/SelectDeviceDialog.vue b/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/SelectDeviceDialog.vue
new file mode 100644
index 00000000..5553447c
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/SelectDeviceDialog.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog
+    title="设备选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <label class="el-form-item-label">设备搜索</label>
+    <el-input
+      v-model="query.device_code"
+      clearable
+      size="small"
+      placeholder="请输入设备编码或名称"
+      style="width: 220px;"
+      class="filter-item"
+    />
+    <rrOperation :crud="crud" />
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;margin-top: 15px"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @selection-change="crud.selectionChangeHandler"
+      @current-change="clickChange"
+    >
+      <el-table-column label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="device_code" label="设备编码" />
+      <el-table-column prop="device_name" label="设备名称" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/equipmentfile'
+
+export default {
+  name: 'SelectDeviceDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '设备选择', url: 'api/equipmentfile', crudMethod: { ...equipmentfile }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      tableRadio: null,
+      dialogVisible: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    setForm(user_id) {
+      this.user_id = user_id
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.afterRefresh]() {
+      return true
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      if (this.tableRadio === null) {
+        this.$message('至少选择一条设备信息')
+        return
+      }
+      console.log(this.crud.selections)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged3', this.tableRadio)
+    },
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/dictDetail.vue b/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/dictDetail.vue
new file mode 100644
index 00000000..164ab180
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/dictDetail.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div v-if="query.user_id === ''">
+      <div class="my-code">点击查看设备详情</div>
+    </div>
+    <div v-else>
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input
+            v-model="query.label"
+            clearable
+            size="mini"
+            placeholder="输入字典标签查询"
+            style="width: 200px;"
+            class="filter-item"
+            @keyup.enter.native="toQuery"
+          />
+          <rrOperation />
+        </div>
+      </div>
+      <!--表单组件-->
+      <el-dialog
+        append-to-body
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="设备编码" prop="device_code">
+            <template scope="scope">
+              <el-input v-model="form.device_code" disabled style="width: 250px;" clearable >
+                <el-button slot="append" icon="el-icon-plus" @click="queryDevice(scope.$index, scope.row)" />
+              </el-input>
+            </template>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column label="所属人员" min-width="100" show-overflow-tooltip>
+          {{ query.person_name }}
+        </el-table-column>
+        <el-table-column prop="device_code" label="设备编码" align="center" width="120" show-overflow-tooltip />
+        <el-table-column
+          v-permission="['admin','dict:edit','dict:del']"
+          label="操作"
+          align="center"
+          width="115px"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <SelectDeviceDialog ref="selectDeviceDialog" :dialog-show.sync="deviceShow" @tableChanged3="tableChanged3" />
+
+  </div>
+</template>
+
+<script>
+import crudPersoncorrdevice from '@/views/wms/masterdata_manage/em/upkeeppersondevice/upkeeppersondevice'
+import CRUD, { form, header, presenter } from '@crud/crud'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+import SelectDeviceDialog from './SelectDeviceDialog'
+
+const defaultForm = {
+  device_code: null
+}
+
+export default {
+  components: { pagination, rrOperation, udOperation, SelectDeviceDialog },
+  cruds() {
+    return [
+      CRUD({
+        title: '设备详情',
+        url: 'api/embiupkeepdevice/device',
+        query: { code: '' },
+        idField: 'person_id',
+        sort: ['person_id,asc', 'person_id,desc'],
+        crudMethod: { ...crudPersoncorrdevice },
+        optShow: {
+          add: true,
+          edit: true,
+          del: true,
+          reset: false
+        },
+        queryOnPresenterCreated: false
+      })
+    ]
+  },
+  mixins: [
+    presenter(),
+    header(),
+    form(function() {
+      return Object.assign({}, defaultForm)
+    })],
+  data() {
+    return {
+      dictId: null,
+      deviceShow: false,
+      rules: {
+        device_code: [
+          { required: true, message: '请输入设备号', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    queryDevice() {
+      this.deviceShow = true
+    },
+    tableChanged3(row) {
+      this.form.device_code = row.device_code
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/index.vue
new file mode 100644
index 00000000..22a28498
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/index.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container">
+    <!-- 字典列表 -->
+    <el-row :gutter="10">
+      <el-col :xs="13" :sm="13" :md="13" :lg="13" :xl="13" style="margin-bottom: 10px">
+        <el-card class="box-card">
+          <!--工具栏-->
+          <div class="head-container">
+            <div v-if="crud.props.searchToggle">
+              <!-- 搜索 -->
+              <el-input v-model="query.username" clearable size="mini" placeholder="输入人员名称" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+              <rrOperation />
+            </div>
+            <crudOperation :permission="permission" />
+          </div>
+          <!--表格渲染-->
+          <el-table
+            ref="table"
+            v-loading="crud.loading"
+            :data="crud.data"
+            highlight-current-row
+            style="width: 100%;"
+            @selection-change="crud.selectionChangeHandler"
+            @current-change="handleCurrentChange">
+            <el-table-column prop="username" label="用户名" />
+            <el-table-column prop="person_name" label="名称" />
+            <el-table-column prop="gender" label="性别" />
+            <el-table-column prop="phone" label="手机号码" width="110" />
+            <el-table-column prop="email" label="邮箱" width="140" />
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </el-card>
+      </el-col>
+      <!-- 字典详情列表 -->
+      <el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>设备详情</span>
+            <el-button
+              v-if="this.rowDtl !== null"
+              class="filter-item"
+              size="mini"
+              style="float: right;padding: 4px 10px"
+              type="primary"
+              icon="el-icon-plus"
+              @click="$refs.dictDetail && $refs.dictDetail.crud.toAdd()"
+            >新增</el-button>
+          </div>
+          <dictDetail ref="dictDetail" :permission="permission" />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import dictDetail from './dictDetail.vue'
+import crudPersoncorrdevice from '@/views/wms/masterdata_manage/em/upkeeppersondevice/upkeeppersondevice'
+
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+
+const defaultForm = {}
+
+export default {
+  name: 'Upkeeppersondevice',
+  components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
+  cruds() {
+    return [
+      CRUD({
+        title: '保养人与设备档案维护',
+        url: 'api/embiupkeepdevice',
+        idField: 'jockey_id',
+        crudMethod: { ...crudPersoncorrdevice },
+        optShow: {
+          add: false,
+          edit: false,
+          del: false,
+          download: false,
+          reset: true
+        }
+      })
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      rowDtl: null,
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        code: [
+          { required: true, message: '请输入编码', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    checkPermission,
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.$refs.dictDetail) {
+        this.$refs.dictDetail.query.user_id = ''
+        this.rowDtl = null
+        this.$refs.dictDetail.crud.toQuery()
+      }
+      return true
+    },
+    // 选中字典后，设置字典详情数据
+    handleCurrentChange(val) {
+      if (val) {
+        this.rowDtl = val
+        this.$refs.dictDetail.query.user_id = val.user_id
+        this.$refs.dictDetail.query.person_name = val.person_name
+        this.$refs.dictDetail.form.user_id = val.user_id
+        this.$refs.dictDetail.crud.toQuery()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/upkeeppersondevice.js b/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/upkeeppersondevice.js
new file mode 100644
index 00000000..77950594
--- /dev/null
+++ b/mes/qd/src/views/wms/masterdata_manage/em/upkeeppersondevice/upkeeppersondevice.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/embiupkeepdevice',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/embiupkeepdevice/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/embiupkeepdevice',
+    method: 'put',
+    data
+  })
+}
+
+export function addPersons(data) {
+  return request({
+    url: 'api/embiupkeepdevice/addPersons',
+    method: 'post',
+    data
+  })
+}
+
+export function getHeader(data) {
+  return request({
+    url: 'api/embiupkeepdevice/getHeader',
+    method: 'post',
+    data
+  })
+}
+
+export function getDeviceIdByUserId(data) {
+  return request({
+    url: 'api/embiupkeepdevice/getDeviceIdByUserId',
+    method: 'post',
+    data
+  })
+}
+
+export function addDevices(data) {
+  return request({
+    url: 'api/embiupkeepdevice/addDevices',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteRow(data) {
+  return request({
+    url: 'api/embiupkeepdevice/deleteRow',
+    method: 'delete',
+    data
+  })
+}
+
+export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices }