|
|
|
|
@ -6500,7 +6500,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
log.info("==========回显图片的值：{}", distributionSignfor); |
|
|
|
|
List<DistributionSignPrintEntity> list = iDistributionSignPrintService.list(Wrappers.<DistributionSignPrintEntity>query().lambda() |
|
|
|
|
.eq(DistributionSignPrintEntity::getReservationId, distributionSignfor.getReservationId()) |
|
|
|
|
.eq(DistributionSignPrintEntity::getIsDeleted, "0") |
|
|
|
|
); |
|
|
|
|
Map<String, List<DistributionSignPrintEntity>> collect = list.stream().collect(Collectors.groupingBy(DistributionSignPrintEntity::getType)); |
|
|
|
|
|
|
|
|
|
@ -7913,7 +7912,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
if (Func.isNotEmpty(loadingMap)) { |
|
|
|
|
//存在装车数据，进行是否签收判断
|
|
|
|
|
List<DistributionLoadscanEntity> entityList = loadingMap.get(parcelNumberDTO.getParcelListId()); |
|
|
|
|
|
|
|
|
|
if (entityList.size() == 1) { |
|
|
|
|
int sum = entityList.stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum(); |
|
|
|
|
//进行已签收数量扣减
|
|
|
|
|
distributionSignforMapper.deductionSignforPacjageNum(deliveryId,reservationId,sum); |
|
|
|
|
DistributionLoadscanEntity distributionLoadscanEntity = entityList.get(0); |
|
|
|
|
if (parcelNumberDTO.getSigningNum() > distributionReservationZeroPackageEntity.getQuantity()) { |
|
|
|
|
//存在配置要求必须装车才能进行签收
|
|
|
|
|
@ -7924,12 +7927,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
} |
|
|
|
|
int a = 0; |
|
|
|
|
if (distributionLoadscanEntity.getLoadedNub() < parcelNumberDTO.getSigningNum()) { |
|
|
|
|
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading) { |
|
|
|
|
return Resp.scanFail("装车数量少于签收数,无法签收", "装车数量少于签收数,无法签收"); |
|
|
|
|
} |
|
|
|
|
//将装车和签收进行统一数量
|
|
|
|
|
distributionLoadscanEntity.setLoadedNub(parcelNumberDTO.getSigningNum()); |
|
|
|
|
distributionLoadscanEntity.setPackageNub(parcelNumberDTO.getSigningNum()); |
|
|
|
|
a = parcelNumberDTO.getSigningNum() - distributionLoadscanEntity.getLoadedNub(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
deliveryNumber = distributionParcelNumberEntity.getDeliveryQuantity() + distributionLoadscanEntity.getReceivedQuantity() - parcelNumberDTO.getSigningNum(); |
|
|
|
|
handQuantity = distributionParcelNumberEntity.getHandQuantity() + distributionLoadscanEntity.getReceivedQuantity() - parcelNumberDTO.getSigningNum(); |
|
|
|
|
outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity() - distributionLoadscanEntity.getReceivedQuantity() + parcelNumberDTO.getSigningNum(); |
|
|
|
|
@ -7948,6 +7953,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
receivedQuantity += parcelNumberDTO.getSigningNum(); |
|
|
|
|
//进行签收数量的统计
|
|
|
|
|
distributionLoadscanService.updateById(distributionLoadscanEntity); |
|
|
|
|
distributionSignforMapper.updateSignforNum(deliveryId,reservationId,distributionLoadscanEntity.getReceivedQuantity()); |
|
|
|
|
pushList.add(distributionLoadscanEntity); |
|
|
|
|
JSONObject jsonObject = new JSONObject(); |
|
|
|
|
jsonObject.put("code", zeroParcelListEntity.getOrderCode()); |
|
|
|
|
@ -7963,7 +7969,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
} else { |
|
|
|
|
//存在配置要求必须装车才能进行签收
|
|
|
|
|
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading) { |
|
|
|
|
return Resp.scanFail("包件未装车,无法签收", "包件未装车,无法签收"); |
|
|
|
|
return Resp.scanFail("零担未装车,无法签收", "零担未装车,无法签收"); |
|
|
|
|
} |
|
|
|
|
//签收装车数据一起进行补录
|
|
|
|
|
DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); |
|
|
|
|
@ -8007,6 +8013,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
loadscanEntity.setOneQclick(2); |
|
|
|
|
loadscanEntity.setSigningTime(now); |
|
|
|
|
distributionLoadscanService.save(loadscanEntity); |
|
|
|
|
//维护签收数量
|
|
|
|
|
distributionSignforMapper.updateSignforNum(deliveryId,reservationId,loadscanEntity.getReceivedQuantity()); |
|
|
|
|
pushList.add(loadscanEntity); |
|
|
|
|
loadedNumber += loadscanEntity.getLoadedNub(); |
|
|
|
|
receivedQuantity += loadscanEntity.getReceivedQuantity(); |
|
|
|
|
@ -8024,6 +8032,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
jsonObject.put("remark", "签收下架"); |
|
|
|
|
jsonObjects.add(jsonObject); |
|
|
|
|
warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
//维护订单
|
|
|
|
|
if (outboundQuantity.equals(distributionParcelNumberEntity.getQuantity())) { |
|
|
|
|
@ -8453,16 +8462,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
}); |
|
|
|
|
distributionAppStockArticleVO.setDistributionParcelNumberVOS(parcelNumberVOS); |
|
|
|
|
distributionAppStockArticleVO.setSignforNub(parcelNumberVOS.stream().mapToInt(DistributionParcelNumberVO::getSigningNum).sum()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
zeroOrderList.add(distributionAppStockArticleVO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<DisStockListDetailVO> inventoryPackageList = baseMapper.selectAppDeliveryInventoryPackage(reservationId); |
|
|
|
|
if (!orderList.isEmpty()) { |
|
|
|
|
reservationAppDetailVO.setOrderList(orderList); |
|
|
|
|
@ -8472,7 +8477,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
} |
|
|
|
|
if (!inventoryPackageList.isEmpty()) { |
|
|
|
|
reservationAppDetailVO.setInventoryList(inventoryPackageList); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
return R.data(reservationAppDetailVO); |
|
|
|
|
} |
|
|
|
|
@ -8745,16 +8749,29 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
if (Objects.isNull(distributionSignfor.getReservationId())){ |
|
|
|
|
log.error(method+"参数缺失:ReservationId"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//查询签收数据
|
|
|
|
|
BasicdataWarehouseEntity warehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); |
|
|
|
|
if (Objects.isNull(warehouse)){ |
|
|
|
|
log.error(method+"查询签收信息错误reservationId:{}",distributionSignfor.getReservationId()); |
|
|
|
|
} |
|
|
|
|
Integer isStrictLoading = 0; |
|
|
|
|
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(warehouse.getId()); |
|
|
|
|
if (!Objects.isNull(warehouseConfig.getIsStrictLoading())){ |
|
|
|
|
isStrictLoading = warehouseConfig.getIsStrictLoading(); |
|
|
|
|
} |
|
|
|
|
//查询签收数据
|
|
|
|
|
DistributionSignforEntity signforEntity = baseMapper.getByReservationId(distributionSignfor.getReservationId()); |
|
|
|
|
if (Objects.isNull(signforEntity)){ |
|
|
|
|
log.error(method+"查询签收信息错误reservationId:{}",distributionSignfor.getReservationId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(signforEntity.getDeliveryId()); |
|
|
|
|
if (Objects.isNull(deliveryListEntity)){ |
|
|
|
|
log.error(method+"查询签收信息错误reservationId:{}",distributionSignfor.getReservationId()); |
|
|
|
|
} |
|
|
|
|
Map<String, List<DistributionSignPrintEntity>> prices = new HashMap<>(); |
|
|
|
|
prices = this.prices(distributionSignfor); |
|
|
|
|
if (deliveryListEntity.getKind().equals("1")) { |
|
|
|
|
BladeUser user = AuthUtil.getUser(); |
|
|
|
|
Boolean driver = distributionDeliveryListService.judgeIsDriver(user); |
|
|
|
|
@ -8765,12 +8782,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
if (deliverySelfEntity == null){ |
|
|
|
|
return Resp.scanFail("当前人无操作权限","当前人无操作权限"); |
|
|
|
|
} |
|
|
|
|
prices = this.getPricesByDriver(distributionSignfor,deliverySelfEntity); |
|
|
|
|
|
|
|
|
|
}else { |
|
|
|
|
prices = this.prices(distributionSignfor); |
|
|
|
|
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading){ |
|
|
|
|
prices = this.getPricesByDriver(distributionSignfor,deliverySelfEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
DistributionSignforEntity one1 = this.getOne(Wrappers.<DistributionSignforEntity>query().lambda() |
|
|
|
|
.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) |
|
|
|
|
); |
|
|
|
|
|
