From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java |   93 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 65 insertions(+), 28 deletions(-)

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 3dcb1ac..a6af6c7 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,16 @@
             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());
+            wrapper5.eq(SlGoodsShelf::getStoreManagementNumber,list.getStoreManagementNumber());
+            wrapper5.eq( SlGoodsShelf::getDelFlag,0);
+            wrapper5.orderByDesc(SlGoodsShelf::getCreateTime);
+            List<SlGoodsShelf> page3 = slGoodsShelfMapper.selectList(wrapper5);
+            list.setSlGoodsShelfs(page3);
            }
         }
         return SlGoodsShelfDTO;
@@ -104,38 +113,59 @@
     }
 
     @Override
-    public void addVolumeProductionRkgl(SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) {
-        List<Long> materialsId = slVolumeProductionRkListDTO.getMaterialsId();
-        for (Long m:materialsId){
+    public void addVolumeProductionRkgl(List<SlVolumeProductionRkListDTO> slVolumeProductionRkListDTO) {
+
+        for (SlVolumeProductionRkListDTO m:slVolumeProductionRkListDTO){
             SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk();
-            slVolumeProductionRk.setVolumeProductionRkglId(slVolumeProductionRkListDTO.getVolumeProductionRkglId());
-            slVolumeProductionRk.setMaterialsId(m);
-            slVolumeProductionRk.setManagementId(slVolumeProductionRkListDTO.getManagementId());
+            slVolumeProductionRk.setVolumeProductionRkglId(m.getVolumeProductionRkglId());
+            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){
+                slVolumeProductionRk.setRkPice( m.getRkPice());
+            }if ( m.getRkNum()!=null){
+                slVolumeProductionRk.setRkNum( m.getRkNum());
+            }if ( m.getShelfId()!=null){
+                slVolumeProductionRk.setShelfId( m.getShelfId());
+            }if ( m.getRkModel()!=null){
+                slVolumeProductionRk.setRkModel( m.getRkModel());
+            }if ( m.getStoreManagementNumber()!=null){
+                slVolumeProductionRk.setStoreManagementNumber( m.getStoreManagementNumber());
+            }if ( m.getRkNumber()!=null){
+                slVolumeProductionRk.setRkNumber( m.getRkNumber());
+            }
+
             this.save(slVolumeProductionRk);
         }
 
     }
 
     @Override
-    public void uplSlVolumeProductionRk(SlVolumeProductionRkDTO SlVolumeProductionRkDTO) {
-        SlVolumeProductionRk byId = this.getById(SlVolumeProductionRkDTO.getId());
-        if (SlVolumeProductionRkDTO.getErwmNum()!=null){
-            byId.setErwmNum(SlVolumeProductionRkDTO.getErwmNum());
-        }if (SlVolumeProductionRkDTO.getRkPice()!=null){
-            byId.setRkPice(SlVolumeProductionRkDTO.getRkPice());
-        }if (SlVolumeProductionRkDTO.getRkNum()!=null){
-            byId.setRkNum(SlVolumeProductionRkDTO.getRkNum());
-        }if (SlVolumeProductionRkDTO.getShelfId()!=null){
-            byId.setShelfId(SlVolumeProductionRkDTO.getShelfId());
-        }if (SlVolumeProductionRkDTO.getRkModel()!=null){
-            byId.setRkModel(SlVolumeProductionRkDTO.getRkModel());
-        }if (SlVolumeProductionRkDTO.getStoreManagementNumber()!=null){
-            byId.setStoreManagementNumber(SlVolumeProductionRkDTO.getStoreManagementNumber());
-        }if (SlVolumeProductionRkDTO.getRkNumber()!=null){
-            byId.setRkNumber(SlVolumeProductionRkDTO.getRkNumber());
+    public void uplSlVolumeProductionRk(List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO) {
+        for (SlVolumeProductionRkDTO a:SlVolumeProductionRkDTO){
+            SlVolumeProductionRk byId = this.getById(a.getId());
+            if (a.getErwmNum()!=null){
+                byId.setErwmNum(a.getErwmNum());
+            }if (a.getRkPice()!=null){
+                byId.setRkPice(a.getRkPice());
+            }if (a.getRkNum()!=null){
+                byId.setRkNum(a.getRkNum());
+            }if (a.getShelfId()!=null){
+                byId.setShelfId(a.getShelfId());
+            }if (a.getRkModel()!=null){
+                byId.setRkModel(a.getRkModel());
+            }if (a.getStoreManagementNumber()!=null){
+                byId.setStoreManagementNumber(a.getStoreManagementNumber());
+            }if (a.getRkNumber()!=null){
+                byId.setRkNumber(a.getRkNumber());
+            }
+            byId.setNewAddTime(a.getNewAddTime());
+            this.updateById(byId);
         }
-        this.updateById(byId);
+
     }
 
     @Override
@@ -148,17 +178,16 @@
         Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
         PageDTO<getVolumeProductionRkgCodeVO> SlGoodsShelfDTO = PageDTO.of(page2, getVolumeProductionRkgCodeVO.class);
         List<getVolumeProductionRkgCodeVO> list2 = SlGoodsShelfDTO.getList();
-        for(getVolumeProductionRkgCodeVO list:list2) {{
+        for(getVolumeProductionRkgCodeVO list:list2) {
             SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
             list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
             list.setIsConsume(slGoodsMaterials.getIsConsume());
-        }
         }
         return SlGoodsShelfDTO;
     }
 
     @Override
-    public ManagementimgVolumeProductionRkVO codeInfo(Integer id) {
+    public ManagementimgVolumeProductionRkVO codeInfo(Long id) {
         SlVolumeProductionRk byId = this.getById(id);
         ManagementimgVolumeProductionRkVO vo=new ManagementimgVolumeProductionRkVO();
         SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
@@ -178,7 +207,9 @@
     public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {
 
         LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
-        wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+        if (meProductionRkQuery.getGoodsMaterialsName()!=null&&meProductionRkQuery.getGoodsMaterialsName()!=""){
+            wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+        }
         if (meProductionRkQuery.getIsConsume()!=0){
             wrapper.eq(SlGoodsMaterials::getIsConsume,meProductionRkQuery.getIsConsume());
         }
@@ -192,9 +223,15 @@
 
         Page<SlVolumeProductionRk> page = new Page<>(meProductionRkQuery.getPageCurr(), meProductionRkQuery.getPageSize());
         LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+    if(meProductionRkQuery.getManagementId()!=null&&meProductionRkQuery.getManagementId()!=0){
         wrapper1.eq(SlVolumeProductionRk::getManagementId,meProductionRkQuery.getManagementId());
+    }
         if (goodsSkuIdList.size()>0){
             wrapper1.in(SlVolumeProductionRk::getMaterialsId,goodsSkuIdList);
+        }if(meProductionRkQuery.getStoreManagementNumber()!=null&&meProductionRkQuery.getStoreManagementNumber()!=0){
+            wrapper1.eq(SlVolumeProductionRk::getStoreManagementNumber,meProductionRkQuery.getStoreManagementNumber());
+        }if(meProductionRkQuery.getShelfId()!=null&&meProductionRkQuery.getShelfId()!=0){
+            wrapper1.eq(SlVolumeProductionRk::getShelfId,meProductionRkQuery.getShelfId());
         }
         wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
         wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);

--
Gitblit v1.7.1