lipenghui 2 mesi fa
parent
commit
a0c96a4067

+ 8 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/maintain/IotMaintainController.java

@@ -14,6 +14,8 @@ import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainBomService;
 import cn.iocoder.yudao.module.pms.service.maintain.IotMaintainService;
 import cn.iocoder.yudao.module.pms.service.maintain.material.IotMaintainMaterialService;
+import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
+import cn.iocoder.yudao.module.supplier.service.product.SupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -55,6 +57,8 @@ public class IotMaintainController {
     private IotMaintainBomService iotMaintainBomService;
     @Autowired
     private IotDeviceService iotDeviceService;
+    @Autowired
+    private SupplierService supplierService;
 
     @PostMapping("/create")
     @Operation(summary = "创建维修工单")
@@ -88,6 +92,10 @@ public class IotMaintainController {
         IotMaintainDO iotMaintain = iotMaintainService.getIotMaintain(id);
         IotDeviceDO iotDevice = iotDeviceService.getIotDevice(iotMaintain.getDeviceId());
         IotMaintainRespVO bean = BeanUtils.toBean(iotMaintain, IotMaintainRespVO.class);
+        if (Objects.nonNull(iotDevice)&&Objects.nonNull(iotDevice.getManufacturerId())) {
+            SupplierDO supplierDO1 = supplierService.get(iotDevice.getManufacturerId());
+            bean.setSupplierName(Objects.nonNull(supplierDO1)?supplierDO1.getName():"");
+        }
         List<IotMaintainBomDO> listByMaintainId = iotMaintainBomService.getListByMaintainId(id);
         bean.setMaintainBomDOS(listByMaintainId);
         bean.setDeviceCode(iotDevice.getDeviceCode());

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

@@ -124,4 +124,6 @@ public class IotMaintainRespVO {
      * 维修工单类型
      */
     private String maintainType;
+
+    private String supplierName;
 }