山能

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

@@ -997,7 +997,9 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
             Collections.addAll(names, "入库尺码", "出库尺码");
         } else if ("2".equals(mode)) {
             Collections.addAll(names, "入库重量", "出库重量");
-        } else {
+        } else if("5".equals(mode)) {
+            Collections.addAll(names, "入库净重", "入库净重");
+        }else {
             mode = "1";
             Collections.addAll(names, "入库件数", "出库件数");
         }

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -1241,6 +1241,7 @@
                 case #{mode}
                     when '3' then round(ifnull(sum(f_volumnblc), 0))
                     when '2' then round(ifnull(sum(f_grossweightblc) / 1000, 0))
+                    when '5' then round(ifnull(sum(f_netweightblc) / 1000, 0))
                     else ifnull(sum(f_qtyblc), 0)
                 end as quantity
             </if>
@@ -1315,6 +1316,7 @@
                 case #{mode}
                 when '3' then round(ifnull(sum(tw.f_volumnblc), 0))
                 when '2' then round(ifnull(sum(tw.f_grossweightblc) / 1000, 0))
+                when '5' then round(ifnull(sum(tw.f_netweightblc) / 1000, 0))
                 else ifnull(sum(tw.f_qtyblc), 0)
                 end as quantity
             </if>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -1047,6 +1047,7 @@
                             else ts.f_grossweight
                         end
                     ) / 1000, 0))
+                    when '5' then round(ifnull(sum(ts.f_netweight) / 1000, 0))
                     else ifnull(sum(ts.f_qty), 0)
                 end as total
             </if>