Merge pull request 'dev' (#17) from dev into pre-production

Reviewed-on: #17

blade-service/logpm-report/pom.xml

@@ -63,6 +63,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
+
         </plugins>
     </build>
 

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

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<Long> warehouse = billingService.getWarehouse();
 		indexCountVo.setInStoreData(inStoreData(warehouse));

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -380,7 +380,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getName();
+				warehouseAddress = "从【" + warehouseEntity.getName() + "】发出";
 			}
 			sendFactoryData(brands, node, warehouseAddress);
 		} catch (Exception e) {
@@ -942,7 +942,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getName();
+				warehouseAddress = "到达【" + warehouseEntity.getName() + "】";
 			}
 			sendFactoryData(brands, node, warehouseAddress);
 		} catch (Exception e) {
@@ -1709,7 +1709,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(nowWarehouseId);
 			String warehouseAddress = null;
 			if (ObjectUtil.isNotEmpty(warehouseEntity)) {
-				warehouseAddress = warehouseEntity.getName();
+				warehouseAddress = "从【" + warehouseEntity.getName() + "】发出";
 			}
 			this.sendFactoryData(brands, NodeEnums.TRIPARTITE_TRANSFER_DEPART, warehouseAddress);
 		} catch (Exception e) {