[CODE]: 调拨、首页实时毛重

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -300,7 +300,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 客户
         tWhgenleg.setfCorpid(warehouseBills.getfCorpid());
         // 提单号
-        if ("HQZY".equals(warehouseBills.getfBilltype())) {
+        if ("HQZY".equals(warehouseBills.getfBilltype()) || "CKDB".equals(warehouseBills.getfBilltype())) {
             tWhgenleg.setfMblno(warehousebillsitems.getfMblno());
         } else {
             tWhgenleg.setfMblno(warehouseBills.getfMblno());

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

@@ -377,21 +377,21 @@
             g.f_name AS fName,
 			w.f_name AS fWarehouseName,
 			w.f_totalgross AS fTotalgross,
-            t.f_grossweightD  AS fGrossweightD
+            t.f_grossweightblc  AS fGrossweightD
         FROM
             t_goods g
             RIGHT JOIN (
             SELECT
                 f_goodsid AS f_goodsid,
 				f_warehouseid AS f_warehouseid,
-                sum( f_grossweightD ) AS f_grossweightD
+                sum( f_grossweightblc ) AS f_grossweightblc
             FROM
                 t_whgenleg
             GROUP BY
                 f_goodsid,
 				f_warehouseid
             ORDER BY
-                sum( f_grossweightD ) DESC
+                sum( f_grossweightblc ) DESC
             ) t ON g.f_id = t.f_goodsid
 			LEFT JOIN  t_warehouse w ON w.f_id = t.f_warehouseid
         <where>
@@ -403,20 +403,20 @@
         SELECT
             t.f_warehouseid AS fWarehouseid,
             w.f_name AS fName,
-            t.f_grossweightD AS fGrossweightD,
+            t.f_grossweightblc AS fGrossweightD,
 	        w.f_totalgross AS fTotalgross
         FROM
             t_warehouse w
             RIGHT JOIN (
             SELECT
                 f_warehouseid AS f_warehouseid,
-                sum( f_grossweightD ) AS f_grossweightD
+                sum( f_grossweightblc ) AS f_grossweightblc
             FROM
                 t_whgenleg
             GROUP BY
                 f_warehouseid
             ORDER BY
-                sum( f_grossweightD ) DESC
+                sum( f_grossweightblc ) DESC
             ) t ON w.f_id = t.f_warehouseid
     </select>
 
@@ -424,20 +424,20 @@
         SELECT
             t.f_warehouseid AS fWarehouseid,
             w.f_name AS fName,
-            t.f_grossweightD AS fGrossweightD,
+            t.f_grossweightblc AS fGrossweightD,
             w.f_totalgross AS fTotalgross
         FROM
             t_warehouse w
         RIGHT JOIN (
         SELECT
             f_warehouseid AS f_warehouseid,
-            sum( f_grossweightD ) AS f_grossweightD
+            sum( f_grossweightblc ) AS f_grossweightblc
         FROM
             t_whgenleg
         GROUP BY
             f_warehouseid
         ORDER BY
-            sum( f_grossweightD ) DESC
+            sum( f_grossweightblc ) DESC
             ) t ON w.f_id = t.f_warehouseid
         <where>
             <if test="fId != null ">and w.f_id = #{fId}</if>
@@ -466,21 +466,21 @@
             g.f_name AS fName,
             w.f_name AS fWarehouseName,
             w.f_totalgross AS fTotalgross,
-            t.f_grossweightD  AS fGrossweightD
+            t.f_grossweightblc  AS fGrossweightD
         FROM
             t_corps g
         RIGHT JOIN (
             SELECT
             f_corpid AS f_corpid,
             f_warehouseid AS f_warehouseid,
-            sum( f_grossweightD ) AS f_grossweightD
+            sum( f_grossweightblc ) AS f_grossweightblc
             FROM
             t_whgenleg
             GROUP BY
             f_corpid,
             f_warehouseid
             ORDER BY
-            sum( f_grossweightD ) DESC
+            sum( f_grossweightblc ) DESC
             ) t ON g.f_id = t.f_corpid
         LEFT JOIN  t_warehouse w ON w.f_id = t.f_warehouseid
         <where>