update bug

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWareHouseExcelItems.java

@@ -28,6 +28,10 @@ public class TWareHouseExcelItems {
     @Excel(name = "货物货名")
     private String fGoodsid;
 
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
     /** 品牌 */
     @Excel(name = "唛头")
     private String fMarks;

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

@@ -4642,18 +4642,20 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("未找到信息，请刷新页面重试");
         }
         Map<String, Object> map = new HashMap<>();
-        List<TWarehousebillsfees> feesList = new ArrayList<>();
         List<TWarehousebillsfees> itemsList = new ArrayList<>();
         TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
         warehousebillsfees.setfPid(fId);
         List<TWarehousebillsfees> warehouseFeesList = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(warehousebillsfees);
-        for (TWarehousebillsfees fees : warehouseFeesList) {
-            if (StringUtils.isNotNull(fees.getSrcId())) {
-                itemsList.add(fees);
-            } else {
-                feesList.add(fees);
-            }
-        }
+
+        List<TWarehousebillsfees> feesList = warehouseFeesList.stream().filter(li -> StringUtils.isNotNull(li.getSrcId()))
+                .collect(toList());
+        // 查出所有仓库 给后续匹配仓库名字使用
+        List<TWarehouse> warehouseList = tWarehouseMapper.selectTWarehouseList(new TWarehouse());
+        feesList.forEach(li -> {
+            Optional<TWarehouse> first = warehouseList.stream().filter(warehouse -> Objects.equals(warehouse.getfId(), li.getfWarehouseid()))
+                    .findFirst();
+            first.ifPresent(tWarehouse -> li.setWarehouseName(tWarehouse.getfName()));
+        });
         TGoods tGoods = new TGoods();
         tGoods.setfStatus("0");
         tGoods.setDelFlag("0");

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

@@ -563,34 +563,36 @@
 
     <select id="selectTWarehousebillsItemsList"
             resultType="com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems">
-        SELECT (@ii := @ii + 1)      AS fId,
-               CASE
-                   wi.f_billtype
-                   WHEN 'SJRK' THEN
-                       '入库'
-                   WHEN 'SJCK' THEN
-                       '出库'
-                   WHEN 'KCZZ' THEN
-                       '库存总账'
-                   END               AS fBilltype,
-               wi.f_mblno            AS fMblno,
-               wi.f_product_name     AS fGoodsid,
-               wi.f_marks            AS fMarks,
-               wi.f_bsdate           AS fBsdate,
-               dict.dict_label       AS fFeeUnitid,
-               wi.f_billing_qty      AS fBillingQty,
-               wi.f_chargedate       AS fChargedate,
-               wi.f_billing_deadline AS fBillingDeadline,
-               wi.f_billing_days     AS fBillingDays,
-               wi.f_inventory_days   AS fInventoryDays,
-               wi.f_amt              AS fAmt,
-               wi.remark             AS remark
-        FROM t_warehousebills w
-                 LEFT JOIN t_warehousebillsfees wi ON w.f_id = wi.f_pid
-                 LEFT JOIN sys_dict_data dict ON dict.dict_value = wi.f_feeUnitid
-           , (
-            SELECT @ii := 0
-        ) AS ii
+        SELECT
+            ( @ii := @ii + 1 ) AS fId,
+            CASE
+                wi.f_billtype
+                WHEN 'SJRK' THEN
+                    '入库'
+                WHEN 'SJCK' THEN
+                    '出库'
+                WHEN 'KCZZ' THEN
+                    '库存总账'
+                END AS fBilltype,
+            ware.f_name AS warehouseName,
+            wi.f_mblno AS fMblno,
+            wi.f_product_name AS fGoodsid,
+            wi.f_marks AS fMarks,
+            wi.f_bsdate AS fBsdate,
+            dict.dict_label AS fFeeUnitid,
+            wi.f_billing_qty AS fBillingQty,
+            wi.f_chargedate AS fChargedate,
+            wi.f_billing_deadline AS fBillingDeadline,
+            wi.f_billing_days AS fBillingDays,
+            wi.f_inventory_days AS fInventoryDays,
+            wi.f_amt AS fAmt,
+            wi.remark AS remark
+        FROM
+            t_warehousebills w
+                LEFT JOIN t_warehousebillsfees wi ON w.f_id = wi.f_pid
+                LEFT JOIN t_warehouse ware ON ware.f_id = wi.f_warehouseid
+                LEFT JOIN sys_dict_data dict ON dict.dict_value = wi.f_feeUnitid,
+            ( SELECT @ii := 0 ) AS ii
         WHERE w.f_id = #{fId}
           AND w.f_typeid IS NULL
           AND dict.status = '0'