From 8559fdd3df062950e419c974b88d19d441a0df32 Mon Sep 17 00:00:00 2001
From: wangqian <1406304305@qq.com>
Date: Thu, 9 Apr 2026 17:43:10 +0800
Subject: [PATCH] 耗材登记bug修改

---
 urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java     | 3 +++
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java | 3 +++
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java           | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java
index 53f388e..d695637 100644
--- a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java
+++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/material/MaterialInventoryOutDto.java
@@ -17,6 +17,9 @@ public class MaterialInventoryOutDto {
     @Schema(description = "入库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18713")
     private Long id;
 
+    @Schema(description = "库存id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private String inventoryId;
+
     @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541")
     @NotNull(message = "物料ID不能为空")
     private Long materialId;
diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java
index ec4c775..51064f1 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/materialdetail/vo/MaterialDetailSaveReqVO.java
@@ -79,4 +79,7 @@ public class MaterialDetailSaveReqVO {
     @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED, example = "规格")
     @NotEmpty(message = "规格不能为空")
     private String specifications;
+
+    @Schema(description = "库存id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private String inventoryId;
 }
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 4e3a438..c5c49de 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
@@ -133,12 +133,13 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
 //            }
 //        }
         //耗材出库
-        for (MaterialDetailDO materialDetailDO : materialDetailList) {
+        for (MaterialDetailSaveReqVO materialDetailDO : createReqVO) {
             MaterialInventoryOutDto outDto = new MaterialInventoryOutDto();
             outDto.setMaterialId(materialDetailDO.getMaterialId());
             outDto.setMaterialName(materialDetailDO.getMaterialName());
-            outDto.setOutInventoryNum(materialDetailDO.getUserCount());
+            outDto.setOutInventoryNum(Long.valueOf(materialDetailDO.getUserCount()));
             outDto.setOutDate(LocalDateTime.now());
+            outDto.setInventoryId(materialDetailDO.getInventoryId());
             materialApi.createMaterialInventoryOut(outDto);
         }
         //保存耗材
--
libgit2 0.21.4