From 24f7e4c21f6b6375f791b5132d25373255c1d464 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 29 七月 2024 18:14:24 +0800
Subject: [PATCH] 森林防火 供应商管理

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java    |    3 ++-
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java              |    3 +++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java             |    3 +++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java     |    3 +++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/InventoriesSuppliesInfoService.java          |    4 +++-
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java          |    4 ++--
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java                     |    3 +++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java    |    7 ++++++-
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java          |    3 +++
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java |   17 +++++++++--------
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java  |    1 +
 11 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java
index 73834c9..d36a316 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java
@@ -20,6 +20,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -44,7 +45,7 @@
 
     @PostMapping("/addInventoriesSuppliesInfo")
     @ApiOperation(value = "添加/修改物资盘点详情")
-    public R addInventoriesSuppliesInfo(@RequestBody InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO) {
+    public R addInventoriesSuppliesInfo(@RequestBody List<InventoriesSuppliesInfoDTO> inventoriesSuppliesInfoDTO) {
         inventoriesSuppliesInfoService.addInventoriesSuppliesInfo(inventoriesSuppliesInfoDTO);
         return R.ok();
     }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java
index 3123aaa..824ecba 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java
@@ -99,5 +99,8 @@
     @TableField("management_id")
     private Long managementId;
 
+    @ApiModelProperty("判断是不是新增的数据")
+    private String newAddTime;
+
 
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java
index 4eedb07..15c1ba8 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java
@@ -41,4 +41,7 @@
 
     @ApiModelProperty("入库管理id")
     private Long rkgl_id;
+
+    @ApiModelProperty("判断是不是新增的数据")
+    private String newAddTime;
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java
index b48fd25..24906c6 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java
@@ -46,6 +46,9 @@
     @ApiModelProperty("入库管理id")
     private Long rkgl_id;
 
+    @ApiModelProperty("判断是不是新增的数据")
+    private String newAddTime;
+
 
 
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
index 5bcb427..e798f34 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
@@ -58,6 +58,9 @@
     @ApiModelProperty("")
     private List<SlGoodsShelf> SlGoodsShelfs;
 
+    @ApiModelProperty("判断是不是新增的数据")
+    private String newAddTime;
+
 
 
 }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
index 7cc4fb8..0e521db 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
@@ -38,6 +38,9 @@
     @ApiModelProperty("供应商名称")
     private String supplierName;
 
+    @ApiModelProperty("供应商id")
+    private Long supplierId;
+
     @ApiModelProperty("供应商电话")
     private String supplierPhone;
 
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/InventoriesSuppliesInfoService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/InventoriesSuppliesInfoService.java
index 56f4b3a..28b408e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/InventoriesSuppliesInfoService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/InventoriesSuppliesInfoService.java
@@ -8,6 +8,8 @@
 import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -20,7 +22,7 @@
 
     PageDTO<InventoriesSuppliesInfoVO> inventoriesSuppliesInfoService(InventoriesSuppliesInfoQuery inventoriesSuppliesInfoQuery);
 
-    void addInventoriesSuppliesInfo(InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO);
+    void addInventoriesSuppliesInfo(List<InventoriesSuppliesInfoDTO> inventoriesSuppliesInfoDTO);
 
     InventoriesSuppliesInfo getInventoriesSuppliesInfo(InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO);
 
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
index c2110e1..8a4a08e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java
@@ -44,11 +44,11 @@
         if(homeStatisticsQuery.getStoreManagementNo()!=null&&homeStatisticsQuery.getStoreManagementNo()!=""){
             wrapper.eq(SlStoreManagement::getStoreManagementNo,homeStatisticsQuery.getStoreManagementNo());
         }
-        if (homeStatisticsQuery.getStoreManagementGrade()!=0 && homeStatisticsQuery.getStoreManagementGrade()!=null){
+        if (homeStatisticsQuery.getStoreManagementGrade()!=null &&  homeStatisticsQuery.getStoreManagementGrade()!=0 ){
             wrapper.eq(SlStoreManagement::getStoreManagementGrade,homeStatisticsQuery.getStoreManagementGrade());
         }
 
-        if (homeStatisticsQuery.getStoreManagementNumber()!=0 && homeStatisticsQuery.getStoreManagementNumber()!=null){
+        if ( homeStatisticsQuery.getStoreManagementNumber()!=null&& homeStatisticsQuery.getStoreManagementNumber()!=0 ){
             wrapper.eq(SlStoreManagement::getStoreManagementNumber,homeStatisticsQuery.getStoreManagementNumber());
         }
 
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 98dca03..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
@@ -71,18 +71,19 @@
     }
 
     @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);
 
         }
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
index 51aa668..ba71edf 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -71,7 +71,10 @@
             list.setIsConsume(slGoodsMaterials.getIsConsume());
             list.setSupplierName(data.getNickName());
             SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
-            list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+            if (slGoodsShelf!=null){
+                list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+            }
+
 
             LambdaQueryWrapper<SlGoodsShelf> wrapper5= Wrappers.lambdaQuery();
             wrapper5.eq(SlGoodsShelf::getStoreManagementId,byId.getManagementId());
@@ -120,6 +123,7 @@
             slVolumeProductionRk.setMaterialsId(m.getMaterialsId());
             slVolumeProductionRk.setManagementId(m.getManagementId());
             slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime());
+            slVolumeProductionRk.setNewAddTime(m.getNewAddTime());
             if ( m.getErwmNum()!=null){
                 slVolumeProductionRk.setErwmNum( m.getErwmNum());
             }if ( m.getRkPice()!=null){
@@ -160,6 +164,7 @@
             }if (a.getRkNumber()!=null){
                 byId.setRkNumber(a.getRkNumber());
             }
+            byId.setNewAddTime(a.getNewAddTime());
             this.updateById(byId);
         }
 
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
index e85fd49..eb5827b 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -89,6 +89,7 @@
         SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
         v.setStoreManagementName(slStoreManagement.getStoreManagementName());
         SysUser data = sysUserClient.getSysUser(Long.valueOf(byId.getSupplierId())).getData();
+        v.setSupplierId(byId.getSupplierId());
         v.setSupplierName(data.getNickName());
         v.setSupplierPhone(data.getPhonenumber());
         SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();

--
Gitblit v1.7.1