20230307 10:32

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

@@ -701,12 +701,17 @@
 
     <select id="inventoryQueries" resultType="com.ruoyi.warehouseBusiness.response.InventoryQueryResponse">
         SELECT
+            TWBI.f_business_type,
             TW.f_mblno AS warehouseSerialNumber,
             TW.f_originalbilldate AS originalWarehousingDate,
             TG.f_name AS cargoName,
-            TW.f_marks AS cargoModel,
+            (CASE
+            TWBI.f_business_type
+            WHEN '2' THEN
+            TWBI.f_marks ELSE ''
+            END) AS cargoModel,
             TG.f_specs AS cargoSpec,
-            SUM(TW.f_qtyblc) AS cargoQuantity,
+            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,
@@ -717,8 +722,12 @@
             TW.f_originalbilldate AS rentBeginDate,
             '' AS storageRate,
             TW.f_marks AS mark,
-            SUM(TW.f_qtyblc) AS number,
-            '' AS manufacturer,
+            SUM( TW.f_qtyblc ) AS number,
+            (CASE
+            TWBI.f_business_type
+            WHEN '3' THEN
+            TWBI.f_marks ELSE ''
+            END) AS manufacturer,
             '' AS trademark,
             '' AS grade,
             TG.f_packagespecs AS packing,
@@ -730,6 +739,7 @@
         LEFT JOIN t_warehouse TWH ON TW.f_warehouseid = TWH.f_id
         LEFT JOIN t_corps TC ON TC.f_id = TW.f_corpid
         LEFT JOIN t_warehousebills TWB ON TWB.f_mblno = TW.f_mblno
+        LEFT JOIN t_warehousebillsitems TWBI ON TWBI.f_pid = TWB.f_id
         <where>
             TW.del_flag = '0'
             AND (TWB.f_ifpledge != 0 or TWB.f_ifpledge IS NULL)