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

签收数据推送报错

training
pref_mail@163.com 1 year ago
parent
96d5e6437d
commit
108822517a
2 changed files with 90 additions and 87 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. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  2. 176
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
Unescape View File

@ -1754,6 +1754,7 @@
logpm_distribution_signfor AS lds
LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id
LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
where lddl.id=#{deliveryId}
</select>
<select id="selectDeliveryById" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO">
SELECT

176
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java
Unescape View File

@ -68,112 +68,114 @@ public class ClerkCheckPushDataQueueHandler {
@RabbitHandler
public void clerkCheckPushDataHandler(Map map, Message message, Channel channel) {
//得到审核的任务ＩＤ
DistributionSignforDTO distributionStockEntity = (DistributionSignforDTO) map.get("messageData");
Long signfor_id = distributionStockEntity.getId();
if (ObjectUtil.isEmpty(signfor_id)) {
log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空");
return;
}
try{
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列");
//得到审核的任务ＩＤ
DistributionSignforDTO distributionStockEntity = (DistributionSignforDTO) map.get("messageData");
Long signfor_id = distributionStockEntity.getId();
if (ObjectUtil.isEmpty(signfor_id)) {
log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空");
return;
}
//得到签收对象
DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signfor_id);
//得到签收对象
DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signfor_id);
//需要检测文员是否进行复核了
//需要检测文员是否进行复核了
if (ObjectUtil.isEmpty(distributionSignforEntity)) {
log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity);
return;
}
//　得到配送计划
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId());
if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) {
log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity);
return;
}
// 得到配送客户
DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId());
if (ObjectUtil.isEmpty(distributionReservationEntity)) {
log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity);
return;
}
if (ObjectUtil.isEmpty(distributionSignforEntity)) {
log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity);
return;
}
//　得到配送计划
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId());
if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) {
log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity);
return;
}
// 得到配送客户
DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId());
if (ObjectUtil.isEmpty(distributionReservationEntity)) {
log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity);
return;
}
//组合配送信息
SignPushDataDTO delivery = distributionDeliveryListMapper.selectPushOldDelivery(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
//还需要配送的出库人、配送人、操作人信息
if (Func.isNotEmpty(delivery)){
if (delivery.getKind().equals("1")){
//自主配送
DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(Wrappers.<DistributionDeliverySelfEntity>query().lambda()
.eq(DistributionDeliverySelfEntity::getDeliveryId, delivery.getId())
.eq(DistributionDeliverySelfEntity::getIsMaster, delivery.getId())
);
if (Func.isNotEmpty(distributionDeliverySelfEntity)){
delivery.setOut_id(Long.parseLong(distributionDeliverySelfEntity.getDriverId()));
delivery.setOut_name(distributionDeliverySelfEntity.getDriverName());
delivery.setOut_phone(distributionDeliverySelfEntity.getDriverPhone());
}
}else {
//外协
DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, delivery.getId()));
if (Func.isNotEmpty(distributionDeliveryTripartiteEntity)){
delivery.setOut_name(distributionDeliveryTripartiteEntity.getDriverName());
delivery.setOut_phone(distributionDeliveryTripartiteEntity.getDriverPhone());
//组合配送信息
SignPushDataDTO delivery = distributionDeliveryListMapper.selectPushOldDelivery(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
//还需要配送的出库人、配送人、操作人信息
if (Func.isNotEmpty(delivery)){
if (delivery.getKind().equals("1")){
//自主配送
DistributionDeliverySelfEntity distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(Wrappers.<DistributionDeliverySelfEntity>query().lambda()
.eq(DistributionDeliverySelfEntity::getDeliveryId, delivery.getId())
.eq(DistributionDeliverySelfEntity::getIsMaster, delivery.getId())
);
if (Func.isNotEmpty(distributionDeliverySelfEntity)){
delivery.setOut_id(Long.parseLong(distributionDeliverySelfEntity.getDriverId()));
delivery.setOut_name(distributionDeliverySelfEntity.getDriverName());
delivery.setOut_phone(distributionDeliverySelfEntity.getDriverPhone());
}
}else {
//外协
DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, delivery.getId()));
if (Func.isNotEmpty(distributionDeliveryTripartiteEntity)){
delivery.setOut_name(distributionDeliveryTripartiteEntity.getDriverName());
delivery.setOut_phone(distributionDeliveryTripartiteEntity.getDriverPhone());
}
}
}
R<User> userR = userClient.userInfoById(delivery.getAdministrators_id());
if (Func.isNotEmpty(userR)){
User user = userR.getData();
delivery.setAdministrators_name(user.getName());
}
DistributionStockupEntity distributionStockupEntity = distributionReservationMapper.selectStockup(distributionSignforEntity.getReservationId());
if (Func.isNotEmpty(distributionStockupEntity)){
if (distributionStockupEntity.getAssignStatus().equals(StockAssignStatusConstant.yizhipai.getValue())){
delivery.setOut_to_id(distributionStockupEntity.getStockupUserId());
delivery.setOut_to_name(distributionStockupEntity.getStockupUser());
R<User> userR = userClient.userInfoById(delivery.getAdministrators_id());
if (Func.isNotEmpty(userR)){
User user = userR.getData();
delivery.setAdministrators_name(user.getName());
}
DistributionStockupEntity distributionStockupEntity = distributionReservationMapper.selectStockup(distributionSignforEntity.getReservationId());
if (Func.isNotEmpty(distributionStockupEntity)){
if (distributionStockupEntity.getAssignStatus().equals(StockAssignStatusConstant.yizhipai.getValue())){
delivery.setOut_to_id(distributionStockupEntity.getStockupUserId());
delivery.setOut_to_name(distributionStockupEntity.getStockupUser());
}
}
}
//查询客户信息
List<SignPushDataContactDTO> customer = distributionReservationMapper.selectPushOldCustomer(distributionSignforEntity.getReservationId());
if (Func.isNotEmpty(customer)){
//查询客户订单
List<SignPushDataUnitDTO> signPushDataUnitDTOS = new ArrayList<>();
if(distributionReservationEntity.getReservationNum()>0){
//查询包件扫描签收
SignPushDataUnitDTO pushOldPackage = distributionSignforMapper.selectPushOldPackage(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
if (Func.isNotEmpty(pushOldPackage)){
signPushDataUnitDTOS.add(pushOldPackage);
//查询客户信息
List<SignPushDataContactDTO> customer = distributionReservationMapper.selectPushOldCustomer(distributionSignforEntity.getReservationId());
if (Func.isNotEmpty(customer)){
//查询客户订单
List<SignPushDataUnitDTO> signPushDataUnitDTOS = new ArrayList<>();
if(distributionReservationEntity.getReservationNum()>0){
//查询包件扫描签收
SignPushDataUnitDTO pushOldPackage = distributionSignforMapper.selectPushOldPackage(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
if (Func.isNotEmpty(pushOldPackage)){
signPushDataUnitDTOS.add(pushOldPackage);
}
}
}
if (distributionReservationEntity.getReservationStockListNum() > 0){
//查询库存品扫描签收
SignPushDataUnitDTO pushOldInventory = distributionSignforMapper.selectPushOldInventory(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
if (Func.isNotEmpty(pushOldInventory)){
signPushDataUnitDTOS.add(pushOldInventory);
if (distributionReservationEntity.getReservationStockListNum() > 0){
//查询库存品扫描签收
SignPushDataUnitDTO pushOldInventory = distributionSignforMapper.selectPushOldInventory(distributionSignforEntity.getReservationId(),distributionSignforEntity.getDeliveryId());
if (Func.isNotEmpty(pushOldInventory)){
signPushDataUnitDTOS.add(pushOldInventory);
}
}
if (Func.isNotEmpty(signPushDataUnitDTOS)){
SignPushDataContactDTO signPushDataContactDTO = customer.get(0);
signPushDataContactDTO.setSignPushDataUnitDTOs(signPushDataUnitDTOS);
}
}
if (Func.isNotEmpty(signPushDataUnitDTOS)){
SignPushDataContactDTO signPushDataContactDTO = customer.get(0);
signPushDataContactDTO.setSignPushDataUnitDTOs(signPushDataUnitDTOS);
}
//完成客户信息添加
delivery.setSignPushDataContactDTOs(customer);
//完成客户信息添加
delivery.setSignPushDataContactDTOs(customer);
}
}
}
Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
}catch (Exception e){
e.printStackTrace();
}
Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
}

Write Preview
Loading…
Cancel
Save