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

1.修改判断

training
0.0 2 years ago
parent
c589315b47
commit
855ca8b9ea
1 changed files with 4 additions and 4 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. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -1242,7 +1242,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// if (distrilbutionloadingscanDTO.getStockType() == 1) { // if (distrilbutionloadingscanDTO.getStockType() == 1) {
//查询该包条是否属于该配送任务 //查询该包条是否属于该配送任务
List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
if (distributionLoadscanEntities.isEmpty()) { if ( null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty() ) {
return R.fail(3001, "窜货"); return R.fail(3001, "窜货");
} }
// 串货后 下面的代码执行的意义不存在 // 串货后 下面的代码执行的意义不存在
@ -1256,7 +1256,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//TODO 托盘扫描 //TODO 托盘扫描
//查询该包条是否属于该配送任务 //查询该包条是否属于该配送任务
List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverypallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectdeliverypallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
if (distributionLoadscanEntities.isEmpty()) { if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
return R.fail(3001, "窜货"); return R.fail(3001, "窜货");
} }
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@ -1273,7 +1273,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (distributionReservationStockarticleEntity.getIsHaveData() == 1) { if (distributionReservationStockarticleEntity.getIsHaveData() == 1) {
//查询订单是否属于该配送任务 //查询订单是否属于该配送任务
List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectOrderpallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); List<DistributionLoadscanEntity> distributionLoadscanEntities = baseMapper.selectOrderpallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
if (distributionLoadscanEntities.isEmpty()) { if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
return R.fail(3001, "窜货"); return R.fail(3001, "窜货");
} }
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
@ -1544,7 +1544,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()) .eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
); );
if (distributionLoadscanEntities.isEmpty()) { if (null == distributionLoadscanEntities || distributionLoadscanEntities.isEmpty()) {
return R.fail(3005, "该货物未装车"); return R.fail(3005, "该货物未装车");
} }
boolean b = false; boolean b = false;

Write Preview
Loading…
Cancel
Save