Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-30 5667d14c708f9244fe2419707f98ff472ca23480

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/HomeStatisticsServiceImpl.java

@@ -120,6 +120,9 @@
                   repertoryZhai=repertoryZhai+li1.getCkNum();
               }
           }
           if (li.getRkPice() == null){
               li.setRkPice(BigDecimal.ZERO);
           }
           d=d+li.getRkPice().multiply(new BigDecimal(li.getRkPice().intValue())).doubleValue();
           li.setRepertoryZhai(repertoryZhai);
       }
@@ -155,6 +158,9 @@
            // 处理键和值
            Long a=0L;
            for (homeVO vo : value) {
                if (vo.getGoodsMaterialsNum()== null){
                    vo.setGoodsMaterialsNum(0L);
                }
                a=a+vo.getGoodsMaterialsNum();
            }
            goodsMaterialsNmVO.setGoodsMaterialsNum(a);
@@ -174,6 +180,9 @@
            // 处理键和值
            Long a=0L;
            for (homeVO vo : value) {
                if (vo.getGoodsMaterialsNum()== null){
                    vo.setGoodsMaterialsNum(0L);
                }
                a=a+vo.getGoodsMaterialsNum();
            }
            goodsMaterialsNmVO1.setGoodsMaterialsNum(a);