|
|
|
@ -1580,59 +1580,78 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
log.warn("###########updateNumByLoadId: 配载计划数据不存在 loadId={}", loadId); |
|
|
|
log.warn("###########updateNumByLoadId: 配载计划数据不存在 loadId={}", loadId); |
|
|
|
throw new CustomerException(400, "配载计划数据不存在"); |
|
|
|
throw new CustomerException(400, "配载计划数据不存在"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
TrunklineCarsLoadEntity updateCarsLoadEntity = new TrunklineCarsLoadEntity(); |
|
|
|
|
|
|
|
updateCarsLoadEntity.setId(loadId); |
|
|
|
|
|
|
|
|
|
|
|
//计划件数
|
|
|
|
//计划件数
|
|
|
|
Integer loadPlanNum = 0; |
|
|
|
Integer loadPlanNum = 0; |
|
|
|
List<NodeNumDataVO> nodeNumDataVOS = trunklineCarsOrderService.findNodeDataByLoadId(loadId); |
|
|
|
List<NodeNumDataVO> nodeNumDataVOS = trunklineCarsOrderService.findNodeDataByLoadId(loadId); |
|
|
|
for (NodeNumDataVO nodeNumDataVO : nodeNumDataVOS) { |
|
|
|
//把nodeNumDataVOS中所有元素的planNum求和
|
|
|
|
Long loadLineId = nodeNumDataVO.getLoadLineId(); |
|
|
|
loadPlanNum = nodeNumDataVOS.stream().mapToInt(NodeNumDataVO::getPlanNum).sum(); |
|
|
|
Integer planNum = nodeNumDataVO.getPlanNum(); |
|
|
|
|
|
|
|
loadPlanNum = loadPlanNum + planNum; |
|
|
|
|
|
|
|
trunklineCarsLoadLineService.updatePlanLoadingNumberByLoadLineId(planNum, loadLineId); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
carsLoadEntity.setPlanLoadingNumber(loadPlanNum); |
|
|
|
|
|
|
|
// updateById(carsLoadEntity);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//装车 卸车数量
|
|
|
|
//把nodeNumDataVOS转化成以loadLineId为key的Map
|
|
|
|
Integer realLoadingNum = trunklineCarsLoadScanService.findNumByLoadId(loadId);//配载计划实际装车数量
|
|
|
|
Map<Long, NodeNumDataVO> nodeNumDataVOMap = nodeNumDataVOS.stream().collect(Collectors.toMap(NodeNumDataVO::getLoadLineId, Function.identity())); |
|
|
|
Integer realUnloadingNum = trunklineCarsLoadScanService.findUnloadNumByLoadId(loadId);//配载计划实际卸车数量
|
|
|
|
|
|
|
|
Integer stockCarNum = trunklineCarsLoadScanService.findStockNumByLoadId(loadId);//配载计划在车件数
|
|
|
|
|
|
|
|
Integer abnormalNum = trunklineCarsLoadScanService.findAbnormalNumByLoadId(loadId);//配载计划装车异常数量
|
|
|
|
|
|
|
|
// Integer unloadAbnormalNum = trunklineCarsUnloadLogService.findAbnormalNumByLoadId(loadId);//配载计划卸车异常数量
|
|
|
|
|
|
|
|
carsLoadEntity.setRealLoadingNumber(realLoadingNum); |
|
|
|
|
|
|
|
carsLoadEntity.setUnloadNumber(realUnloadingNum); |
|
|
|
|
|
|
|
carsLoadEntity.setStockNumber(stockCarNum); |
|
|
|
|
|
|
|
carsLoadEntity.setAbnormalNum(abnormalNum); |
|
|
|
|
|
|
|
updateById(carsLoadEntity); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
carsLoadEntity.setPlanLoadingNumber(loadPlanNum); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//查询所有的装车明细数据
|
|
|
|
|
|
|
|
List<TrunklineCarsLoadScanEntity> scanList = trunklineCarsLoadScanService.findListByLoadId(loadId); |
|
|
|
|
|
|
|
//把scanList中warehouseId不为空的num值求和 为空则用0代替
|
|
|
|
|
|
|
|
Integer realLoadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getWarehouseId())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum(); |
|
|
|
|
|
|
|
///把scanList中scanStatus不为1的unloadNum值求和 为空则用0代替
|
|
|
|
|
|
|
|
Integer realUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1")).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); |
|
|
|
|
|
|
|
Integer stockCarNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && scan.getScanStatus().equals("1")).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
updateCarsLoadEntity.setPlanLoadingNumber(loadPlanNum); |
|
|
|
|
|
|
|
updateCarsLoadEntity.setRealLoadingNumber(realLoadingNum); |
|
|
|
|
|
|
|
updateCarsLoadEntity.setUnloadNumber(realUnloadingNum); |
|
|
|
|
|
|
|
updateCarsLoadEntity.setStockNumber(stockCarNum); |
|
|
|
|
|
|
|
updateById(updateCarsLoadEntity); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//节点数据
|
|
|
|
List<TrunklineCarsLoadLineEntity> carsLoadLineList = trunklineCarsLoadLineService.findListByLoadId(loadId); |
|
|
|
List<TrunklineCarsLoadLineEntity> carsLoadLineList = trunklineCarsLoadLineService.findListByLoadId(loadId); |
|
|
|
for (TrunklineCarsLoadLineEntity carsLoadLineEntity : carsLoadLineList) { |
|
|
|
List<TrunklineCarsLoadLineEntity> updateLoadLineList = new ArrayList<>(); |
|
|
|
|
|
|
|
carsLoadLineList.forEach(carsLoadLineEntity -> { |
|
|
|
|
|
|
|
Long loadLingId = carsLoadLineEntity.getId(); |
|
|
|
Long nodeId = carsLoadLineEntity.getNodeId(); |
|
|
|
Long nodeId = carsLoadLineEntity.getNodeId(); |
|
|
|
Integer lineLoadingNum = trunklineCarsLoadScanService.findNumByLoadIdAndNodeId(loadId, nodeId);//节点实际装车数量
|
|
|
|
NodeNumDataVO nodeNumDataVO = nodeNumDataVOMap.get(loadLingId); |
|
|
|
Integer lineUnloadingNum = trunklineCarsLoadScanService.findUnloadNumByLoadIdAndNodeId(loadId, nodeId);//节点实际卸车数量
|
|
|
|
Integer planNum = nodeNumDataVO.getPlanNum(); |
|
|
|
Integer lineAbnormalNum = trunklineCarsLoadScanService.findAbnormalNumByLoadIdAndNodeId(loadId, nodeId);//节点实际装车异常数量
|
|
|
|
Integer lineRealLoadingNum = scanList.stream().filter(scan -> NumberUtil.equals(nodeId,scan.getWarehouseId())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum(); |
|
|
|
// Integer lineUnloadingAbnormalNum = trunklineCarsUnloadLogService.findAbnormalNumByLoadIdAndNodeId(loadId,nodeId);//节点实际卸车异常数量
|
|
|
|
Integer lineRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && NumberUtil.equals(nodeId,scan.getWarehouseId())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); |
|
|
|
carsLoadLineEntity.setRealLoadingNumber(lineLoadingNum); |
|
|
|
TrunklineCarsLoadLineEntity updateEntity = new TrunklineCarsLoadLineEntity(); |
|
|
|
carsLoadLineEntity.setUnloadNumber(lineUnloadingNum); |
|
|
|
updateEntity.setPlanLoadingNumber(planNum); |
|
|
|
carsLoadLineEntity.setAbnormalNum(lineAbnormalNum); |
|
|
|
updateEntity.setRealLoadingNumber(lineRealLoadingNum); |
|
|
|
trunklineCarsLoadLineService.updateById(carsLoadLineEntity); |
|
|
|
updateEntity.setUnloadNumber(lineRealUnloadingNum); |
|
|
|
|
|
|
|
updateLoadLineList.add(updateEntity); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
//查询订单上
|
|
|
|
if(CollUtil.isNotEmpty(updateLoadLineList)){ |
|
|
|
List<TrunklineCarsOrderEntity> carsOrderEntities = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId, nodeId); |
|
|
|
trunklineCarsLoadLineService.updateBatchById(updateLoadLineList); |
|
|
|
for (TrunklineCarsOrderEntity carsOrderEntity : carsOrderEntities) { |
|
|
|
} |
|
|
|
String orderCode = carsOrderEntity.getOrderCode(); |
|
|
|
|
|
|
|
String waybillNo = carsOrderEntity.getWaybillNo(); |
|
|
|
//订单数据
|
|
|
|
Integer orderLoadingNum = trunklineCarsLoadScanService.findNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(loadId, nodeId, orderCode, waybillNo);//节点实际装车数量
|
|
|
|
List<TrunklineCarsOrderEntity> carsOrderList = trunklineCarsOrderService.findListByLoadId(loadId); |
|
|
|
Integer orderUnloadingNum = trunklineCarsLoadScanService.findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(loadId, nodeId, orderCode, waybillNo);//节点实际卸车数量
|
|
|
|
List<TrunklineCarsOrderEntity> updateOrderList = new ArrayList<>(); |
|
|
|
Integer orderSignNum = trunklineCarsLoadScanService.findSignNumByLoadIdAndNodeIdAndOrderCodeAndeWaybillNo(loadId, nodeId, orderCode, waybillNo); |
|
|
|
carsOrderList.forEach(carsOrderEntity -> { |
|
|
|
// Integer orderLoadingAbnormalNum = trunklineCarsLoadScanService.findAbnormalNumByLoadIdAndNodeId(loadId,nodeId,orderCode,waybillNo);//节点实际装车异常数量
|
|
|
|
Long carsOrderId = carsOrderEntity.getId(); |
|
|
|
// Integer orderUnloadingAbnormalNum = trunklineCarsUnloadLogService.findAbnormalNumByLoadIdAndNodeId(loadId,nodeId,orderCode,waybillNo);//节点实际卸车异常数量
|
|
|
|
Long nodeId = carsOrderEntity.getNodeId(); |
|
|
|
carsOrderEntity.setRealNum(orderLoadingNum); |
|
|
|
String orderCode = carsOrderEntity.getOrderCode(); |
|
|
|
carsOrderEntity.setUnloadNum(orderUnloadingNum); |
|
|
|
String waybillNo = carsOrderEntity.getWaybillNo(); |
|
|
|
carsOrderEntity.setSignNum(orderSignNum); |
|
|
|
Integer carsOrderRealLoadingNum = scanList.stream().filter(scan -> NumberUtil.equals(nodeId,scan.getWarehouseId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum(); |
|
|
|
trunklineCarsOrderService.updateById(carsOrderEntity); |
|
|
|
Integer carsOrderRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && NumberUtil.equals(nodeId,scan.getWarehouseId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); |
|
|
|
} |
|
|
|
Integer carsOrderRealSignNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && scan.getScanStatus().equals("3") && NumberUtil.equals(nodeId,scan.getWarehouseId()) && StringUtil.equals(orderCode,scan.getOrderCode()) && StringUtil.equals(waybillNo,scan.getWaybillNo())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); |
|
|
|
|
|
|
|
TrunklineCarsOrderEntity updateCarsOrderEntity = new TrunklineCarsOrderEntity(); |
|
|
|
|
|
|
|
updateCarsOrderEntity.setId(carsOrderId); |
|
|
|
|
|
|
|
updateCarsOrderEntity.setRealNum(carsOrderRealLoadingNum); |
|
|
|
|
|
|
|
updateCarsOrderEntity.setUnloadNum(carsOrderRealUnloadingNum); |
|
|
|
|
|
|
|
updateCarsOrderEntity.setSignNum(carsOrderRealSignNum); |
|
|
|
|
|
|
|
updateOrderList.add(updateCarsOrderEntity); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(CollUtil.isNotEmpty(updateOrderList)){ |
|
|
|
|
|
|
|
trunklineCarsOrderService.updateBatchById(updateOrderList); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
log.info("#########updateNumByLoadId: 更新配载计划数量 完成"); |
|
|
|
log.info("#########updateNumByLoadId: 更新配载计划数量 完成"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
zhenghaoyu
5 months ago