From 95cd3c02194251ae2efa572d17eb5e3f488469ee Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 29 Aug 2023 18:23:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=AC=A7=E6=B4=BE=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E5=88=B0=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/common/constant/CommonConstant.java    |  4 ++--
 .../common/constant/ModuleNameConstant.java            |  2 +-
 .../comfac/service/impl/AsyncDataServiceImpl.java      |  4 ++--
 .../oupai/controller/OupaiFactoryDataController.java   | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java
index e28a74455..460e6949a 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java
@@ -53,14 +53,14 @@ public interface CommonConstant {
 //	/**
 //	 * 默认缓存文件地址
 //	 */
-//	String  SYSTEMFILEPATH ="/home/java_works/logpm_temp_file/";
+	String  SYSTEMFILEPATH ="/home/java_works/logpm_temp_file/";
 
 
 
 	/**
 	 * 默认缓存文件地址
 	 */
-	String  SYSTEMFILEPATH ="C:\\Users\\0.0\\Desktop\\汇通\\";
+//	String  SYSTEMFILEPATH ="C:\\Users\\0.0\\Desktop\\汇通\\";
 
 
 
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
index d4d3b3676..301dcc0d5 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-zhy";
+	public static final String DEVAUTH ="";
 
 	/**
 	 * 工厂对接服务名称
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
index 3e89a9097..e53e84962 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
@@ -378,11 +378,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	}
 
 	@Override
-	public void handlerOuPaiDataToHt(String carNumber) {
+	public void handlerOuPaiDataToHt(String code) {
 
 
 		// 查询需要处理的派车单 查询没有转发的shuju
-		List<ReceivingOrderEntity> list = receivingOrderService.lambdaQuery().eq(ReceivingOrderEntity::getCarNumber, carNumber).eq(ReceivingOrderEntity::getTurnStatus, 0).list();
+		List<ReceivingOrderEntity> list = receivingOrderService.lambdaQuery().eq(ReceivingOrderEntity::getCode, code).eq(ReceivingOrderEntity::getTurnStatus, 0).list();
 		for (ReceivingOrderEntity receivingOrderEntity : list) {
 			// 查询这个派车单下面的订单
 			List<FactoryOrderEntity> factoryOrderEntities = factoryOrderService.lambdaQuery().eq(FactoryOrderEntity::getReceivingId, receivingOrderEntity.getId()).eq(FactoryOrderEntity::getTurnStatus, 0).list();
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java
index d17f9ba8e..038367001 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java
@@ -48,9 +48,9 @@ public class OupaiFactoryDataController {
 		orderStatusLog.setStatus(1);
 		orderStatusLog.setDataStatus(0);
 		factoryLogService.save(orderStatusLog);
-		String carNum = null;
+		String code = null;
 		try {
-			carNum = mtFactoryDataService.saveData(ouPaiDataPushVO);
+			code = mtFactoryDataService.saveData(ouPaiDataPushVO);
 			orderStatusLog.setDataStatus(1);
 
 		} catch (ServiceException  e) {
@@ -62,9 +62,9 @@ public class OupaiFactoryDataController {
 		factoryLogService.saveOrUpdate(orderStatusLog);
 
 		//开启异步线程处理数据
-//		if(ObjectUtils.isNotNull(carNum)){
-//			syncDataService.handlerOuPaiDataToHt(ouPaiDataPushVO.getCarNum());
-//		}
+		if(ObjectUtils.isNotNull(code)){
+			syncDataService.handlerOuPaiDataToHt(code);
+		}
 		return R.data(ouPaiDataPushVO.getOrderCode());