1.尝试修改推送多次的问题

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -236,6 +236,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 
 	/**
 	 * 获取梦天的工厂的数据token
+	 *
 	 * @return
 	 */
 	private String getMtToken() throws NoSuchAlgorithmException {
@@ -298,11 +299,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 		}
 
 
-
 		logger.info("##################orderStatusHandler: 异常tag={}", 0);
 
 
-
 //		if("4".equals(status)){
 //
 //			// 需要推送数据
@@ -380,8 +379,6 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 		}
 
 
-
-
 		//拼接参数
 		MtOrderStatusDTO mtOrderStatusDTO = new MtOrderStatusDTO();
 		mtOrderStatusDTO.setInvoiceOrderCode(mtFactoryOrderMain.getInvoiceOrderCode());
@@ -416,7 +413,6 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 	}
 
 
-
 	@Transactional
 	@Override
 	public R sendReceiveInfo(ReceiveInfoDTO receiveInfoDTO) throws JsonProcessingException, NoSuchAlgorithmException {
@@ -511,7 +507,6 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 		logger.info("#############sendReceiveInfo:tag{}", 11);
 
 
-
 		return sendMtFactoryData(mtFactoryProperties.getUrl() + "/ZXCFaHuoDan/QianShouDan", s, 5);
 
 	}
@@ -520,7 +515,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 	@Override
 	public R sendUnloadCarNum(String unloadCarNum, String data) throws ParseException, JsonProcessingException, NoSuchAlgorithmException {
 
-
+		logger.info(">>>>>>sendUnloadCarNum tag ={}", 1);
 		MtUnLoadCarNumDTO unLoadCarNumDTO = new MtUnLoadCarNumDTO();
 		unLoadCarNumDTO.setInvoiceOrderCode(unloadCarNum);
 		unLoadCarNumDTO.setInvoiceTime(data);
@@ -530,13 +525,20 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 
 		//推送数据到梦天
 		//请求参数
-		return sendMtFactoryData(mtFactoryProperties.getUrl()+"/ZXCFaHuoDan/QueRenShouHuo",s,4);
+		logger.info(">>>>>>sendUnloadCarNum tag ={}", 1);
+		R r =sendMtFactoryData(mtFactoryProperties.getUrl() + "/ZXCFaHuoDan/QueRenShouHuo", s, 4);
+		logger.info(">>>>>>sendUnloadCarNum r ={}", r);
+
+		logger.info(">>>>>>sendUnloadCarNum tag ={}", 2);
+
+		return r;
 
 	}
 
 
 	/**
 	 * 封装梦天数据对接接口
+	 *
 	 * @param url
 	 * @param data
 	 * @return

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

@@ -435,6 +435,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			//查询包件信息数据
 			DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
 			DistributionParcelListEntity entity = new DistributionParcelListEntity();
+
 			BeanUtil.copyProperties(vo,entity);
 			entity.setConditions(1);
 			entity.setWarehouse(distributionStockArticleEntity.getWarehouse());

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java

@@ -121,35 +121,26 @@ public class UnloadCarComHandler {
 
 
 		if (isPush) {
+			log.info("##################{} 梦天确认签收数据推送1", isPush);
+
 			try {
 				R r = mtFactoryDataService.sendUnloadCarNum(carNum, unloadCarDTO.getCompleteDate());
-				log.info("##################{} 梦天确认签收数据推送1", carNum);
-
 				if (r.getCode() == ResultCode.SUCCESS.getCode()) {
-					log.info("##################{} 梦天确认签收数据推送2", carNum);
-
 					MtPushData mtPushData = new MtPushData();
 					mtPushData.setPushTime(new Date());
 					mtPushData.setPushStatus(1);// 推送状态
 					mtPushData.setRefCode(carNum);
 					mtPushData.setRefType(1);// 订单主表
 
-					// todo  这里需要查询主推送单的 ID
 					List<MtFactoryOrderMain> mtFactoryOrderMainList = mtFactoryOrderMainService.findMtFactoryOrderMainByInvoiceOrderCode(carNum);
 					if(mtFactoryOrderMainList.size()>0){
 						mtFactoryOrderMainList.get(0);
 						mtPushData.setRefId(mtFactoryOrderMainList.get(0).getId());
 					}
-
 					// 插入推送数据
 					mtPushDataService.save(mtPushData);
 				}
-
-			} catch (ParseException e) {
-				e.printStackTrace();
-			} catch (JsonProcessingException e) {
-				e.printStackTrace();
-			} catch (NoSuchAlgorithmException e) {
+			} catch (Exception e) {
 				e.printStackTrace();
 			}