1.修改梦天的卸车推送

2.修改PDA登录 查看配送车次查看到其他仓库的数据

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java

@@ -182,7 +182,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 
 	List<DistributionLoadscaninvnEntity> selectdeliveryworkVnScanStockde(@Param("barcode")String barcode,@Param("deliveryId") Long deliveryId);
 
-	List<DistributionAppDeliveryListVO> selectDistributionAppDeliveryListPage(IPage page, @Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO,@Param("array") List<Long> deliveryIds);
+	List<DistributionAppDeliveryListVO> selectDistributionAppDeliveryListPage(IPage page, @Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO,@Param("array") List<Long> deliveryIds,@Param("warehouseId") Long warehouseId);
 
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -757,7 +757,7 @@
         logpm_distribution_delivery_list lddl
         left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id
         <where>
-            lddl.is_deleted =0
+            lddl.is_deleted =0 and lddl.warehourse_id =#{warehouseId}
             <if test=" param.type != null and param.type != ''">and  lddl.type = #{param.type}</if>
             <if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
                 and lddl.id in

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -1473,7 +1473,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			//推送内容
 			MtReceiveDTO mtReceiveDTO = new MtReceiveDTO();
 			mtReceiveDTO.setReceiver(distributionReservationEntity.getConsignee());
-			mtReceiveDTO.setSendTaskId(distributionDeliveryListEntity.getId().toString());
+			mtReceiveDTO.setSendTaskId(distributionReservationEntity.getId().toString());
 
 
 			Map<String, List<MtReceiveContentDTO>> brand = null;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -2164,6 +2164,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		String value1 = DictBizCache.getValue("role_class", "delivery_driver_new");
 		if (roleId.contains(value1)) delivery = true;
 
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+
 
 //		R<String> value = dictBizClient.getValue("role_class", roleId);
 		if (delivery) {
@@ -2176,12 +2178,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			//查询司机的任务
 			List<Long> deliveryIds = distributionDeliverySelfMapper.selectdeliveryList(driverArtery.getId());
 			if (!deliveryIds.isEmpty()) {
-				distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO, deliveryIds);
+				distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO, deliveryIds,myCurrentWarehouse.getId());
 			} else {
 				return page.setRecords(distributionAppDeliveryListVOS);
 			}
 		} else {
-			distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO, null);
+			distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO, null,myCurrentWarehouse.getId());
 		}
 		//转换字典字段
 		for (DistributionAppDeliveryListVO distributionAppDeliveryListVO : distributionAppDeliveryListVOS) {

blade-service/logpm-factory/src/main/java/com/logpm/factory/config/RabbitMqConfiguration.java

@@ -26,16 +26,16 @@ import static io.protostuff.MapSchema.MessageFactories.HashMap;
 public class RabbitMqConfiguration {
 
 	@Bean
-	public RabbitTemplate createRabbitTemplate(ConnectionFactory connectionFactory){
+	public RabbitTemplate createRabbitTemplate(ConnectionFactory connectionFactory) {
 		RabbitTemplate template = new RabbitTemplate();
 		template.setConnectionFactory(connectionFactory);
 		template.setMandatory(true);
 		template.setConfirmCallback(new RabbitTemplate.ConfirmCallback() {
 			@Override
 			public void confirm(CorrelationData correlationData, boolean b, String s) {
-				System.out.println("确认回调-相关数据："+correlationData);
-				System.out.println("确认回调-确认情况："+b);
-				System.out.println("确认回调-原因："+s);
+				System.out.println("确认回调-相关数据：" + correlationData);
+				System.out.println("确认回调-确认情况：" + b);
+				System.out.println("确认回调-原因：" + s);
 //				Long id = Long.parseLong(correlationData.getId());
 //				UpdateWrapper<PanOrderStatusLog> updateWrapper = new UpdateWrapper<>();
 //				if(b){
@@ -57,40 +57,43 @@ public class RabbitMqConfiguration {
 			public void returnedMessage(ReturnedMessage returnedMessage) {
 
 
-				if("mt_business_data_2_factory_exchange-pref".equals(returnedMessage.getExchange())){
-					return ;
+				if ("mt_business_data_2_factory_exchange".equals(returnedMessage.getExchange()) || "mt_business_data_clerk_check_2_factory_exchange".equals(returnedMessage.getExchange())) {
+					return;
 				}
 
-				System.out.println("返回回调-消息："+returnedMessage.getMessage());
-				System.out.println("返回回调-回应码："+returnedMessage.getReplyCode());
-				System.out.println("返回回调-回应信息："+returnedMessage.getReplyText());
-				System.out.println("返回回调-交换机："+returnedMessage.getExchange());
-				System.out.println("返回回调-路由键："+returnedMessage.getRoutingKey());
+				System.out.println("返回回调-消息：" + returnedMessage.getMessage());
+				System.out.println("返回回调-回应码：" + returnedMessage.getReplyCode());
+				System.out.println("返回回调-回应信息：" + returnedMessage.getReplyText());
+				System.out.println("返回回调-交换机：" + returnedMessage.getExchange());
+				System.out.println("返回回调-路由键：" + returnedMessage.getRoutingKey());
 			}
 		});
 		return template;
 	}
 
 	@Bean
-	public DirectExchange errorMessageExchange(){
+	public DirectExchange errorMessageExchange() {
 		return new DirectExchange(RabbitConstant.ERROR_EXCHANGE);
 	}
+
 	@Bean
-	public Queue errorQueue(){
+	public Queue errorQueue() {
 		return new Queue(RabbitConstant.ERROR_QUEUE, true);
 	}
+
 	@Bean
-	public Binding errorBinding(Queue errorQueue, DirectExchange errorMessageExchange){
+	public Binding errorBinding(Queue errorQueue, DirectExchange errorMessageExchange) {
 		return BindingBuilder.bind(errorQueue).to(errorMessageExchange).with(RabbitConstant.ERROR_ROUTING);
 	}
 
 	/**
 	 * 消费失败队列
+	 *
 	 * @param rabbitTemplate
 	 * @return
 	 */
 	@Bean
-	public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate){
+	public MessageRecoverer republishMessageRecoverer(RabbitTemplate rabbitTemplate) {
 		return new RepublishMessageRecoverer(rabbitTemplate, RabbitConstant.ERROR_EXCHANGE, RabbitConstant.ERROR_ROUTING);
 	}
 
@@ -239,10 +242,6 @@ public class RabbitMqConfiguration {
 	}
 
 
-
-
-
-
 	@Bean
 	public Queue oupaiTestReceivingQueue() {
 		return new Queue(RabbitConstant.TEST_RECEIVE_INFO_QUEUE, true);
@@ -296,18 +295,18 @@ public class RabbitMqConfiguration {
 		return BindingBuilder.bind(syncOldDataQueue).to(syncOldDataExchange).with(RabbitConstant.SYNC_OLD_DATA_ROUTING).noargs();
 	}
 
-/**************梦天扫描延迟推送  start****************/
+	/**************梦天扫描延迟推送  start****************/
 	@Bean
 	public Queue mtBusinessData2FactoryQueue() {
-		Map<String, Object> args =Maps.newHashMap();
-		args.put("x-message-ttl",5000);
-		return new Queue(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_QUEUE,true,false,false,args);
+		Map<String, Object> args = Maps.newHashMap();
+		args.put("x-message-ttl", 5000);
+		return new Queue(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_QUEUE, true, false, false, args);
 
 	}
 
 	@Bean
 	public CustomExchange mtBusinessData2FactoryExchange() {
-	Map<String, Object> args =Maps.newHashMap();
+		Map<String, Object> args = Maps.newHashMap();
 
 		args.put("x-delayed-type", "direct");
 		return new CustomExchange(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE,
@@ -323,48 +322,49 @@ public class RabbitMqConfiguration {
 /**************梦天扫描延迟推送  end****************/
 
 
-
 	/**************梦天扫描延迟推送  start****************/
 	@Bean
 	public Queue mtBusinessDataClerkCheck2FactoryQueue() {
-		Map<String, Object> args =Maps.newHashMap();
-		args.put("x-message-ttl",5000);
-		return new Queue(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_QUEUE,true,false,false,args);
+		Map<String, Object> args = Maps.newHashMap();
+		args.put("x-message-ttl", 5000);
+		return new Queue(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_QUEUE, true, false, false, args);
 
 	}
 
-	@Bean
-	public Queue normalQueue() {
-		return new Queue("normal_queue", true);
-	}
 
 	@Bean
-	public CustomExchange normalExchange() {
+	public CustomExchange mtBusinessDataClerkCheck2FactoryExchange() {
 		Map<String, Object> args = Maps.newHashMap();
+
 		args.put("x-delayed-type", "direct");
-		return new CustomExchange("normal_exchange", "x-delayed-message", true, false, args);
+		return new CustomExchange(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE,
+			"x-delayed-message", true, false, args);
+
 	}
 
 	@Bean
-	public Binding normalBinding(Queue normalQueue, CustomExchange normalExchange) {
-		return BindingBuilder.bind(normalQueue).to(normalExchange).with("normal_routerkey").noargs();
+	public Binding mtBusinessDataClerkCheck2FactoryBinding(Queue mtBusinessDataClerkCheck2FactoryQueue, CustomExchange mtBusinessDataClerkCheck2FactoryExchange) {
+		return BindingBuilder.bind(mtBusinessDataClerkCheck2FactoryQueue).to(mtBusinessDataClerkCheck2FactoryExchange).with(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING).noargs();
+
 	}
 
-	@Bean
-	public CustomExchange mtBusinessDataClerkCheck2FactoryExchange() {
-		Map<String, Object> args =Maps.newHashMap();
+	/**************梦天扫描延迟推送  end****************/
 
-		args.put("x-delayed-type", "direct");
-		return new CustomExchange(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE,
-			"x-delayed-message", true, false, args);
 
+	@Bean
+	public Queue normalQueue() {
+		return new Queue("normal_queue", true);
 	}
 
 	@Bean
-	public Binding mtBusinessDataClerkCheck2FactoryBinding(Queue mtBusinessData2FactoryQueue, CustomExchange mtBusinessData2FactoryExchange) {
-		return BindingBuilder.bind(mtBusinessData2FactoryQueue).to(mtBusinessData2FactoryExchange).with(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING).noargs();
-
+	public CustomExchange normalExchange() {
+		Map<String, Object> args = Maps.newHashMap();
+		args.put("x-delayed-type", "direct");
+		return new CustomExchange("normal_exchange", "x-delayed-message", true, false, args);
 	}
-/**************梦天扫描延迟推送  end****************/
 
+	@Bean
+	public Binding normalBinding(Queue normalQueue, CustomExchange normalExchange) {
+		return BindingBuilder.bind(normalQueue).to(normalExchange).with("normal_routerkey").noargs();
+	}
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java

@@ -56,11 +56,11 @@ public class MtOrderMainClinet implements IMtOrderMainClinet {
 		log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS"));
 
 
-//		rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map,message -> {
-//			message.getMessageProperties()
-//				.setHeader("x-delay", 5000);
-//			return message;
-//		});
+		rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map,message -> {
+			message.getMessageProperties()
+				.setHeader("x-delay", 5000);
+			return message;
+		});
 		log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS"));
 
 
@@ -77,11 +77,11 @@ public class MtOrderMainClinet implements IMtOrderMainClinet {
 		map.put("messageData",mes);
 		log.info(">>>>>>>>>>>>>>>>> 文员复核 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS"));
 
-	/*	rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING, map,message -> {
+		rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING, map,message -> {
 			message.getMessageProperties()
 				.setHeader("x-delay", 5000);
 			return message;
-		});*/
+		});
 
 		return R.success("");
 

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

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Component;
 
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -79,6 +80,8 @@ public class UnloadCarComHandler {
 			Map<String, List<MTOrderPackageRelationVO>> stringListMap = allMtData.stream().collect(Collectors.groupingBy(MTOrderPackageRelationVO::getInvoiceOrderCode));
 			Set<String> set = stringListMap.keySet();
 			String carNum = null;
+
+			Set<String> r = new HashSet<>();
 			for (String s : set) {
 				// 得到某个工厂运输批次的集合
 				List<MTOrderPackageRelationVO> t = stringListMap.get(s);
@@ -91,17 +94,16 @@ public class UnloadCarComHandler {
 						break;
 					}
 				}
-				log.info("##################unloadCarComDataHandler carNum：{}", carNum);
-				try {
-					if (StringUtil.isNoneBlank(carNum)) {
-						sendDataCarNum(carNum, unloadCarDTO.getCompleteDate());
-					}
-				} catch (ParseException e) {
-					log.error("##################unloadCarComDataHandler 解析时间出错：{}", e.getMessage());
-				} catch (NoSuchAlgorithmException | JsonProcessingException ignored) {
-					log.error("##################unloadCarComDataHandler 发送数据出错：{}", ignored.getMessage());
-				}
-			}
+                if (StringUtil.isNoneBlank(carNum)) {
+					r.add(carNum);
+                }
+            }
+
+			r.forEach(t->{
+				sendDataCarNum(t, unloadCarDTO.getCompleteDate());
+			});
+
+
 		} catch (Exception e) {
 			log.error("##################unloadCarComDataHandler 解析数据出错：{}", e.getMessage());
 		}
@@ -118,7 +120,7 @@ public class UnloadCarComHandler {
 	 * @throws NoSuchAlgorithmException
 	 * @throws JsonProcessingException
 	 */
-	private void sendDataCarNum(String carNum, String completeDate) throws ParseException, NoSuchAlgorithmException, JsonProcessingException {
+	private void sendDataCarNum(String carNum, String completeDate)  {
 		log.info("##################sendDataCarNum carNum：{},completeDate{}", carNum, completeDate);
 
 		// 需要判断这个发货单编号是否推送过
@@ -129,7 +131,16 @@ public class UnloadCarComHandler {
 			log.info("##################{} 车次已经推送过", carNum);
 			return;
 		}
-		R r = mtFactoryDataService.sendUnloadCarNum(carNum, completeDate);
+		try{
+
+			R r = mtFactoryDataService.sendUnloadCarNum(carNum, completeDate);
+
+			log.info("MT 数据卸车推送 {}",r.getMsg());
+		}catch (Exception e){
+
+
+			log.error(">>>> 梦天数据卸车推送异常",e);
+		}
 		log.info("##################{} 梦天确认签收数据推送1", carNum);
 
 	}