diff --git a/blade-service/logpm-report/pom.xml b/blade-service/logpm-report/pom.xml
index 536029f00..0fcdb9ef7 100644
--- a/blade-service/logpm-report/pom.xml
+++ b/blade-service/logpm-report/pom.xml
@@ -63,6 +63,7 @@
org.apache.maven.plugins
maven-antrun-plugin
+
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java
index d8ba826d5..2ce148ccf 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java
@@ -1,10 +1,11 @@
package com.logpm.report.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
import com.logpm.report.mapper.InLibraryDeliverMapper;
import com.logpm.report.service.InLibraryDeliverService;
-import io.swagger.models.auth.In;
+
import lombok.AllArgsConstructor;
+import org.springblade.core.redis.cache.BladeRedis;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -19,6 +20,7 @@ public class InLibraryDeliverServiceImpl implements InLibraryDeliverService {
private InLibraryDeliverMapper inLibraryDeliverMapper;
+
/***
* 总在库数
* @param
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java
index 2b01abc57..60716453e 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java
@@ -11,6 +11,7 @@ import org.checkerframework.checker.units.qual.A;
import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
import org.springblade.common.constant.stockup.StockupTypeConstant;
+import org.springblade.core.redis.cache.BladeRedis;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@@ -35,7 +36,7 @@ public class IndexCountServiceImpl implements IndexCountService {
private InLibraryDeliverServiceImpl inLibraryDeliverService;
private BillingServiceImpl billingService;
-
+ private final BladeRedis redis;
/**
@@ -43,6 +44,8 @@ public class IndexCountServiceImpl implements IndexCountService {
*/
@Cacheable(value = "indexCount=10")
public IndexCountVO indexCount() {
+
+
IndexCountVO indexCountVo = new IndexCountVO();
List warehouse = billingService.getWarehouse();
indexCountVo.setInStoreData(inStoreData(warehouse));
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index c811a54ed..ea7deb25b 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -380,7 +380,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>();
map.put("trayType", trayType);
map.put("trayCode", trayCode);
@@ -2877,7 +2877,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20");
int size = entityListByOrderCode.size();
- if (planNum.equals(size+realNum)) {
+ if (planNum.equals(size + realNum)) {
for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) {
String orderPackageCode = parcelListEntity.getOrderPackageCode();
//查询包件是否已经装车
@@ -4302,12 +4302,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl