1.修改欧派的入库数据没有时间

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -48,7 +48,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 			distributionStockupVO.setDriverName(DriverName);
 		}
 		//计算在库天数
-		if (Func.isNotEmpty(entity.getWarehouseEntryTime().getTime())){
+		if (ObjectUtils.isNotNull(entity.getWarehouseEntryTime())){
 
 			long time1 = entity.getWarehouseEntryTime().getTime(); //入库
 			long time2 = new Date().getTime(); // 现在

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -482,7 +482,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
 				distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
 
-				distributionStockArticleEntity.setWarehouseEntryTime(date);
+
+				if(distributionStockArticleEntity.getWarehouseEntryTime() == null){
+					distributionStockArticleEntity.setWarehouseEntryTime(new Date());
+				}
 
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 				distributionStockArticleEntity.setId(id);

blade-service/logpm-patch/pom.xml

@@ -29,11 +29,11 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>logpm-patch-api</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>logpm-patch-api</artifactId>-->
+<!--            <version>${bladex.project.version}</version>-->
+<!--        </dependency>-->
         <!--Job-->
         <dependency>
             <groupId>com.xuxueli</groupId>