|
|
@ -38,30 +38,31 @@ public class MtOrderMainClinet implements IMtOrderMainClinet { |
|
|
|
private RabbitTemplate rabbitTemplate; |
|
|
|
private RabbitTemplate rabbitTemplate; |
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private IMtFactoryDataService mtFactoryDataService; |
|
|
|
private IMtFactoryDataService mtFactoryDataService; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@GetMapping(TOP) |
|
|
|
@GetMapping(TOP) |
|
|
|
public R sendOrderPackageScan(String orderPackageCode, String operationTime, String distributionContactId, String distributionContactCode, String destinationWarehouse) throws NoSuchAlgorithmException, JsonProcessingException { |
|
|
|
public R sendOrderPackageScan(String orderPackageCode, String operationTime, String distributionContactId, String distributionContactCode, String destinationWarehouse) throws NoSuchAlgorithmException, JsonProcessingException { |
|
|
|
log.info(">>>>>>> 签收扫描 start"); |
|
|
|
log.info(">>>>>>> 签收扫描 start"); |
|
|
|
|
|
|
|
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
|
jsonObject.put("orderPackageCode",orderPackageCode); |
|
|
|
jsonObject.put("orderPackageCode", orderPackageCode); |
|
|
|
jsonObject.put("operationTime",operationTime); |
|
|
|
jsonObject.put("operationTime", operationTime); |
|
|
|
jsonObject.put("distributionContactId",distributionContactId); |
|
|
|
jsonObject.put("distributionContactId", distributionContactId); |
|
|
|
jsonObject.put("distributionContactCode",distributionContactCode); |
|
|
|
jsonObject.put("distributionContactCode", distributionContactCode); |
|
|
|
jsonObject.put("destinationWarehouse",destinationWarehouse); |
|
|
|
jsonObject.put("destinationWarehouse", destinationWarehouse); |
|
|
|
map.put("messageData",jsonObject.toJSONString()); |
|
|
|
map.put("messageData", jsonObject.toJSONString()); |
|
|
|
|
|
|
|
|
|
|
|
log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS")); |
|
|
|
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 -> { |
|
|
|
rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map, message -> { |
|
|
|
message.getMessageProperties() |
|
|
|
message.getMessageProperties() |
|
|
|
.setHeader("x-delay", 5000); |
|
|
|
.setHeader("x-delay", 5000); |
|
|
|
return message; |
|
|
|
return message; |
|
|
|
});*/ |
|
|
|
}); |
|
|
|
log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS")); |
|
|
|
log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS")); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return R.success(""); |
|
|
|
return R.success(""); |
|
|
@ -72,16 +73,16 @@ public class MtOrderMainClinet implements IMtOrderMainClinet { |
|
|
|
@PostMapping(SENDRECEIVEINFOBYNEWSYSTEM) |
|
|
|
@PostMapping(SENDRECEIVEINFOBYNEWSYSTEM) |
|
|
|
public R sendReceiveInfoByNewSystem(MtReceiveDTO mtReceiveDTO) throws NoSuchAlgorithmException, JsonProcessingException { |
|
|
|
public R sendReceiveInfoByNewSystem(MtReceiveDTO mtReceiveDTO) throws NoSuchAlgorithmException, JsonProcessingException { |
|
|
|
log.info(">>>>>>> 文员复核 start"); |
|
|
|
log.info(">>>>>>> 文员复核 start"); |
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
String mes = JSONObject.toJSONString(mtReceiveDTO); |
|
|
|
String mes = JSONObject.toJSONString(mtReceiveDTO); |
|
|
|
map.put("messageData",mes); |
|
|
|
map.put("messageData", mes); |
|
|
|
log.info(">>>>>>>>>>>>>>>>> 文员复核 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS")); |
|
|
|
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() |
|
|
|
message.getMessageProperties() |
|
|
|
.setHeader("x-delay", 5000); |
|
|
|
.setHeader("x-delay", 5000); |
|
|
|
return message; |
|
|
|
return message; |
|
|
|
});*/ |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
return R.success(""); |
|
|
|
return R.success(""); |
|
|
|
|
|
|
|
|
|
|
|