2023年12月22日17:46:52

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

@@ -407,7 +407,7 @@
         SUM(TWG.f_qtyblc) AS availableQuantity,
 
         TG.f_no AS goodsCode,
-        TG.f_typeid AS goodsType,
+        sdd.dict_label AS goodsType,
 
         '袋' AS quantityUnit,
         IFNULL( ROUND( SUM(TWG.f_netweightD) / 1000, 2 ), 0 ) AS totalNetWeight,
@@ -419,6 +419,7 @@
         LEFT JOIN t_whgenleg TWG ON TWG.f_warehouseid = TW.f_id
         LEFT JOIN t_corps TC ON TC.f_id = TWG.f_corpid
         LEFT JOIN t_goods TG ON TG.f_id = TWG.f_goodsid
+        LEFT JOIN sys_dict_data sdd ON sdd.dict_type = 'data_goods_category' and  TG.f_typeid = sdd.dict_value
         <where>
             TW.del_flag = '0'
             and TWG.f_qtyblc > 0
@@ -459,7 +460,7 @@
         TG.f_name AS goodsName,
 
         TG.f_no AS goodsCode,
-        TG.f_typeid AS goodsType,
+         sdd.dict_label AS goodsType,
 
         TG.f_packagespecs AS specifications,
         '' AS producing,
@@ -483,6 +484,7 @@
         LEFT JOIN t_corps TC ON TC.f_id = TWG.f_corpid
         LEFT JOIN t_goods TG ON TG.f_id = TWG.f_goodsid
         LEFT JOIN t_warehousebills TWB ON TWG.f_originalbillno = TWB.f_billno
+        LEFT JOIN sys_dict_data sdd ON sdd.dict_type = 'data_goods_category' and  TG.f_typeid = sdd.dict_value
         <where>
             TW.del_flag = '0'
             and TWG.f_qtyblc > 0