caifc 3 år sedan
förälder
incheckning
2e59f09c7d

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

@@ -4652,7 +4652,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 .collect(toList());
         // 查出所有仓库 给后续匹配仓库名字使用
         List<TWarehouse> warehouseList = tWarehouseMapper.selectTWarehouseList(new TWarehouse());
-        feesList.forEach(li -> {
+        itemsList.forEach(li -> {
             Optional<TWarehouse> first = warehouseList.stream().filter(warehouse -> Objects.equals(warehouse.getfId(), li.getfWarehouseid()))
                     .findFirst();
             first.ifPresent(tWarehouse -> li.setWarehouseName(tWarehouse.getfName()));

+ 1 - 0
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -63,6 +63,7 @@
                f_lineno,
                f_corpid,
                f_feeid,
+               f_warehouseid,
                f_feeUnitid,
                f_qty,
                f_unitprice,