20230403 13:32

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -395,7 +395,9 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                             if (Objects.equals(auditItems.getActId(), 120L)) {
                                 List<TWarehousebillsfees> feesList = tWarehousebillsfeesMapper.selectWarehousebillsfeesByPId(auditItems.getBillId());
                                 // 过滤出明细信息查询是否存在已计算仓储费
-                                List<Long> ids = feesList.stream().filter(li -> !li.getfBilltype().equals(WarehouseTypeEnum.KCZZ.getType()))
+                                List<Long> ids = feesList.stream().filter(li -> null != li.getfBilltype()
+                                        && !li.getfBilltype().equals(WarehouseTypeEnum.KCZZ.getType())
+                                        && null != li.getSrcId())
                                         .map(TWarehousebillsfees::getSrcId).distinct().collect(toList());
                                 if (CollectionUtils.isNotEmpty(ids) && tWarehousebillsitemsMapper.selectIsCalculateStorageFeesByIds(ids) > 0) {
                                     throw new WarehouseException("计算费用中存在已计算仓储费信息");

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

@@ -1207,7 +1207,7 @@
         tw.f_originalbilldate AS fOriginalbilldate,
         tw.f_stltypeid AS fStltypeid,
         tw.f_business_type AS fBusinessType,
-        tw.f_src_type_id AS fSrcTypeTd,
+        tw.f_src_type_id AS fSrcTypeId,
         tw.price_date_remarks AS priceDateRemarks,
         tw.f_address_name AS fAddress_name,
         tw.f_address AS fAddress,