From ad663df3b38b873d79fff48570dfb56b69697ac6 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 16:06:56 +0800
Subject: [PATCH] 森林防火 供应商管理

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
index 47f122c..a3ae1be 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
@@ -9,10 +9,7 @@
 import com.ruoyi.management.domain.dto.InventoriesSuppliesInfoQuery;
 import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
 import com.ruoyi.management.domain.vo.InventoriesSuppliesVO;
-import com.ruoyi.management.mapper.InventoriesSuppliesInfoMapper;
-import com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper;
-import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
-import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
+import com.ruoyi.management.mapper.*;
 import com.ruoyi.management.service.InventoriesSuppliesInfoService;
 import org.springframework.stereotype.Service;
 
@@ -42,6 +39,9 @@
 
     @Resource
     private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;
+
+    @Resource
+    private SlGoodsShelfMapper slGoodsShelfMapper;
     @Override
     public PageDTO<InventoriesSuppliesInfoVO> inventoriesSuppliesInfoService(InventoriesSuppliesInfoQuery inventoriesSuppliesInfoQuery) {
 
@@ -62,24 +62,28 @@
             SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
             sl.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
             sl.setIsConsume(slGoodsMaterials.getIsConsume());
+            sl.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
+            SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
+            sl.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
 
         }
         return slGoodsMaterialsVO;
     }
 
     @Override
-    public void addInventoriesSuppliesInfo(InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO) {
-        if (inventoriesSuppliesInfoDTO.getId()==null){
+    public void addInventoriesSuppliesInfo(List<InventoriesSuppliesInfoDTO> inventoriesSuppliesInfoDTO) {
+        for (InventoriesSuppliesInfoDTO m:inventoriesSuppliesInfoDTO)
+        if (m.getId()==null){
             InventoriesSuppliesInfo inventoriesSuppliesInf=new InventoriesSuppliesInfo();
-            inventoriesSuppliesInf.setSuppliesId(inventoriesSuppliesInfoDTO.getSuppliesId());
-            inventoriesSuppliesInf.setRkId(inventoriesSuppliesInfoDTO.getRkId());
-            SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(inventoriesSuppliesInfoDTO.getRkId());
+            inventoriesSuppliesInf.setSuppliesId(m.getSuppliesId());
+            inventoriesSuppliesInf.setRkId(m.getRkId());
+            SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(m.getRkId());
             inventoriesSuppliesInf.setZkNum(slVolumeProductionRk.getRepertoryZhai());
-            inventoriesSuppliesInf.setSuppliesNum(inventoriesSuppliesInfoDTO.getSuppliesNum());
+            inventoriesSuppliesInf.setSuppliesNum(m.getSuppliesNum());
             this.save(inventoriesSuppliesInf);
         }else{
-            InventoriesSuppliesInfo byId = this.getById(inventoriesSuppliesInfoDTO.getId());
-            byId.setSuppliesNum(inventoriesSuppliesInfoDTO.getSuppliesNum());
+            InventoriesSuppliesInfo byId = this.getById(m.getId());
+            byId.setSuppliesNum(m.getSuppliesNum());
             this.updateById(byId);
 
         }

--
Gitblit v1.7.1