20230202 17:23

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -701,15 +701,15 @@
 
     <select id="inventoryQueries" resultType="com.ruoyi.warehouseBusiness.response.InventoryQueryResponse">
         SELECT
-            TW.f_originalbillno as warehouseSerialNumber,
-            TW.f_originalbilldate as originalWarehousingDate,
-            TW.f_mblno as bl_no,
+            TW.f_originalbillno AS warehouseSerialNumber,
+            TW.f_originalbilldate AS originalWarehousingDate,
+            TW.f_mblno AS bl_no,
             TG.f_name AS cargoName,
             TW.f_marks AS cargoModel,
             TG.f_specs AS cargoSpec,
-            TW.f_qtyblc AS cargoQuantity,
-            TW.f_netweightblc AS netWeight,
-            TW.f_grossweightblc AS grossWeight,
+            SUM(TW.f_qtyblc) AS cargoQuantity,
+            IFNULL( ROUND( SUM( TW.f_netweightblc ) / 1000, 2 ), 0 ) AS netWeight,
+            IFNULL( ROUND( SUM( TW.f_grossweightblc ) / 1000, 2 ), 0 ) AS grossWeight,
             TWH.f_addr AS warehouseAddress,
             TC.f_name AS sourceOwnerName,
             TC.uscc AS sourceOwnerSocialIdentifier,
@@ -718,7 +718,7 @@
             TW.f_originalbilldate AS rentBeginDate,
             '' AS storageRate,
             TW.f_marks AS mark,
-            TW.f_qtyblc AS number,
+            SUM(TW.f_qtyblc) AS number,
             '' AS manufacturer,
             '' AS trademark,
             '' AS grade,
@@ -745,6 +745,8 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY
+        TW.f_originalbillno
     </select>
 
     <update id="receiptRegister">