1.调整库总账导出时，所有重量可选中到最后求和

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/excel/Whgenleg.java

@@ -3,6 +3,7 @@ package com.ruoyi.reportManagement.excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -81,13 +82,13 @@ public class Whgenleg {
      * 毛重，由明细表自动合计生成
      */
     @Excel(name = "入库毛重（KG）")
-    private Float fGrossweightD;
+    private BigDecimal fGrossweightD;
 
     /**
      * 净重，由明细表自动合计生成
      */
     @Excel(name = "入库净重（KG）")
-    private Float fNetweightD;
+    private BigDecimal fNetweightD;
 
     /**
      * 件数,由明细表自动合计生成
@@ -99,13 +100,13 @@ public class Whgenleg {
      * 毛重，由明细表自动合计生成
      */
     @Excel(name = "出库毛重（KG）")
-    private Float fGrossweightC;
+    private BigDecimal fGrossweightC;
 
     /**
      * 净重，由明细表自动合计生成
      */
     @Excel(name = "出库净重（KG）")
-    private Float fNetweightC;
+    private BigDecimal fNetweightC;
 
     /**
      * 件数,由明细表自动合计生成
@@ -117,13 +118,13 @@ public class Whgenleg {
      * 毛重，由明细表自动合计生成
      */
     @Excel(name = "结余毛重（KG）")
-    private Float fGrossweightblc;
+    private BigDecimal fGrossweightblc;
 
     /**
      * 净重，由明细表自动合计生成
      */
     @Excel(name = "结余净重（KG）")
-    private Float fNetweightblc;
+    private BigDecimal fNetweightblc;
 
     /** 明细品名合计 */
     @Excel(name = "箱号")
@@ -213,19 +214,19 @@ public class Whgenleg {
         this.fQtyD = fQtyD;
     }
 
-    public Float getfGrossweightD() {
+    public BigDecimal getfGrossweightD() {
         return fGrossweightD;
     }
 
-    public void setfGrossweightD(Float fGrossweightD) {
+    public void setfGrossweightD(BigDecimal fGrossweightD) {
         this.fGrossweightD = fGrossweightD;
     }
 
-    public Float getfNetweightD() {
+    public BigDecimal getfNetweightD() {
         return fNetweightD;
     }
 
-    public void setfNetweightD(Float fNetweightD) {
+    public void setfNetweightD(BigDecimal fNetweightD) {
         this.fNetweightD = fNetweightD;
     }
 
@@ -237,19 +238,19 @@ public class Whgenleg {
         this.fQtyC = fQtyC;
     }
 
-    public Float getfGrossweightC() {
+    public BigDecimal getfGrossweightC() {
         return fGrossweightC;
     }
 
-    public void setfGrossweightC(Float fGrossweightC) {
+    public void setfGrossweightC(BigDecimal fGrossweightC) {
         this.fGrossweightC = fGrossweightC;
     }
 
-    public Float getfNetweightC() {
+    public BigDecimal getfNetweightC() {
         return fNetweightC;
     }
 
-    public void setfNetweightC(Float fNetweightC) {
+    public void setfNetweightC(BigDecimal fNetweightC) {
         this.fNetweightC = fNetweightC;
     }
 
@@ -261,19 +262,19 @@ public class Whgenleg {
         this.fQtyblc = fQtyblc;
     }
 
-    public Float getfGrossweightblc() {
+    public BigDecimal getfGrossweightblc() {
         return fGrossweightblc;
     }
 
-    public void setfGrossweightblc(Float fGrossweightblc) {
+    public void setfGrossweightblc(BigDecimal fGrossweightblc) {
         this.fGrossweightblc = fGrossweightblc;
     }
 
-    public Float getfNetweightblc() {
+    public BigDecimal getfNetweightblc() {
         return fNetweightblc;
     }
 
-    public void setfNetweightblc(Float fNetweightblc) {
+    public void setfNetweightblc(BigDecimal fNetweightblc) {
         this.fNetweightblc = fNetweightblc;
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -632,7 +632,6 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
     @Override
     public List<Map<String, Object>> selectdetailedList(TWarehousebill tWarehousebill) {
         List<Map<String, Object>> mapList = tWarehouseBillsMapper.selectDetailedList(tWarehousebill);
-        System.out.println(mapList);
         return mapList;
     }