From 5b8969fe90cd4f0286ab48a78ce9812ac5ce426f Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Fri, 13 Oct 2023 17:34:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=AC=A7=E6=B4=BE=E7=9A=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wrapper/DistributionStockArticleWrapper.java       |  2 +-
 .../pan/service/impl/PanFactoryDataServiceImpl.java    |  5 ++++-
 blade-service/logpm-patch/pom.xml                      | 10 +++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
index 201bf968e..14f8cd692 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
+++ b/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(); // 现在
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
index 4e2348f23..3ad2b8580 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
+++ b/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);
diff --git a/blade-service/logpm-patch/pom.xml b/blade-service/logpm-patch/pom.xml
index 3390deeca..4d3f68347 100644
--- a/blade-service/logpm-patch/pom.xml
+++ b/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>