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

备货扫描BUG修复

pre-production
汤建军 2 months ago
parent
1d16512727
commit
05830a941d
2 changed files with 19 additions and 8 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. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
  2. 23
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

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

@ -2015,7 +2015,7 @@
ldsa.waybill_number AS waybillNumber,
ldsa.order_code AS orderCode,
GROUP_CONCAT( ldrp.category_name ) AS categoryName,
ldrs.reservation_num AS planNum,
ldrp.quantity AS planNum,
(
SELECT
IFNULL(SUM(lds.stock_quantity) ,0)
@ -2024,6 +2024,7 @@
WHERE
lds.reservation_id = ldrs.reservation_id
AND lds.stock_article = ldrs.stock_article_id
AND lds.parcel_list_id = ldrp.parcel_list_id
AND lds.cancel_status != 1
AND lds.is_deleted = 0
) AS scanNum
@ -2060,6 +2061,7 @@
WHERE
lds.reservation_id = ldbs.bill_lading_id
AND lds.stock_article = ldbs.stock_article_id
AND lds.parcel_list_id = ldrp.parcel_list_id
AND lds.cancel_status != 1
AND lds.is_deleted = 0
) AS scanNum

23
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
Unescape View File

@ -4613,7 +4613,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
}
if (!stockUpZeroOrderDetailVOList.isEmpty()) {
//进行订单筛选
List<DistributionAppStockUpZeroOrderDetailVO> collect = stockUpZeroOrderDetailVOList.stream().filter(f -> f.getOrderId().equals(orderId)).collect(Collectors.toList());
List<DistributionAppStockUpZeroOrderDetailVO> collect = stockUpZeroOrderDetailVOList.stream().filter(f -> f.getOrderId().equals(orderId) && f.getPackageId().equals(packageId)).collect(Collectors.toList());
if (collect.size() == 1) {
//进行备货扫描记录
//校验此次备货是否合法
@ -4737,7 +4737,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanFail("请选择采集方式备货","请选择采集方式备货");
}
if (ObjectUtils.isNotNull(one) && "1".equals(one.getCodeStatus())) {
return Resp.scanSuccess(PdaAudioLingoStatus.baotiaomayishiyong.getName(), PdaAudioLingoStatus.baotiaomayishiyong.getName());
return Resp.scanFail(PdaAudioLingoStatus.baotiaomayishiyong.getName(), PdaAudioLingoStatus.baotiaomayishiyong.getName());
}
//查询计划是否正常
DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
@ -4808,9 +4808,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
distributionReservationService.maintenanceStockListStockup(reservationId, distributionStockListEntity.getId(), myCurrentWarehouse.getId());
if (!stockListId.equals(distributionStockListEntity.getId())){
//对原计划进行减少
DistributionReservationStocklistEntity planStocklistEntity = reservationStocklistEntities.stream().filter(r -> Objects.equals(r.getReservationNum(), r.getRealityNum())).collect(Collectors.toList()).get(0);
DistributionReservationStocklistEntity planStocklistEntity = reservationStocklistEntities.stream().filter(r -> !Objects.equals(r.getReservationNum(), r.getRealityNum())).collect(Collectors.toList()).get(0);
planStocklistEntity.setReservationNum(planStocklistEntity.getReservationNum() - 1);
distributionReservationStocklistService.updateById(planStocklistEntity);
distributionStockListMapper.decreaseStockListQuantityOccupied(stockListId, disStockListDetailEntity.getNum());
distributionStockListMapper.updateInventoryQuantityOccupied(distributionStockListEntity.getId(), 1);
}
}
} else {
@ -4825,13 +4828,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
disStockListDetailEntity.setStockPackageCode(one.getCode());
disStockListDetailEntity.setStockType(InventoryStockTypeStatusConstant.shengcheng.getValue());
disStockListDetailEntity.setStockListId(distributionStockListEntity.getId());
distributionStockListService.updateById(distributionStockListEntity);
disStockListDetailService.updateById(disStockListDetailEntity);
distributionStockListMapper.updateInventoryQuantityOccupied(disStockListDetailEntity.getStockListId(), disStockListDetailEntity.getNum());
distributionStockListMapper.decreaseStockListQuantityOccupied(stockListId, num);
//维护原计划
distributionReservationService.maintenanceStockListStockup(reservationId, stockListId, myCurrentWarehouse.getId());
//对原计划进行减少
DistributionReservationStocklistEntity planStocklistEntity = reservationStocklistEntities.stream().filter(r -> Objects.equals(r.getReservationNum(), r.getRealityNum())).collect(Collectors.toList()).get(0);
DistributionReservationStocklistEntity planStocklistEntity = reservationStocklistEntities.stream().filter(r -> !Objects.equals(r.getReservationNum(), r.getRealityNum())).collect(Collectors.toList()).get(0);
planStocklistEntity.setReservationNum(planStocklistEntity.getReservationNum() - 1);
distributionReservationStocklistService.updateById(planStocklistEntity);
}
@ -4984,6 +4987,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
DistributionReservationStocklistEntity planStocklistEntity = reservationStocklistEntities.stream().filter(r -> Objects.equals(r.getReservationNum(), r.getRealityNum())).collect(Collectors.toList()).get(0);
planStocklistEntity.setReservationNum(planStocklistEntity.getReservationNum() - 1);
distributionReservationStocklistService.updateById(planStocklistEntity);
distributionStockListMapper.decreaseStockListQuantityOccupied(stockListId, 1);
distributionStockListMapper.updateInventoryQuantityOccupied(distributionStockListEntity.getId(), 1);
}
}
} else {
@ -5121,7 +5126,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
List<DistributionAppStockUpZeroOrderDetailVO> stockUpZeroOrderDetailVOList = baseMapper.selectBillZeroOrder(reservationId);
if (!stockUpZeroOrderDetailVOList.isEmpty()) {
//进行订单筛选
List<DistributionAppStockUpZeroOrderDetailVO> collect = stockUpZeroOrderDetailVOList.stream().filter(f -> f.getOrderId().equals(orderId)).collect(Collectors.toList());
List<DistributionAppStockUpZeroOrderDetailVO> collect = stockUpZeroOrderDetailVOList.stream().filter(f -> f.getOrderId().equals(orderId) && f.getPackageId().equals(packageId)).collect(Collectors.toList());
if (collect.size() == 1) {
//进行备货扫描记录
//校验此次备货是否合法
@ -5885,7 +5890,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanFail("请选择采集方式备货","请选择采集方式备货");
}
if (ObjectUtils.isNotNull(one) && "1".equals(one.getCodeStatus())) {
return Resp.scanSuccess(PdaAudioLingoStatus.baotiaomayishiyong.getName(), PdaAudioLingoStatus.baotiaomayishiyong.getName());
return Resp.scanFail(PdaAudioLingoStatus.baotiaomayishiyong.getName(), PdaAudioLingoStatus.baotiaomayishiyong.getName());
}
//查询计划是否正常
DistrilbutionBillLadingEntity billLadingEntity = distrilbutionBillLadingService.getById(reservationId);
@ -5959,6 +5964,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
DistributionDeliveryDetailsEntity deliveryDetails = distributionDeliveryDetailsEntities.stream().filter(f -> !Objects.equals(f.getQuantity(), f.getRealityQuantity())).collect(Collectors.toList()).get(0);
deliveryDetails.setQuantity(deliveryDetails.getQuantity() - 1);
distributionDeliveryDetailsService.updateById(deliveryDetails);
distributionStockListMapper.decreaseStockListQuantityOccupied(stockListId, 1);
distributionStockListMapper.updateInventoryQuantityOccupied(distributionStockListEntity.getId(), 1);
}
}
} else {
@ -6124,6 +6131,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
DistributionDeliveryDetailsEntity deliveryDetails = distributionDeliveryDetailsEntities.stream().filter(f -> !Objects.equals(f.getQuantity(), f.getRealityQuantity())).collect(Collectors.toList()).get(0);
deliveryDetails.setQuantity(deliveryDetails.getQuantity() - 1);
distributionDeliveryDetailsService.updateById(deliveryDetails);
distributionStockListMapper.decreaseStockListQuantityOccupied(oldStockListId, 1);
distributionStockListMapper.updateInventoryQuantityOccupied(distributionStockListEntity.getId(), 1);
}
}
} else {

Write Preview
Loading…
Cancel
Save