java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

合并代码

single_db
pref_mail@163.com 1 year ago
parent
946d450d38
commit
13bbee3045
3 changed files with 97 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 110
      blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java
  2. 48
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  3. 10
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

110
blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java
Unescape View File

@ -7,93 +7,93 @@ package org.springblade.common.constant;
*/
public interface RabbitConstant {
//消费失败队列
String ERROR_QUEUE = "error_queue";
String ERROR_EXCHANGE = "error_exchange";
String ERROR_ROUTING = "error_routing";
String ERROR_QUEUE = "error_queue"+ModuleNameConstant.DEVAUTH;
String ERROR_EXCHANGE = "error_exchange"+ModuleNameConstant.DEVAUTH;
String ERROR_ROUTING = "error_routing"+ModuleNameConstant.DEVAUTH;
//订单状态消息队列配置
String ORDER_STATUS_QUEUE = "order_status_queue";
String ORDER_STATUS_EXCHANGE = "order_status_exchange";
String ORDER_STATUS_ROUTING = "order_status_routing";
String ORDER_STATUS_QUEUE = "order_status_queue"+ModuleNameConstant.DEVAUTH;
String ORDER_STATUS_EXCHANGE = "order_status_exchange"+ModuleNameConstant.DEVAUTH;
String ORDER_STATUS_ROUTING = "order_status_routing"+ModuleNameConstant.DEVAUTH;
String OPEN_ORDER_QUEUE = "open_order_queue";
String OPEN_ORDER_EXCHANGE = "open_order_exchange";
String OPEN_ORDER_ROUTING = "open_order_routing";
String OPEN_ORDER_QUEUE = "open_order_queue"+ModuleNameConstant.DEVAUTH;
String OPEN_ORDER_EXCHANGE = "open_order_exchange"+ModuleNameConstant.DEVAUTH;
String OPEN_ORDER_ROUTING = "open_order_routing"+ModuleNameConstant.DEVAUTH;
String DEAL_WITH_QUEUE = "deal_with_queue";
String DEAL_WITH_EXCHANGE = "deal_with_exchange";
String DEAL_WITH_ROUTING = "deal_with_routing";
String DEAL_WITH_QUEUE = "deal_with_queue"+ModuleNameConstant.DEVAUTH+ModuleNameConstant.DEVAUTH;
String DEAL_WITH_EXCHANGE = "deal_with_exchange"+ModuleNameConstant.DEVAUTH;
String DEAL_WITH_ROUTING = "deal_with_routing"+ModuleNameConstant.DEVAUTH;
String RECEIVE_INFO_QUEUE = "receive_info_queue";
String RECEIVE_INFO_EXCHANGE = "receive_info_exchange";
String RECEIVE_INFO_ROUTING = "receive_info_routing";
String RECEIVE_INFO_QUEUE = "receive_info_queue"+ModuleNameConstant.DEVAUTH;
String RECEIVE_INFO_EXCHANGE = "receive_info_exchange"+ModuleNameConstant.DEVAUTH;
String RECEIVE_INFO_ROUTING = "receive_info_routing"+ModuleNameConstant.DEVAUTH;
/**
* 卸车完成确认
*/
String UNLOAD_CAR_COM_INFO_QUEUE = "unload_car_com_info_quere";
String UNLOAD_CAR_COM_INFO_EXCHANGE = "unload_car_com_info_exchange";
String UNLOAD_CAR_COM_INFO_EXCHANGE = "unload_car_com_info_exchange"+ModuleNameConstant.DEVAUTH;
String UNLOAD_CAR_COM_INFO_ROUTING = "unload_car_com_info_routing ";
String WAYBILL_DATA_QUEUE = "waybill_data_queue";
String WAYBILL_DATA_EXCHANGE = "waybill_data_exchange";
String WAYBILL_DATA_ROUTING = "waybill_data_routing";
String WAYBILL_DATA_QUEUE = "waybill_data_queue"+ModuleNameConstant.DEVAUTH;
String WAYBILL_DATA_EXCHANGE = "waybill_data_exchange"+ModuleNameConstant.DEVAUTH;
String WAYBILL_DATA_ROUTING = "waybill_data_routing"+ModuleNameConstant.DEVAUTH;
String WAYBILL_DATA_TEST_QUEUE = "waybill_data_test_queue";
String WAYBILL_DATA_TEST_EXCHANGE = "waybill_data_test_exchange";
String WAYBILL_DATA_TEST_ROUTING = "waybill_data_test_routing";
String WAYBILL_DATA_TEST_QUEUE = "waybill_data_test_queue"+ModuleNameConstant.DEVAUTH;
String WAYBILL_DATA_TEST_EXCHANGE = "waybill_data_test_exchange"+ModuleNameConstant.DEVAUTH;
String WAYBILL_DATA_TEST_ROUTING = "waybill_data_test_routing"+ModuleNameConstant.DEVAUTH;
//消费失败队列
String WAREHOUSE_ERROR_QUEUE = "warehouse_error_queue";
String WAREHOUSE_ERROR_EXCHANGE = "warehouse_error_exchange";
String WAREHOUSE_ERROR_ROUTING = "warehouse_error_routing";
String WAREHOUSE_ERROR_QUEUE = "warehouse_error_queue"+ModuleNameConstant.DEVAUTH;
String WAREHOUSE_ERROR_EXCHANGE = "warehouse_error_exchange"+ModuleNameConstant.DEVAUTH;
String WAREHOUSE_ERROR_ROUTING = "warehouse_error_routing"+ModuleNameConstant.DEVAUTH;
String OUPAI_RECEIVING_QUEUE = "oupai_receiving_queue";
String OUPAI_RECEIVING_EXCHANGE = "oupai_receiving_exchange";
String OUPAI_RECEIVING_ROUTING = "oupai_receiving_routing";
String OUPAI_RECEIVING_QUEUE = "oupai_receiving_queue"+ModuleNameConstant.DEVAUTH;
String OUPAI_RECEIVING_EXCHANGE = "oupai_receiving_exchange"+ModuleNameConstant.DEVAUTH;
String OUPAI_RECEIVING_ROUTING = "oupai_receiving_routing"+ModuleNameConstant.DEVAUTH;
/****************************收货入库 老系统 start ************************************************/
String OUPAI_OLD_RECEIVING_QUEUE = "oupai_old_receiving_queue";
String OUPAI_OLD_RECEIVING_EXCHANGE = "oupai_old_receiving_exchange";
String OUPAI_OLD_RECEIVING_ROUTING = "oupai_old_receiving_routing";
String OUPAI_OLD_RECEIVING_QUEUE = "oupai_old_receiving_queue"+ModuleNameConstant.DEVAUTH;
String OUPAI_OLD_RECEIVING_EXCHANGE = "oupai_old_receiving_exchange"+ModuleNameConstant.DEVAUTH;
String OUPAI_OLD_RECEIVING_ROUTING = "oupai_old_receiving_routing"+ModuleNameConstant.DEVAUTH;
/****************************收货入库 老系统 end ************************************************/
String OUPAI_SIGN_QUEUE = "oupai_sign_queue";
String OUPAI_SIGN_EXCHANGE = "oupai_sign_exchange";
String OUPAI_SIGN_ROUTING = "oupai_sign_routing";
String OUPAI_SIGN_QUEUE = "oupai_sign_queue"+ModuleNameConstant.DEVAUTH;
String OUPAI_SIGN_EXCHANGE = "oupai_sign_exchange"+ModuleNameConstant.DEVAUTH;
String OUPAI_SIGN_ROUTING = "oupai_sign_routing"+ModuleNameConstant.DEVAUTH;
String SYNC_OLD_DATA_QUEUE = "sync_old_data_queue";
String SYNC_OLD_DATA_EXCHANGE = "sync_old_data_exchange";
String SYNC_OLD_DATA_ROUTING = "sync_old_data_routing";
String SYNC_OLD_DATA_QUEUE = "sync_old_data_queue"+ModuleNameConstant.DEVAUTH;
String SYNC_OLD_DATA_EXCHANGE = "sync_old_data_exchange"+ModuleNameConstant.DEVAUTH;
String SYNC_OLD_DATA_ROUTING = "sync_old_data_routing"+ModuleNameConstant.DEVAUTH;
//----------------------distribution---------------------
//备货消费失败队列
String DISTRIBUTION_ERROR_QUEUE = "distribution_error_queue";
String DISTRIBUTION_ERROR_EXCHANGE = "distribution_error_exchange";
String DISTRIBUTION_ERROR_ROUTING = "distribution_error_routing";
String DISTRIBUTION_ERROR_QUEUE = "distribution_error_queue"+ModuleNameConstant.DEVAUTH;
String DISTRIBUTION_ERROR_EXCHANGE = "distribution_error_exchange"+ModuleNameConstant.DEVAUTH;
String DISTRIBUTION_ERROR_ROUTING = "distribution_error_routing"+ModuleNameConstant.DEVAUTH;
String STOCKUP_SCAN_QUEUE = "stockup_scan_queue";
String STOCKUP_SCAN_EXCHANGE = "stockup_scan_exchange";
String STOCKUP_SCAN_ROUTING = "stockup_scan_routing";
String STOCKUP_SCAN_QUEUE = "stockup_scan_queue"+ModuleNameConstant.DEVAUTH;
String STOCKUP_SCAN_EXCHANGE = "stockup_scan_exchange"+ModuleNameConstant.DEVAUTH;
String STOCKUP_SCAN_ROUTING = "stockup_scan_routing"+ModuleNameConstant.DEVAUTH;
/**
* 备货判断是否下架
*/
String STOCKUP_STATE_UPDATE_QUEUE = "stockup_state_update_queue";
String STOCKUP_STATE_UPDATE_EXCHANGE = "stockup_state_update_exchange";
String STOCKUP_STATE_UPDATE_ROUTING = "stockup_state_update_routing";
String STOCKUP_STATE_UPDATE_QUEUE = "stockup_state_update_queue"+ModuleNameConstant.DEVAUTH;
String STOCKUP_STATE_UPDATE_EXCHANGE = "stockup_state_update_exchange"+ModuleNameConstant.DEVAUTH;
String STOCKUP_STATE_UPDATE_ROUTING = "stockup_state_update_routing"+ModuleNameConstant.DEVAUTH;
/****************文员复合签收推送老系统队列 start *************************/
String CLERK_CHECK_PUSH_DATA_QUEUE = "clerk_check_push_data_queue";
String CLERK_CHECK_PUSH_DATA_EXCHANGE = "clerk_check_push_data_exchange";
String CLERK_CHECK_PUSH_DATA_ROUTING = "clerk_check_push_data_routing";
String CLERK_CHECK_PUSH_DATA_QUEUE = "clerk_check_push_data_queue"+ModuleNameConstant.DEVAUTH;
String CLERK_CHECK_PUSH_DATA_EXCHANGE = "clerk_check_push_data_exchange"+ModuleNameConstant.DEVAUTH;
String CLERK_CHECK_PUSH_DATA_ROUTING = "clerk_check_push_data_routing"+ModuleNameConstant.DEVAUTH;
/****************文员复合签收推送老系统队列 end *************************/
@ -103,18 +103,18 @@ public interface RabbitConstant {
/****************包件状态变化 start*************************************************/
String ORDER_PACKAGE_STATUS_INFO_QUEUE = "order_package_status_info_queue";
String ORDER_PACKAGE_STATUS_INFO_EXCHANGE = "order_package_status_info_exchange";
String ORDER_PACKAGE_STATUS_INFO_ROUTING = "order_package_status_info_routing";
String ORDER_PACKAGE_STATUS_INFO_QUEUE = "order_package_status_info_queue"+ModuleNameConstant.DEVAUTH;
String ORDER_PACKAGE_STATUS_INFO_EXCHANGE = "order_package_status_info_exchange"+ModuleNameConstant.DEVAUTH;
String ORDER_PACKAGE_STATUS_INFO_ROUTING = "order_package_status_info_routing"+ModuleNameConstant.DEVAUTH;
/****************包件状态变化 end*************************************************/
/****************test队列******************/
String TEST_RECEIVE_INFO_QUEUE = "test_receive_info_queue";
String TEST_RECEIVE_INFO_EXCHANGE = "test_receive_info_exchange";
String TEST_RECEIVE_INFO_ROUTING = "test_receive_info_routing";
String TEST_RECEIVE_INFO_QUEUE = "test_receive_info_queue"+ModuleNameConstant.DEVAUTH;
String TEST_RECEIVE_INFO_EXCHANGE = "test_receive_info_exchange"+ModuleNameConstant.DEVAUTH;
String TEST_RECEIVE_INFO_ROUTING = "test_receive_info_routing"+ModuleNameConstant.DEVAUTH;
}

48
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
Unescape View File

@ -184,21 +184,39 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
@Override
public void updateGroundingStatus(String orderPackageCode, String groundingStatus, Long warehouseId) {
try {
// baseMapper.updateGroundingStatus(orderPackageCode,groundingStatus,warehouseId);
log.info(">>>>> 发送消息给MQ start 包件{}", orderPackageCode);
Map<String, Object> map = new HashMap();
map.put("messageId", CommonUtil.getUUID());
map.put("orderPackageCode", orderPackageCode);
map.put("groundingStatus", groundingStatus);
map.put("warehouseId", warehouseId);
rabbitTemplate.convertAndSend(RabbitConstant.ORDER_PACKAGE_STATUS_INFO_EXCHANGE, RabbitConstant.ORDER_PACKAGE_STATUS_INFO_ROUTING, map);
log.info(">>>>> 发送消息给MQ end 包件{}", orderPackageCode);
} catch (Exception e) {
log.error(">>>>>>> errr",e);
log.error("###############updateGroundingStatus: 更新上架状态失败 orderPackageCode={} warehouseId={} groundingStatus={}", orderPackageCode, warehouseId, groundingStatus);
// try {
//// baseMapper.updateGroundingStatus(orderPackageCode,groundingStatus,warehouseId);
//
// log.info(">>>>> 发送消息给MQ start 包件{}", orderPackageCode);
//
// Map<String, Object> map = new HashMap();
// map.put("messageId", CommonUtil.getUUID());
// map.put("orderPackageCode", orderPackageCode);
// map.put("groundingStatus", groundingStatus);
// map.put("warehouseId", warehouseId);
// rabbitTemplate.convertAndSend(RabbitConstant.ORDER_PACKAGE_STATUS_INFO_EXCHANGE, RabbitConstant.ORDER_PACKAGE_STATUS_INFO_ROUTING, map);
// log.info(">>>>> 发送消息给MQ end 包件{}", orderPackageCode);
// } catch (Exception e) {
// log.error(">>>>>>> errr",e);
// log.error("###############updateGroundingStatus: 更新上架状态失败 orderPackageCode={} warehouseId={} groundingStatus={}", orderPackageCode, warehouseId, groundingStatus);
// }
try{
QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("order_package_code",orderPackageCode)
.eq("warehouse_id",warehouseId)
.eq("is_deleted",0);
DistributionParcelListEntity parcelListEntity = baseMapper.selectOne(queryWrapper);
parcelListEntity.setOrderPackageGroundingStatus(groundingStatus);
int i = baseMapper.updateById(parcelListEntity);
// 更新状态
baseMapper.updateOrderPackageCodeById(parcelListEntity.getId(),groundingStatus);
}catch (Exception e){
// 更新状态报错
log.error(">>>>>> updateGroundingStatus 异常信息",e);
}

10
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -2211,19 +2211,22 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// log.error("#############无图片信息:{}", map);
// return R.fail("无图片信息");
// }
log.info(">>>>>>>>>>> tag {}",1);
this.updatePicture(distributionSignfor);
log.info(">>>>>>>>>>> tag {}",2);
//2、维护状态
DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionSignfor.getReservationId());
if (Func.isEmpty(reservationEntity)) {
log.error("#############reservationEntity参数错误:{}", reservationEntity);
return R.fail("服务器正忙~~");
}
log.info(">>>>>>>>>>> tag {}",3);
//查询数据
DistributionSignforEntity distributionSignforEntity = baseMapper.selectOne(new QueryWrapper<DistributionSignforEntity>().lambda()
.eq(DistributionSignforEntity::getDeliveryId, distributionSignfor.getDeliveryId())
.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
);
log.info(">>>>>>>>>>> tag {}",3);
//获取计划配送用户司机
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignfor.getDeliveryId());
if (Func.isEmpty(distributionDeliveryListEntity)) {
@ -2253,6 +2256,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return R.fail("签收失败");
}
BladeUser user = AuthUtil.getUser();
log.info(">>>>>>>>>>> tag {}",6);
//处理库存品
//查询出该客户下的库存品信息
List<DisStockListDetailEntity> detailEntities = distributionReservationMapper.selectInventoryListByReservation(distributionSignforEntity.getReservationId());
@ -2360,6 +2364,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//包件不需要考虑备货、装车直接可进行签收 过滤已装车的包件
// List<DistributionParcelListEntity> noLoadingPackage = parcelListEntityList.stream().filter(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())).collect(Collectors.toList());
//查询该客户下的所有零担信息
log.info(">>>>>>>>>>> tag {}",7);
List<DistributionParcelNumberDTO> parcelNumberEntityList = distributionReservationMapper.selectZeroPackageListByReservationId(distributionSignforEntity.getReservationId());
if (Func.isNotEmpty(parcelNumberEntityList)) {
for (DistributionParcelNumberDTO parcelNumberEntity : parcelNumberEntityList) {
@ -2503,6 +2508,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
String signingTime = simpleDateFormat.format(new Date());
List<Long> packageIds = new ArrayList<>();
List<String> orderCodes = new ArrayList<>();
log.info(">>>>>>>>>>> tag {}",8);
if (Func.isNotEmpty(parcelListEntityList)) {
for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) {
//查询是否进行装车
@ -2613,6 +2619,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
distributionReservationMapper.updateById(reservationEntity);
log.info(">>>>>>>>>>> tag {}",9);
//维护配送任务
distributionAsyncService.checkDeliverySignStatusByReservation(distributionSignforEntity.getDeliveryId());
distributionDeliveryListEntity.setDeliveryListLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
@ -2622,6 +2629,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
}
distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
log.info(">>>>>>>>>>> tag {}",10);
LambdaUpdateWrapper<DistributionSignforEntity> set = new UpdateWrapper<DistributionSignforEntity>().lambda()
.eq(DistributionSignforEntity::getId, distributionSignforEntity.getId())
.set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures())

Write Preview
Loading…
Cancel
Save