1.修正欧派的数据推送到系统

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\\汇通\\";
 
 
 

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 ="";
 
 	/**
 	 * 工厂对接服务名称

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();

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());