From 21cdcd877d9f11cd994ca93c7b435cfc411c847f Mon Sep 17 00:00:00 2001
From: wangqian <1406304305@qq.com>
Date: Tue, 16 Dec 2025 16:27:10 +0800
Subject: [PATCH] 工单管理耗材登记修改

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java                               | 20 ++++++++++++++++++++
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java                           | 24 ++++++++++++++++++++++++
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/dto/MaterialInventoryOutDto.java               | 35 +++++++++++++++++++++++++++++++++++
 urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/materialdetail/MaterialDetailServiceImpl.java | 16 +++++++++-------
 4 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java
 create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java
 create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/dto/MaterialInventoryOutDto.java

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java
new file mode 100644
index 0000000..dbe0244
--- /dev/null
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApi.java
@@ -0,0 +1,20 @@
+package com.zteits.urbanops.module.garden.api.material;
+
+import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto;
+
+/**
+ * @Classname MaterialApi
+ * @Description 物料出库
+ * @Date 2025/12/16 16:19
+ * @Created by wangqian
+ */
+public interface MaterialApi {
+
+    /**
+     * 创建物料出库
+     *
+     * @param outDto 创建信息
+     * @return 编号
+     */
+    Long createMaterialInventoryOut(MaterialInventoryOutDto outDto);
+}
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java
new file mode 100644
index 0000000..f691ee5
--- /dev/null
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/MaterialApiImpl.java
@@ -0,0 +1,24 @@
+package com.zteits.urbanops.module.garden.api.material;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto;
+import com.zteits.urbanops.module.garden.controller.admin.materialinventoryout.vo.MaterialInventoryOutSaveReqVO;
+import com.zteits.urbanops.module.garden.service.materialinventoryout.MaterialInventoryOutService;
+import jakarta.annotation.Resource;
+
+/**
+ * @Classname MaterialApiImpl
+ * @Description 物料接口
+ * @Date 2025/12/16 16:21
+ * @Created by wangqian
+ */
+public class MaterialApiImpl implements MaterialApi{
+
+    @Resource
+    private MaterialInventoryOutService materialInventoryOutService;
+    @Override
+    public Long createMaterialInventoryOut(MaterialInventoryOutDto outDto) {
+        MaterialInventoryOutSaveReqVO createReqVO = BeanUtil.toBean(outDto, MaterialInventoryOutSaveReqVO.class);
+        return materialInventoryOutService.createMaterialInventoryOut(createReqVO);
+    }
+}
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/dto/MaterialInventoryOutDto.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/dto/MaterialInventoryOutDto.java
new file mode 100644
index 0000000..a850a97
--- /dev/null
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/material/dto/MaterialInventoryOutDto.java
@@ -0,0 +1,35 @@
+package com.zteits.urbanops.module.garden.api.material.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Classname MaterialInventoryOutDto
+ * @Description 物料出库
+ * @Date 2025/12/16 16:22
+ * @Created by wangqian
+ */
+@Data
+public class MaterialInventoryOutDto {
+    @Schema(description = "入库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18713")
+    private Long id;
+
+    @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541")
+    @NotNull(message = "物料ID不能为空")
+    private Long materialId;
+
+    @Schema(description = "物料名称", example = "芋艿")
+    private String materialName;
+
+    @Schema(description = "出库数量", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "出库数量不能为空")
+    private Long outInventoryNum;
+
+    @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "出库日期不能为空")
+    private LocalDateTime outDate;
+
+}
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 f0b5fcf..065f25f 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
@@ -2,6 +2,8 @@ package com.zteits.urbanops.module.workorder.service.materialdetail;
 
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.module.garden.api.material.MaterialApi;
+import com.zteits.urbanops.module.garden.api.material.dto.MaterialInventoryOutDto;
 import com.zteits.urbanops.module.garden.controller.admin.materialinventoryout.vo.MaterialInventoryOutSaveReqVO;
 import com.zteits.urbanops.module.garden.service.materialinventoryout.MaterialInventoryOutService;
 import com.zteits.urbanops.module.workorder.controller.admin.materialdetail.vo.MaterialDetailPageReqVO;
@@ -39,7 +41,7 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
     private MaterialDetailMapper materialDetailMapper;
 
     @Resource
-    private MaterialInventoryOutService materialInventoryOutService;
+    private MaterialApi materialApi;
 
     @Resource
     private MainInfoService mainInfoService;
@@ -119,12 +121,12 @@ public class MaterialDetailServiceImpl implements MaterialDetailService {
         }
         //耗材出库
         for (MaterialDetailDO materialDetailDO : materialDetailList) {
-            MaterialInventoryOutSaveReqVO materialInventoryOutSaveReqVO = new MaterialInventoryOutSaveReqVO();
-            materialInventoryOutSaveReqVO.setMaterialId(materialDetailDO.getMaterialId());
-            materialInventoryOutSaveReqVO.setMaterialName(materialDetailDO.getMaterialName());
-            materialInventoryOutSaveReqVO.setOutInventoryNum(materialDetailDO.getUserCount());
-            materialInventoryOutSaveReqVO.setOutDate(LocalDateTime.now());
-            materialInventoryOutService.createMaterialInventoryOut(materialInventoryOutSaveReqVO);
+            MaterialInventoryOutDto outDto = new MaterialInventoryOutDto();
+            outDto.setMaterialId(materialDetailDO.getMaterialId());
+            outDto.setMaterialName(materialDetailDO.getMaterialName());
+            outDto.setOutInventoryNum(materialDetailDO.getUserCount());
+            outDto.setOutDate(LocalDateTime.now());
+            materialApi.createMaterialInventoryOut(outDto);
         }
         //保存耗材
         materialDetailMapper.insertBatch(materialDetailList);
--
libgit2 0.21.4