|
|
|
|
@ -1,24 +1,63 @@
|
|
|
|
|
package com.logpm.trunkline.service.impl; |
|
|
|
|
|
|
|
|
|
import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; |
|
|
|
|
import com.logpm.trunkline.entity.TrunklineAdvanceEntity; |
|
|
|
|
import com.logpm.trunkline.service.IAsyncService; |
|
|
|
|
import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; |
|
|
|
|
import com.logpm.trunkline.service.ITrunklineAdvanceService; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.logpm.basicdata.entity.BasicdataWarehouseEntity; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataWarehouseClient; |
|
|
|
|
import com.logpm.distribution.entity.DistributionParcelListEntity; |
|
|
|
|
import com.logpm.trunkline.entity.*; |
|
|
|
|
import com.logpm.trunkline.service.*; |
|
|
|
|
import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; |
|
|
|
|
import com.logpm.warehouse.entity.WarehouseWayBillDetail; |
|
|
|
|
import com.logpm.warehouse.entity.WarehouseWaybillEntity; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseWaybillClient; |
|
|
|
|
import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.common.annotations.ChangeAsync; |
|
|
|
|
import org.springblade.common.annotations.LogpmAsync; |
|
|
|
|
import org.springblade.core.redis.cache.BladeRedis; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.ObjectUtil; |
|
|
|
|
import org.springblade.system.entity.Tenant; |
|
|
|
|
import org.springblade.system.feign.ISysClient; |
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Arrays; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Optional; |
|
|
|
|
import java.util.concurrent.CompletableFuture; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
@Service |
|
|
|
|
@Slf4j |
|
|
|
|
public class AsyncServiceImpl implements IAsyncService { |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private ITrunklineAdvanceService advanceService; |
|
|
|
|
@Autowired |
|
|
|
|
private ITrunklineAdvanceDetailService advanceDetailService; |
|
|
|
|
@Autowired |
|
|
|
|
private IWarehouseWaybillClient warehouseWaybillClient; |
|
|
|
|
@Autowired |
|
|
|
|
private IWarehouseWaybillDetailClient warehouseWaybillDetailClient; |
|
|
|
|
@Autowired |
|
|
|
|
private ISysClient sysClient; |
|
|
|
|
@Autowired |
|
|
|
|
private BladeRedis bladeRedis; |
|
|
|
|
@Autowired |
|
|
|
|
private ITrunklineWaybillOrderService waybillOrderService; |
|
|
|
|
@Autowired |
|
|
|
|
private ITrunklineWaybillPackageService trunklineWaybillPackageService; |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private IWarehouseWaybillClient waybillClient; |
|
|
|
|
@Autowired |
|
|
|
|
private IBasicdataWarehouseClient warehouseClient; |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private ITrunklineWaybillTrackService trunklineWaybillTrackService; |
|
|
|
|
|
|
|
|
|
@LogpmAsync("asyncExecutor") |
|
|
|
|
@Override |
|
|
|
|
@ -47,4 +86,272 @@ public class AsyncServiceImpl implements IAsyncService {
|
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ChangeAsync() |
|
|
|
|
@Override |
|
|
|
|
public void saveOtherData(String tenantId, List<WarehouseWaybillEntity> waybillBilllByWaybillNos, List<TrunklineAdvanceDetailVO> trunklineAdvanceDetailEntities, List<TrunklineAdvanceEntity> trunklineAdvanceEntities, List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities, List<TrunklineWaybillOrderEntity> trunklineWaybillOrderEntities, List<WarehouseWayBillDetail> warehouseWayBillDetails, TrunklineWaybillTrackEntity trunklineWaybillTrackEntity) { |
|
|
|
|
// 保存暂存单
|
|
|
|
|
Tenant tenant = null; |
|
|
|
|
R<Tenant> tenantFeign = sysClient.getTenant(tenantId); |
|
|
|
|
|
|
|
|
|
if (tenantFeign.isSuccess()) { |
|
|
|
|
tenant = tenantFeign.getData(); |
|
|
|
|
} |
|
|
|
|
String mallName = tenant.getTenantName(); |
|
|
|
|
for (TrunklineAdvanceEntity trunklineAdvanceEntity : trunklineAdvanceEntities) { |
|
|
|
|
|
|
|
|
|
TrunklineAdvanceEntity finalTrunklineAdvanceEntity = trunklineAdvanceEntity; |
|
|
|
|
List<TrunklineAdvanceDetailEntity> t = trunklineAdvanceDetailEntities.stream().filter(trunklineAdvanceDetailEntity -> trunklineAdvanceDetailEntity.getAdvanceId().equals(finalTrunklineAdvanceEntity.getId())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
saveTrunklineAdvanceEntity(trunklineAdvanceEntity, mallName); |
|
|
|
|
|
|
|
|
|
// 保存暂存子表
|
|
|
|
|
saveTrunklineAdvanceDetailEntity(t, trunklineAdvanceEntity, mallName); |
|
|
|
|
} |
|
|
|
|
List<Long> collect = trunklineAdvanceEntities.stream().map(TrunklineAdvanceEntity::getId).distinct().collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
// 重新查询trunklineAdvanceDetail
|
|
|
|
|
List<TrunklineAdvanceDetailVO> listByAdvanceIds = advanceDetailService.findAdvanceDetailVoByAdvanceIds(collect); |
|
|
|
|
|
|
|
|
|
// 保存运单
|
|
|
|
|
BasicdataWarehouseEntity basicdataWarehouseEntity = getBasicdataWarehouseEntity(mallName); |
|
|
|
|
for (WarehouseWaybillEntity waybillBilllByWaybillNo : waybillBilllByWaybillNos) { |
|
|
|
|
List<TrunklineWaybillOrderEntity> collect1 = trunklineWaybillOrderEntities.stream().filter(trunklineWaybillOrderEntity -> trunklineWaybillOrderEntity.getWaybillId().equals(waybillBilllByWaybillNo.getId())).collect(Collectors.toList()); |
|
|
|
|
List<WarehouseWayBillDetail> t = warehouseWayBillDetails.stream().filter(warehouseWayBillDetail -> warehouseWayBillDetail.getWaybillId().equals(waybillBilllByWaybillNo.getId())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 修改运单的起始仓库 和末端仓
|
|
|
|
|
waybillBilllByWaybillNo.setDepartureWarehouseName(waybillBilllByWaybillNo.getDestinationWarehouseName()); |
|
|
|
|
waybillBilllByWaybillNo.setDepartureWarehouseId(null); |
|
|
|
|
|
|
|
|
|
// 目的仓
|
|
|
|
|
if (basicdataWarehouseEntity != null) { |
|
|
|
|
waybillBilllByWaybillNo.setDestinationWarehouseId(basicdataWarehouseEntity.getId()); |
|
|
|
|
waybillBilllByWaybillNo.setDestinationWarehouseName(basicdataWarehouseEntity.getName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
waybillBilllByWaybillNo.setTenantId(tenant.getTenantId()); |
|
|
|
|
|
|
|
|
|
WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(waybillBilllByWaybillNo.getWaybillNo()); |
|
|
|
|
if (byWaybillNo == null) { |
|
|
|
|
Long l = warehouseWaybillClient.addEnntity(waybillBilllByWaybillNo); |
|
|
|
|
waybillBilllByWaybillNo.setId(l); |
|
|
|
|
} else { |
|
|
|
|
waybillBilllByWaybillNo.setId(byWaybillNo.getId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<WarehouseWayBillDetail> byWaybillId = warehouseWaybillDetailClient.findByWaybillId(waybillBilllByWaybillNo.getId()); |
|
|
|
|
|
|
|
|
|
for (WarehouseWayBillDetail warehouseWayBillDetail : t) { |
|
|
|
|
warehouseWayBillDetail.setId(null); |
|
|
|
|
for (WarehouseWayBillDetail wayBillDetail : byWaybillId) { |
|
|
|
|
|
|
|
|
|
if (wayBillDetail.getProductName().equals(warehouseWayBillDetail.getProductName())) { |
|
|
|
|
// 不执行
|
|
|
|
|
warehouseWayBillDetail.setId(wayBillDetail.getId()); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (warehouseWayBillDetail.getId() == null) { |
|
|
|
|
warehouseWayBillDetail.setWaybillId(waybillBilllByWaybillNo.getId()); |
|
|
|
|
warehouseWaybillDetailClient.addEntity(warehouseWayBillDetail); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("waybill_no", waybillBilllByWaybillNo.getWaybillNo()); |
|
|
|
|
List<TrunklineWaybillOrderEntity> listByWaybillNo = waybillOrderService.list(queryWrapper); |
|
|
|
|
|
|
|
|
|
for (TrunklineWaybillOrderEntity trunklineWaybillOrderEntity : collect1) { |
|
|
|
|
|
|
|
|
|
trunklineWaybillOrderEntity.setId(null); |
|
|
|
|
List<TrunklineWaybillPackageEntity> collect3 = trunklineWaybillPackageEntities.stream().filter(ts -> { |
|
|
|
|
return ts.getWaybillNo().equals(trunklineWaybillOrderEntity.getWaybillNo()) && ts.getAdvanceId().equals(trunklineWaybillOrderEntity.getAdvanceId()); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
trunklineWaybillOrderEntity.setWaybillId(waybillBilllByWaybillNo.getId()); |
|
|
|
|
trunklineWaybillOrderEntity.setTenantId(tenant.getTenantId()); |
|
|
|
|
|
|
|
|
|
Optional<TrunklineAdvanceEntity> entityWithOrderNumber1123 = trunklineAdvanceEntities.stream() |
|
|
|
|
.filter(entity -> trunklineWaybillOrderEntity.getOrderCode().equals(entity.getOrderCode())) // 过滤出订单号为"1123"的实体
|
|
|
|
|
.findFirst(); // 获取第一个匹配的实体
|
|
|
|
|
|
|
|
|
|
if (entityWithOrderNumber1123.isPresent()) { |
|
|
|
|
TrunklineAdvanceEntity foundEntity = entityWithOrderNumber1123.get(); |
|
|
|
|
// 使用找到的实体
|
|
|
|
|
trunklineWaybillOrderEntity.setAdvanceId(foundEntity.getId()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (TrunklineWaybillOrderEntity waybillOrderEntity : listByWaybillNo) { |
|
|
|
|
|
|
|
|
|
if (waybillOrderEntity.getOrderCode().equals(trunklineWaybillOrderEntity.getOrderCode())) { |
|
|
|
|
trunklineWaybillOrderEntity.setId(waybillOrderEntity.getId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
if (trunklineWaybillOrderEntity.getId() == null) { |
|
|
|
|
|
|
|
|
|
waybillOrderService.save(trunklineWaybillOrderEntity); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<Long> ids = Arrays.asList(waybillBilllByWaybillNo.getId()); |
|
|
|
|
|
|
|
|
|
LambdaQueryWrapper<TrunklineWaybillPackageEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
lambdaQueryWrapper.in(TrunklineWaybillPackageEntity::getWaybillId, ids); |
|
|
|
|
List<TrunklineWaybillPackageEntity> listByWaybillIds = trunklineWaybillPackageService.list(lambdaQueryWrapper); |
|
|
|
|
|
|
|
|
|
for (TrunklineWaybillPackageEntity trunklineWaybillPackageEntity : collect3) { |
|
|
|
|
trunklineWaybillPackageEntity.setId(null); |
|
|
|
|
trunklineWaybillPackageEntity.setWaybillId(waybillBilllByWaybillNo.getId()); |
|
|
|
|
trunklineWaybillPackageEntity.setTenantId(tenant.getTenantId()); |
|
|
|
|
|
|
|
|
|
trunklineWaybillPackageEntity.setAdvanceId(trunklineWaybillOrderEntity.getAdvanceId()); |
|
|
|
|
|
|
|
|
|
for (TrunklineAdvanceDetailVO listByAdvanceId : listByAdvanceIds) { |
|
|
|
|
if (listByAdvanceId.getAdvanceId().equals(trunklineWaybillOrderEntity.getAdvanceId())) { |
|
|
|
|
|
|
|
|
|
if (listByAdvanceId.getOrderPackageCode().equals(trunklineWaybillPackageEntity.getOrderPackageCode())) { |
|
|
|
|
trunklineWaybillPackageEntity.setAdvanceDetailId(listByAdvanceId.getId()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (TrunklineWaybillPackageEntity listByWaybillId : listByWaybillIds) { |
|
|
|
|
|
|
|
|
|
if (listByWaybillId.getWaybillId().equals(trunklineWaybillPackageEntity.getWaybillId())) { |
|
|
|
|
if (listByWaybillId.getOrderPackageCode().equals(trunklineWaybillPackageEntity.getOrderPackageCode())) { |
|
|
|
|
trunklineWaybillPackageEntity.setId(listByWaybillId.getId()); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
if (trunklineWaybillPackageEntity.getId() == null) { |
|
|
|
|
trunklineWaybillPackageService.save(trunklineWaybillPackageEntity); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 查询运单作业节点数据
|
|
|
|
|
LambdaQueryWrapper<TrunklineWaybillTrackEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
lambdaQueryWrapper.eq(TrunklineWaybillTrackEntity::getWaybillNo, waybillBilllByWaybillNo.getWaybillNo()); |
|
|
|
|
lambdaQueryWrapper.eq(TrunklineWaybillTrackEntity::getTrackType, "10"); |
|
|
|
|
List<TrunklineWaybillTrackEntity> list = trunklineWaybillTrackService.list(lambdaQueryWrapper); |
|
|
|
|
if (list.isEmpty()) { |
|
|
|
|
|
|
|
|
|
trunklineWaybillTrackEntity.setWaybillId(waybillBilllByWaybillNo.getId()); |
|
|
|
|
trunklineWaybillTrackEntity.setTenantId(tenant.getTenantId()); |
|
|
|
|
BasicdataWarehouseEntity basicdataWarehouseEntity1 = getBasicdataWarehouseEntity(mallName); |
|
|
|
|
trunklineWaybillTrackEntity.setWarehouseId(basicdataWarehouseEntity1.getId()); |
|
|
|
|
trunklineWaybillTrackEntity.setWarehouseName(basicdataWarehouseEntity1.getName()); |
|
|
|
|
trunklineWaybillTrackService.save(trunklineWaybillTrackEntity); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private BasicdataWarehouseEntity getBasicdataWarehouseEntity(String mallName) { |
|
|
|
|
String cacheName = mallName + "仓"; |
|
|
|
|
BasicdataWarehouseEntity basicdataWarehouseEntity = bladeRedis.get(cacheName); |
|
|
|
|
if (basicdataWarehouseEntity == null) { |
|
|
|
|
basicdataWarehouseEntity = warehouseClient.findByName(mallName + "仓"); |
|
|
|
|
bladeRedis.setEx(cacheName, basicdataWarehouseEntity, 60 * 60 * 24L); |
|
|
|
|
} |
|
|
|
|
return basicdataWarehouseEntity; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void saveTrunklineAdvanceDetailEntity(List<TrunklineAdvanceDetailEntity> t, TrunklineAdvanceEntity trunklineAdvanceEntity, String mallName) { |
|
|
|
|
Tenant tenant = changeDataBase(mallName); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<Long> ids = Arrays.asList(trunklineAdvanceEntity.getId()); |
|
|
|
|
|
|
|
|
|
List<TrunklineAdvanceDetailVO> listByAdvanceIds = advanceDetailService.findAdvanceDetailVoByAdvanceIds(ids); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<TrunklineAdvanceDetailEntity> saveObjs = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
for (TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity : t) { |
|
|
|
|
|
|
|
|
|
trunklineAdvanceDetailEntity.setId(null); |
|
|
|
|
// 检测 保存的对象是否已经存在
|
|
|
|
|
for (TrunklineAdvanceDetailVO listByAdvanceId : listByAdvanceIds) { |
|
|
|
|
if (listByAdvanceId.getOrderPackageCode().equals(trunklineAdvanceDetailEntity.getOrderPackageCode())) { |
|
|
|
|
trunklineAdvanceDetailEntity.setId(listByAdvanceId.getId()); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (trunklineAdvanceDetailEntity.getId() == null) { |
|
|
|
|
trunklineAdvanceDetailEntity.setPackageStatus("0"); |
|
|
|
|
trunklineAdvanceDetailEntity.setAdvanceId(trunklineAdvanceEntity.getId()); |
|
|
|
|
trunklineAdvanceDetailEntity.setTenantId(tenant.getTenantId()); |
|
|
|
|
trunklineAdvanceDetailEntity.setIncomingWarehouseId(null); |
|
|
|
|
trunklineAdvanceDetailEntity.setIncomingWarehouseName(null); |
|
|
|
|
BasicdataWarehouseEntity basicdataWarehouseEntity = getBasicdataWarehouseEntity(mallName); |
|
|
|
|
if (basicdataWarehouseEntity != null) { |
|
|
|
|
trunklineAdvanceDetailEntity.setWarehouseId(basicdataWarehouseEntity.getId()); |
|
|
|
|
trunklineAdvanceDetailEntity.setWarehouseName(basicdataWarehouseEntity.getName()); |
|
|
|
|
} |
|
|
|
|
saveObjs.add(trunklineAdvanceDetailEntity); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
advanceDetailService.saveBatch(saveObjs); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private TrunklineAdvanceEntity saveTrunklineAdvanceEntity(TrunklineAdvanceEntity trunklineAdvanceEntity, String mallName) { |
|
|
|
|
Tenant tenant = changeDataBase(mallName); |
|
|
|
|
// 查找商户的暂存单是否存在改制
|
|
|
|
|
|
|
|
|
|
QueryWrapper<TrunklineAdvanceEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.eq("order_code", trunklineAdvanceEntity.getOrderCode()) |
|
|
|
|
.last("limit 1"); |
|
|
|
|
TrunklineAdvanceEntity trunklineAdvanceEntity1 = advanceService.getOne(queryWrapper); |
|
|
|
|
BasicdataWarehouseEntity basicdataWarehouseEntity = getBasicdataWarehouseEntity(mallName); |
|
|
|
|
if (ObjectUtil.isEmpty(trunklineAdvanceEntity1)) { |
|
|
|
|
|
|
|
|
|
// 保存对象
|
|
|
|
|
if (basicdataWarehouseEntity != null) { |
|
|
|
|
trunklineAdvanceEntity.setWarehouseId(basicdataWarehouseEntity.getId()); |
|
|
|
|
trunklineAdvanceEntity.setWarehouseName(basicdataWarehouseEntity.getName()); |
|
|
|
|
} |
|
|
|
|
trunklineAdvanceEntity.setTenantId(tenant.getTenantId()); |
|
|
|
|
advanceService.save(trunklineAdvanceEntity); |
|
|
|
|
|
|
|
|
|
return trunklineAdvanceEntity; |
|
|
|
|
} else { |
|
|
|
|
return trunklineAdvanceEntity1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Tenant changeDataBase(String maillName) { |
|
|
|
|
R<Tenant> tenantByName = sysClient.getTenantByName(maillName); |
|
|
|
|
if (tenantByName.isSuccess()) { |
|
|
|
|
Tenant tenant = tenantByName.getData(); |
|
|
|
|
if (ObjectUtil.isEmpty(tenant)) { |
|
|
|
|
log.info(">>>>>>>>>>>>> saveOtherDataBaseNew 租户不存在"); |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
return tenant; |
|
|
|
|
} |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
