Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 public interface ErrorCodeConstant{
     ErrorCode IOT_PRODUCT_CLASSIFY_NOT_EXISTS = new ErrorCode(100, "设备分类不存在");
     ErrorCode IOT_DEVICE_NOT_EXISTS = new ErrorCode(101, "设备台账不存在");
+    ErrorCode IOT_DEVICE_EXISTED = new ErrorCode(101, "设备台账已存在");
     ErrorCode NOT_EXISTS = new ErrorCode( 122, "供应商主数据不存在");
     ErrorCode SUPPLIER_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1-060-000-002, "更新供应商审核状态失败，原因：供应商不是审核中状态");
     ErrorCode NAME_EXISTED = new ErrorCode( 133, "名称重复");

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/vo/IotMaintainRespVO.java

@@ -119,4 +119,9 @@ public class IotMaintainRespVO {
     private String outFile;
 
     private String deviceCode;
+
+    /**
+     * 维修工单类型
+     */
+    private String maintainType;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/vo/IotMaintainSaveReqVO.java

@@ -95,4 +95,8 @@ public class IotMaintainSaveReqVO {
      * 类型
      */
     private String type;
+    /**
+     * 维修工单类型
+     */
+    private String maintainType;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/maintain/IotMaintainDO.java

@@ -133,4 +133,9 @@ public class IotMaintainDO extends BaseDO {
      * 委外附件
      */
     private String outFile;
+
+    /**
+     * 维修工单类型
+     */
+    private String maintainType;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotDeviceServiceImpl.java

@@ -39,6 +39,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_EXISTED;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_NOT_EXISTS;
 
 /**
@@ -99,6 +100,11 @@ public class IotDeviceServiceImpl implements IotDeviceService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createIotDevice(IotDeviceSaveReqVO createReqVO) {
+        //校验资产编号
+        List<IotDeviceDO> iotDeviceDOS = iotDeviceMapper.selectList("device_code", createReqVO.getDeviceCode());
+        if (CollUtil.isNotEmpty(iotDeviceDOS)) {
+            throw new ServiceException(IOT_DEVICE_EXISTED);
+        }
         // 插入
         IotDeviceDO iotDevice = BeanUtils.toBean(createReqVO, IotDeviceDO.class);
         iotDevice.setDeleted(false);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/failure/IotFailureReportServiceImpl.java

@@ -80,6 +80,7 @@ public class IotFailureReportServiceImpl implements IotFailureReportService {
         BeanUtils.copyProperties(failureReportDO, iotMaintainDO);
         iotMaintainDO.setStatus("tx");
         iotMaintainDO.setAuditStatus(0);
+        iotMaintainDO.setMaintainType("故障上报");
         iotMaintainDO.setMaintainPerson(Objects.isNull(failureReportDO.getAssigneeUserId())? Long.valueOf(failureReportDO.getCreator()) :failureReportDO.getAssigneeUserId());
         iotMaintainDO.setFailureId(failureReportDO.getId());
         iotMaintainMapper.insert(iotMaintainDO);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -110,6 +110,7 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         iotMaintain.setFailureCode("GZ"+ DateUtil.format(new Date(), "yyyyMMddHHmmss"));
         iotMaintain.setFailureName(createReqVO.getMaintain().getDeviceName()+DateUtil.format(new Date(), "yyyyMMddHHmmss"));
         iotMaintain.setDeleted(false);
+        iotMaintain.setMaintainType("手动新增");
         iotMaintainMapper.insert(iotMaintain);
         //插入工单bom
         List<IotMaintainBomSaveReqVO> maintainMaterials = createReqVO.getMaintainMaterials();