From 4e313d8a220b3775061211fcf7e826a60c6957df Mon Sep 17 00:00:00 2001
From: wangqian <1406304305@qq.com>
Date: Fri, 19 Dec 2025 00:19:34 +0800
Subject: [PATCH] 工单管理物料登录返回物料名称

---
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java | 16 +++++++++++-----
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java        | 12 ++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java
index 89f8a59..0863e4d 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailRespVO.java
@@ -1,11 +1,11 @@
 package com.zteits.urbanops.module.workorder.controller.admin.materialdetail.vo;
 
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
 
 @Schema(description = "管理后台 - 工单耗材明细 Response VO")
 @Data
@@ -72,4 +72,10 @@ public class MaterialDetailRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-}
\ No newline at end of file
+    @Schema(description = "耗材ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
+    private Long materialId;
+
+    @Schema(description = "耗材名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "耗材名称")
+    @ExcelProperty("耗材名称")
+    private String materialName;
+}
diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java
index b67bae8..bffc13a 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java
@@ -120,12 +120,12 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
             }
         }
         //已登记
-        for (MaterialDetailDO materialDetailDO : materialDetailList) {
-            MaterialDetailDO materialDetailDO1 =  materialDetailMapper.selectOne(MaterialDetailDO::getMaterialId, materialDetailDO.getMaterialId());
-            if (materialDetailDO1 != null) {
-                throw exception0(BAD_REQUEST.getCode(),materialDetailDO.getMaterialName()+"已登记");
-            }
-        }
+//        for (MaterialDetailDO materialDetailDO : materialDetailList) {
+//            MaterialDetailDO materialDetailDO1 =  materialDetailMapper.selectOne(MaterialDetailDO::getMaterialId, materialDetailDO.getMaterialId());
+//            if (materialDetailDO1 != null) {
+//                throw exception0(BAD_REQUEST.getCode(),materialDetailDO.getMaterialName()+"已登记");
+//            }
+//        }
         //耗材出库
         for (MaterialDetailDO materialDetailDO : materialDetailList) {
             MaterialInventoryOutDto outDto = new MaterialInventoryOutDto();
--
libgit2 0.21.4