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

Merge branch 'dev' into pre-production

master
汤建军 6 months ago
parent
462550170d a85659e1c2
commit
196a0f98b5
4 changed files with 118 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
  2. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
  3. 64
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
  4. 28
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
Unescape View File

@ -9,7 +9,7 @@ public interface ModuleNameConstant {
/** /**
* 如果不需要 "" * 如果不需要 ""
*/ */
public static final String DEVAUTH =""; public static final String DEVAUTH ="-tjj";
/** /**
* 工厂对接服务名称 * 工厂对接服务名称

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

@ -471,6 +471,9 @@
LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id AND ldbl.id = lds.bill_lading_id LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id AND ldbl.id = lds.bill_lading_id
WHERE WHERE
ldbs.is_deleted = 0 and ldbs.bill_lading_id = #{id} and ldbs.order_status in (1,3) ldbs.is_deleted = 0 and ldbs.bill_lading_id = #{id} and ldbs.order_status in (1,3)
GROUP BY
ldsa.id
</select> </select>
</mapper> </mapper>

64
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
Unescape View File

@ -397,7 +397,11 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
@Override @Override
@Transactional @Transactional
public R savePCAddvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO) { public R savePCAddvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
List<DistributionAddvaluePackageDTO> packageEntityList = distributionAppAddvalueDTO.getPackageEntityList(); List<DistributionAddvaluePackageDTO> packageEntityList = new ArrayList<>();
if (!Func.isEmpty(distributionAppAddvalueDTO.getPackageEntityList())){
packageEntityList = distributionAppAddvalueDTO.getPackageEntityList();
}
//查询是否重复添加 //查询是否重复添加
DistributionAddvalueEntity addvalueEntity = distributionAddvalueMapper.selectOne(Wrappers.<DistributionAddvalueEntity>query().lambda() DistributionAddvalueEntity addvalueEntity = distributionAddvalueMapper.selectOne(Wrappers.<DistributionAddvalueEntity>query().lambda()
@ -409,11 +413,6 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
return Resp.scanFail("操作失败", "存在该类型增值服务项,如需更改请编辑"); return Resp.scanFail("操作失败", "存在该类型增值服务项,如需更改请编辑");
} }
DistributionAddvalueDetailEntity distributionAddvalueDetailEntity = new DistributionAddvalueDetailEntity(); DistributionAddvalueDetailEntity distributionAddvalueDetailEntity = new DistributionAddvalueDetailEntity();
// if (Func.isEmpty(distributionAppAddvalueDTO.getNum())) {
// return Resp.scanFail("添加失败", "错误的包件数量");
// } else {
// distributionAddvalueDetailEntity.setNum(distributionAppAddvalueDTO.getNum());
// }
DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionAppAddvalueDTO.getReservationId()); DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionAppAddvalueDTO.getReservationId());
if (Func.isEmpty(reservationEntity)) { if (Func.isEmpty(reservationEntity)) {
return Resp.scanFail("添加失败", "客户信息错误"); return Resp.scanFail("添加失败", "客户信息错误");
@ -428,7 +427,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
} else { } else {
distributionAddvalueDetailEntity.setFloolNum(distributionAppAddvalueDTO.getFloolNum()); distributionAddvalueDetailEntity.setFloolNum(distributionAppAddvalueDTO.getFloolNum());
} }
packageEntityList = distributionAppAddvalueDTO.getPackageEntityList();
break; break;
case "2": case "2":
if (Func.isEmpty(distributionAppAddvalueDTO.getDistance())) { if (Func.isEmpty(distributionAppAddvalueDTO.getDistance())) {
@ -439,7 +438,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
if (Func.isEmpty(distributionAppAddvalueDTO.getFee())){ if (Func.isEmpty(distributionAppAddvalueDTO.getFee())){
return Resp.scanFail("添加失败", "请输入超区费用"); return Resp.scanFail("添加失败", "请输入超区费用");
}else { }else {
totalFee.add(distributionAppAddvalueDTO.getFee()); totalFee = totalFee.add(distributionAppAddvalueDTO.getFee());
} }
Map<String, Object> addValueDTO = new HashMap<>(); Map<String, Object> addValueDTO = new HashMap<>();
addValueDTO.put("reservationId",distributionAppAddvalueDTO.getReservationId().toString()); addValueDTO.put("reservationId",distributionAppAddvalueDTO.getReservationId().toString());
@ -467,7 +466,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
if (Func.isEmpty(distributionAppAddvalueDTO.getFee())){ if (Func.isEmpty(distributionAppAddvalueDTO.getFee())){
return Resp.scanFail("添加失败", "请输入专车费用"); return Resp.scanFail("添加失败", "请输入专车费用");
}else { }else {
totalFee.add(distributionAppAddvalueDTO.getFee()); totalFee = totalFee.add(distributionAppAddvalueDTO.getFee());
} }
List<DistributionAddvaluePackageDTO> specialCarList = distributionSignforService.checkAddValuePCPackageList(distributionAppAddvalueDTO.getReservationId()); List<DistributionAddvaluePackageDTO> specialCarList = distributionSignforService.checkAddValuePCPackageList(distributionAppAddvalueDTO.getReservationId());
if (!Func.isEmpty(specialCarList)){ if (!Func.isEmpty(specialCarList)){
@ -612,8 +611,9 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
} }
}); });
if (!addvaluePackageEntities.isEmpty()) { if (!addvaluePackageEntities.isEmpty()) {
BigDecimal finalTotalFee = totalFee;
addvaluePackageEntities.forEach(p ->{ addvaluePackageEntities.forEach(p ->{
totalFee.add(p.getFee()); finalTotalFee.add(p.getFee());
}); });
distributionAddvalueDetailEntity.setFee(totalFee); distributionAddvalueDetailEntity.setFee(totalFee);
distributionAddvalueDetailService.updateById(distributionAddvalueDetailEntity); distributionAddvalueDetailService.updateById(distributionAddvalueDetailEntity);
@ -710,6 +710,10 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
if (Func.isNotEmpty(parcelListEntities)) { if (Func.isNotEmpty(parcelListEntities)) {
parcelListEntities.stream().forEach(p -> { parcelListEntities.stream().forEach(p -> {
p.setRecordType("1"); p.setRecordType("1");
//进行客户信息完善
}); });
} }
if (Func.isNotEmpty(zeroPackageList)) { if (Func.isNotEmpty(zeroPackageList)) {
@ -717,18 +721,6 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
p.setRecordType("1"); p.setRecordType("1");
}); });
} }
// List<DistributionAddvaluePackageEntity> entityList = null;
// if (Func.isNotEmpty(packageEntityList)) {
// entityList = parcelListEntities.stream().filter(p1 -> packageEntityList.stream().noneMatch(p2 -> p2.equals(p1.getId()))).collect(Collectors.toList());
// if (Func.isEmpty(entityList)) {
// log.error("################该客户下库存品包件信息:{}", detailEntities);
// log.error("################该客户下包件信息:{}", parcelListEntities);
// }
// } else {
// entityList = parcelListEntities;
// }
return parcelListEntities; return parcelListEntities;
} }
@ -942,25 +934,33 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
} }
AtomicReference<BigDecimal> newFee = new AtomicReference<>(BigDecimal.ZERO); AtomicReference<BigDecimal> newFee = new AtomicReference<>(BigDecimal.ZERO);
List<Long> packageIds = packageEntityList.stream().map(DistributionAddvaluePackageDTO::getPackageId).collect(Collectors.toList()); List<Long> packageIds = packageEntityList.stream().map(DistributionAddvaluePackageDTO::getPackageId).collect(Collectors.toList());
packageEntityList.forEach(p->{ // packageEntityList.forEach(p->{
newFee.set(distributionAddvalueDetailEntity.getFee().subtract(p.getUnitPrice())); // newFee.set(distributionAddvalueDetailEntity.getFee().subtract(p.getUnitPrice()));
//
}); // });
List<DistributionAddvaluePackageEntity> addvaluePackageEntities = distributionAddvaluePackageMapper.selectList(Wrappers.<DistributionAddvaluePackageEntity>query().lambda() List<DistributionAddvaluePackageEntity> addvaluePackageEntities = distributionAddvaluePackageMapper.selectList(Wrappers.<DistributionAddvaluePackageEntity>query().lambda()
.eq(DistributionAddvaluePackageEntity::getReservationId, distributionAppAddvalueDTO.getReservationId()) .eq(DistributionAddvaluePackageEntity::getReservationId, distributionAppAddvalueDTO.getReservationId())
.eq(DistributionAddvaluePackageEntity::getAddvalueDetailId, distributionAppAddvalueDTO.getAddvalueDetailId()) .eq(DistributionAddvaluePackageEntity::getAddvalueDetailId, distributionAppAddvalueDTO.getAddvalueDetailId())
); );
if (Objects.equals(packageIds.size(),addvaluePackageEntities.size())){ if (!addvaluePackageEntities.isEmpty()) {
//此增值服务项进行全部取消 List<DistributionAddvaluePackageEntity> entityList = addvaluePackageEntities.stream().filter(f -> packageIds.contains(f.getPackageId())).collect(Collectors.toList());
//这里就需要对整个增值服务项进行删除 entityList.forEach(l->{
distributionAddvalueDetailMapper.deleteAddvalueDetailById(distributionAppAddvalueDTO.getAddvalueDetailId()); newFee.set(distributionAddvalueDetailEntity.getFee().subtract(l.getUnitPrice()));
distributionAddvalueMapper.deleteAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType());
}else { });
}
int sum = packageEntityList.stream().mapToInt(DistributionAddvaluePackageEntity::getQuantity).sum(); int sum = packageEntityList.stream().mapToInt(DistributionAddvaluePackageEntity::getQuantity).sum();
//维护详情的件数和金额 //维护详情的件数和金额
distributionAddvalueDetailEntity.setFee(newFee.get()); distributionAddvalueDetailEntity.setFee(newFee.get());
distributionAddvalueDetailEntity.setNum(distributionAddvalueDetailEntity.getNum() - sum); distributionAddvalueDetailEntity.setNum(distributionAddvalueDetailEntity.getNum() - sum);
distributionAddvalueDetailMapper.updateById(distributionAddvalueDetailEntity); distributionAddvalueDetailMapper.updateById(distributionAddvalueDetailEntity);
if (Objects.equals(packageIds.size(),addvaluePackageEntities.size())){
//此增值服务项进行全部取消
//这里就需要对整个增值服务项进行删除
distributionAddvalueDetailMapper.deleteAddvalueDetailById(distributionAppAddvalueDTO.getAddvalueDetailId());
distributionAddvalueMapper.deleteAddvalue(distributionAppAddvalueDTO.getReservationId(), distributionAppAddvalueDTO.getAddvalueType());
} }
//查看取消增值服务的保健是否存在该项增值服务中，存在才能继续执行 //查看取消增值服务的保健是否存在该项增值服务中，存在才能继续执行
boolean isExistence = packageIds.stream().allMatch(id -> addvaluePackageEntities.stream().map(DistributionAddvaluePackageEntity::getPackageId).collect(Collectors.toList()).contains(id)); boolean isExistence = packageIds.stream().allMatch(id -> addvaluePackageEntities.stream().map(DistributionAddvaluePackageEntity::getPackageId).collect(Collectors.toList()).contains(id));

28
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
Unescape View File

@ -217,8 +217,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
private IDistributionNodeWorkService iDistributionNodeWorkService; private IDistributionNodeWorkService iDistributionNodeWorkService;
@Override @Override
public IPage<DistrilbutionBillLadingVO> selectDistrilbutionBillLadingPage(IPage<DistrilbutionBillLadingVO> page, DistrilbutionBillLadingVO distrilbutionBillLading) { public IPage<DistrilbutionBillLadingVO> selectDistrilbutionBillLadingPage(IPage<DistrilbutionBillLadingVO> page, DistrilbutionBillLadingVO distrilbutionBillLading) {
return page.setRecords(baseMapper.selectDistrilbutionBillLadingPage(page, distrilbutionBillLading)); return page.setRecords(baseMapper.selectDistrilbutionBillLadingPage(page, distrilbutionBillLading));
@ -1758,8 +1756,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
// List<Long> ids = null; // List<Long> ids = null;
List<DistributionStockArticleEntity> stockArticleList = distrilbutionBillLadingDTO.getStockArticleList(); List<DistributionStockArticleEntity> stockArticleList = distrilbutionBillLadingDTO.getStockArticleList();
Map<Long, List<DistributionStockArticleEntity>> collect = stockArticleList.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getId)); Map<Long, List<DistributionStockArticleEntity>> collect = stockArticleList.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getId));
List<DistributionParcelListDTO> newPackageEntityList = new ArrayList<>();
List<DistributionParcelListDTO> parcelLisList = distrilbutionBillLadingDTO.getParcelLisList();//品类信息 List<DistributionParcelListDTO> parcelLisList = distrilbutionBillLadingDTO.getParcelLisList();//品类信息
//对原计划进行匹配
if (!list.isEmpty()) { if (!list.isEmpty()) {
List<Long> longs = new ArrayList<>(); List<Long> longs = new ArrayList<>();
//存在的 //存在的
@ -1823,20 +1822,22 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
} }
}); });
if (!longs.isEmpty()) { if (!longs.isEmpty()) {
// distributionZeroPackageService.deleteLogic(longs);
//进行零担在库数量恢复 //进行零担在库数量恢复
distributionZeroPackageService.recoverZeroPackage(distrilbutionBillLadingDTO.getId(), longs); distributionZeroPackageService.recoverZeroPackage(distrilbutionBillLadingDTO.getId(), longs);
// distributionZeroPackageService.cancelZeroPackage(longs);
} }
//收集需要进行新增的包件信息
newPackageEntityList = parcelLisList.stream().filter(p -> !list.stream().map(DistributionReservationZeroPackageEntity::getParcelListId).collect(Collectors.toList()).contains(p.getId())).collect(Collectors.toList());
} else { }
// TODo 添加新的品类 // TODo 添加新的品类
List<DistributionReservationZeroPackageEntity> packageEntityList = new ArrayList<>(); if (Func.isNotEmpty(newPackageEntityList)) {
if (Func.isNotEmpty(parcelLisList)){ List<DistributionReservationZeroPackageEntity> zeroPackageEntityList = new ArrayList<>();
parcelLisList.forEach(w -> { newPackageEntityList.forEach(w -> {
DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity(); DistributionReservationZeroPackageEntity zeroPackageEntity = new DistributionReservationZeroPackageEntity();
zeroPackageEntity.setParcelListId(w.getId()); zeroPackageEntity.setParcelListId(w.getId());
zeroPackageEntity.setStockArticleId(w.getStockArticleId()); zeroPackageEntity.setStockArticleId(w.getStockArticleId());
@ -1846,7 +1847,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
zeroPackageEntity.setCategoryName(w.getFirsts()); zeroPackageEntity.setCategoryName(w.getFirsts());
zeroPackageEntity.setType("3"); zeroPackageEntity.setType("3");
zeroPackageEntity.setRealityQuantity(0); zeroPackageEntity.setRealityQuantity(0);
packageEntityList.add(zeroPackageEntity); zeroPackageEntityList.add(zeroPackageEntity);
//进行零担冻结数量维护 //进行零担冻结数量维护
distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda() distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda()
.setSql("delivery_quantity = delivery_quantity +" + zeroPackageEntity.getQuantity()) .setSql("delivery_quantity = delivery_quantity +" + zeroPackageEntity.getQuantity())
@ -1854,9 +1855,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
.eq(DistributionParcelNumberEntity::getStockArticleId, zeroPackageEntity.getStockArticleId()) .eq(DistributionParcelNumberEntity::getStockArticleId, zeroPackageEntity.getStockArticleId())
); );
}); });
} if (!zeroPackageEntityList.isEmpty()) {
if (!packageEntityList.isEmpty()) { distributionZeroPackageService.saveBatch(zeroPackageEntityList);
distributionZeroPackageService.saveBatch(packageEntityList);
} else { } else {
log.warn("没有品类数据"); log.warn("没有品类数据");
return 0; return 0;
@ -3191,7 +3191,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
DistrilbutionBillLadingEntity billLadingEntity = this.getById(billLadingId); DistrilbutionBillLadingEntity billLadingEntity = this.getById(billLadingId);
// 查询订单是否已签收 // 查询订单是否已签收
List<DistributionParcelListEntity> list4 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query() List<DistributionParcelListEntity> list4 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query()
.lambda() .lambda()
@ -3388,6 +3387,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
/** /**
* 自提签收节点作业推送 * 自提签收节点作业推送
*
* @param parcelListEntity * @param parcelListEntity
* @param billLadingId * @param billLadingId
* @param singleTime * @param singleTime

Write Preview
Loading…
Cancel
Save