|
|
|
|
@ -105,6 +105,8 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
|
|
|
|
|
trunklineBillladingEntity.setLineNameTitle(lineTitle); |
|
|
|
|
updateById(trunklineBillladingEntity); |
|
|
|
|
|
|
|
|
|
List<TrunklineBillladingWaybillEntity> saveBillladingWaybillList = new ArrayList<>(); |
|
|
|
|
Map<Long, Integer> waybillBillladingNumMap = new HashMap<>(); |
|
|
|
|
//保存提货运单
|
|
|
|
|
List<TrunklineBillladingWaybillVO> billladingWaybillList = billladingDTO.getBillladingWaybillList(); |
|
|
|
|
for (TrunklineBillladingWaybillVO billladingWaybillVO:billladingWaybillList){ |
|
|
|
|
@ -117,12 +119,28 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
|
|
|
|
|
billladingWaybillEntity.setRealVolume(BigDecimal.ZERO); |
|
|
|
|
billladingWaybillEntity.setBillladingFee(BigDecimal.ZERO); |
|
|
|
|
billladingWaybillEntity.setPlanNum(billladingWaybillVO.getPlanNum()); |
|
|
|
|
billladingWaybillService.save(billladingWaybillEntity); |
|
|
|
|
saveBillladingWaybillList.add(billladingWaybillEntity); |
|
|
|
|
waybillBillladingNumMap.put(billladingWaybillVO.getWaybillId(),billladingWaybillVO.getPlanNum()); |
|
|
|
|
} |
|
|
|
|
billladingWaybillService.saveBatch(saveBillladingWaybillList); |
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
Set<Long> waybillIds = waybillBillladingNumMap.keySet(); |
|
|
|
|
|
|
|
|
|
List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIds)); |
|
|
|
|
waybillEntityList.forEach(waybillEntity -> { |
|
|
|
|
Long waybillEntityId = waybillEntity.getId(); |
|
|
|
|
Integer planNum = waybillBillladingNumMap.get(waybillEntityId); |
|
|
|
|
if(Objects.isNull(planNum)){ |
|
|
|
|
planNum = 0; |
|
|
|
|
} |
|
|
|
|
Integer billladingNum = waybillEntity.getBillladingNum(); |
|
|
|
|
if(Objects.isNull(billladingNum)){ |
|
|
|
|
billladingNum = 0; |
|
|
|
|
} |
|
|
|
|
waybillEntity.setBillladingNum(billladingNum+planNum); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
warehouseWaybillClient.updateList(waybillEntityList); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TrunklineBillladingLogEntity logEntity = new TrunklineBillladingLogEntity(); |
|
|
|
|
@ -205,18 +223,42 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
|
|
|
|
|
billladingEntity.setLineNameTitle(lineTitle); |
|
|
|
|
updateById(billladingEntity); |
|
|
|
|
|
|
|
|
|
Map<Long,Integer> oldWaybillBillladingNumMap = new HashMap<>(); |
|
|
|
|
List<TrunklineBillladingWaybillVO> billladingWaybillVOList = billladingWaybillService.findWaybillInfoListByBillladingId(billladingId); |
|
|
|
|
billladingWaybillVOList.forEach(billladingWaybillVO -> { |
|
|
|
|
oldWaybillBillladingNumMap.put(billladingWaybillVO.getWaybillId(),billladingWaybillVO.getPlanNum()); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
Set<Long> oldWaybillIdSet = oldWaybillBillladingNumMap.keySet(); |
|
|
|
|
|
|
|
|
|
List<WarehouseWaybillEntity> oldWaybillList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(oldWaybillIdSet)); |
|
|
|
|
oldWaybillList.forEach(waybillEntity -> { |
|
|
|
|
Long waybillEntityId = waybillEntity.getId(); |
|
|
|
|
Integer planNum = oldWaybillBillladingNumMap.get(waybillEntityId); |
|
|
|
|
if(Objects.isNull(planNum)){ |
|
|
|
|
planNum = 0; |
|
|
|
|
} |
|
|
|
|
Integer billladingNum = waybillEntity.getBillladingNum(); |
|
|
|
|
if(Objects.isNull(billladingNum)){ |
|
|
|
|
billladingNum = 0; |
|
|
|
|
} |
|
|
|
|
waybillEntity.setBillladingNum(Math.max(billladingNum - planNum, 0)); |
|
|
|
|
}); |
|
|
|
|
warehouseWaybillClient.updateList(oldWaybillList); |
|
|
|
|
|
|
|
|
|
//先删除所有对应的运单
|
|
|
|
|
billladingWaybillService.deletedByBillladingId(billladingId); |
|
|
|
|
|
|
|
|
|
Map<Long,Integer> newWaybillBillladingNumMap = new HashMap<>(); |
|
|
|
|
//保存提货运单
|
|
|
|
|
List<TrunklineBillladingWaybillVO> billladingWaybillList = billladingDTO.getBillladingWaybillList(); |
|
|
|
|
for (TrunklineBillladingWaybillVO billladingWaybillVO:billladingWaybillList){ |
|
|
|
|
String waybillNo = billladingWaybillVO.getWaybillNo(); |
|
|
|
|
Integer planNum = billladingWaybillVO.getPlanNum(); |
|
|
|
|
//查询运单以前是否挂在当前提货单下
|
|
|
|
|
TrunklineBillladingWaybillEntity one = billladingWaybillService.getOneByBillladingIdAndWaybillNo(billladingId,waybillNo); |
|
|
|
|
if(!Objects.isNull(one)){ |
|
|
|
|
billladingWaybillService.updateByBillladingIdAndWaybillNo(billladingId,waybillNo); |
|
|
|
|
billladingWaybillService.updateByBillladingIdAndWaybillNo(billladingId,waybillNo,planNum); |
|
|
|
|
}else{ |
|
|
|
|
TrunklineBillladingWaybillEntity billladingWaybillEntity = new TrunklineBillladingWaybillEntity(); |
|
|
|
|
BeanUtil.copy(billladingWaybillVO,billladingWaybillEntity); |
|
|
|
|
@ -228,8 +270,25 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
|
|
|
|
|
billladingWaybillEntity.setBillladingFee(BigDecimal.ZERO); |
|
|
|
|
billladingWaybillService.save(billladingWaybillEntity); |
|
|
|
|
} |
|
|
|
|
newWaybillBillladingNumMap.put(billladingWaybillVO.getWaybillId(),billladingWaybillVO.getPlanNum()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Set<Long> newWaybillIdSet = newWaybillBillladingNumMap.keySet(); |
|
|
|
|
List<WarehouseWaybillEntity> newWaybillList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(newWaybillIdSet)); |
|
|
|
|
newWaybillList.forEach(waybillEntity -> { |
|
|
|
|
Long waybillEntityId = waybillEntity.getId(); |
|
|
|
|
Integer planNum = newWaybillBillladingNumMap.get(waybillEntityId); |
|
|
|
|
if(Objects.isNull(planNum)){ |
|
|
|
|
planNum = 0; |
|
|
|
|
} |
|
|
|
|
Integer billladingNum = waybillEntity.getBillladingNum(); |
|
|
|
|
if(Objects.isNull(billladingNum)){ |
|
|
|
|
billladingNum = 0; |
|
|
|
|
} |
|
|
|
|
waybillEntity.setBillladingNum(billladingNum + planNum); |
|
|
|
|
}); |
|
|
|
|
warehouseWaybillClient.updateList(newWaybillList); |
|
|
|
|
|
|
|
|
|
logEntity.setAfterOpreation(JSON.toJSONString(billladingEntity)); |
|
|
|
|
trunklineBillladingLogService.save(logEntity); |
|
|
|
|
|
|
|
|
|
@ -364,6 +423,28 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
|
|
|
|
|
billladingEntity.setSettlementId(AuthUtil.getUserId()); |
|
|
|
|
billladingEntity.setSettlementName(AuthUtil.getUserName()); |
|
|
|
|
stringBuffer.append(",提货完成变更为已结算,时间").append(CommonUtil.dateToString(date)).append(",变更人").append(AuthUtil.getUserName()); |
|
|
|
|
|
|
|
|
|
List<TrunklineBillladingWaybillEntity> billladingWaybillEntities = billladingWaybillService.findNoFinishWaybillByBillladingId(billladingId); |
|
|
|
|
Map<Long,Integer> map = new HashMap<>(); |
|
|
|
|
billladingWaybillEntities.forEach(billladingWaybillEntity -> { |
|
|
|
|
map.put(billladingWaybillEntity.getWaybillId(),billladingWaybillEntity.getPlanNum() - billladingWaybillEntity.getRealNum()); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
Set<Long> waybillIdSet = map.keySet(); |
|
|
|
|
List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findListByWaybillIds(new ArrayList<>(waybillIdSet)); |
|
|
|
|
waybillEntityList.forEach(waybillEntity -> { |
|
|
|
|
Integer integer = map.get(waybillEntity.getId()); |
|
|
|
|
if(Objects.isNull(integer)){ |
|
|
|
|
integer = 0; |
|
|
|
|
} |
|
|
|
|
Integer billladingNum = waybillEntity.getBillladingNum(); |
|
|
|
|
if(Objects.isNull(billladingNum)){ |
|
|
|
|
billladingNum = 0; |
|
|
|
|
} |
|
|
|
|
waybillEntity.setBillladingNum(Math.max(billladingNum - integer, 0)); |
|
|
|
|
}); |
|
|
|
|
warehouseWaybillClient.updateList(waybillEntityList); |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
log.warn("##################updateBillladingStatus: 提货单不能更新为已结算 billladingStatus={}", billladingStatus); |
|
|
|
|
throw new CustomerException(405, "提货单不能更新为提货中"); |
|
|
|
|
@ -371,16 +452,16 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
|
|
|
|
|
break; |
|
|
|
|
case 5: |
|
|
|
|
//取消结算
|
|
|
|
|
if ("4".equals(billladingStatus)) { |
|
|
|
|
billladingEntity.setBillladingStatus("3"); |
|
|
|
|
billladingEntity.setSettlementTime(null); |
|
|
|
|
billladingEntity.setSettlementId(null); |
|
|
|
|
billladingEntity.setSettlementName(null); |
|
|
|
|
stringBuffer.append(",已结算变更为提货完成,时间").append(CommonUtil.dateToString(new Date())).append(",变更人").append(AuthUtil.getUserName()); |
|
|
|
|
} else { |
|
|
|
|
log.warn("##################updateBillladingStatus: 提货单不能更新为提货完成 billladingStatus={}", billladingStatus); |
|
|
|
|
throw new CustomerException(405, "提货单不能更新为提货完成"); |
|
|
|
|
} |
|
|
|
|
// if ("4".equals(billladingStatus)) {
|
|
|
|
|
// billladingEntity.setBillladingStatus("3");
|
|
|
|
|
// billladingEntity.setSettlementTime(null);
|
|
|
|
|
// billladingEntity.setSettlementId(null);
|
|
|
|
|
// billladingEntity.setSettlementName(null);
|
|
|
|
|
// stringBuffer.append(",已结算变更为提货完成,时间").append(CommonUtil.dateToString(new Date())).append(",变更人").append(AuthUtil.getUserName());
|
|
|
|
|
// } else {
|
|
|
|
|
// log.warn("##################updateBillladingStatus: 提货单不能更新为提货完成 billladingStatus={}", billladingStatus);
|
|
|
|
|
// throw new CustomerException(405, "提货单不能更新为提货完成");
|
|
|
|
|
// }
|
|
|
|
|
break; |
|
|
|
|
case 6: |
|
|
|
|
//取消提货
|
|
|
|
|
@ -461,55 +542,64 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
|
|
|
|
|
TrunklineBillladingWaybillEntity billladingWaybillEntity = billladingWaybillService.getById(billladingWaybillId); |
|
|
|
|
Long waybillId = billladingWaybillEntity.getWaybillId(); |
|
|
|
|
String waybillNo = billladingWaybillEntity.getWaybillNo(); |
|
|
|
|
Integer planNum = billladingWaybillEntity.getPlanNum(); |
|
|
|
|
Integer realNum = billladingWaybillEntity.getRealNum(); |
|
|
|
|
BigDecimal realWeight = billladingWaybillEntity.getRealWeight(); |
|
|
|
|
BigDecimal realVolume = billladingWaybillEntity.getRealVolume(); |
|
|
|
|
|
|
|
|
|
Integer enterNum = billladingWaybillDTO.getEnterNum(); |
|
|
|
|
BigDecimal enterWeight = billladingWaybillDTO.getEnterWeight(); |
|
|
|
|
BigDecimal enterVolume = billladingWaybillDTO.getEnterVolume(); |
|
|
|
|
|
|
|
|
|
Integer tNum = billladingWaybillService.getFinishNumByWaybillIdNotBillladingWaybillId(waybillId,billladingWaybillId); |
|
|
|
|
// Integer tNum = billladingWaybillService.getFinishNumByWaybillIdNotBillladingWaybillId(waybillId,billladingWaybillId);
|
|
|
|
|
|
|
|
|
|
//这个运单总件数不应该查询运单上的总件数，应该取统计运单下暂存单的包件数量，因为运单可能会涉及到改单 总数会变
|
|
|
|
|
|
|
|
|
|
Integer totalCount = trunklineWaybillOrderService.getOrderPackageNumByWaybillId(waybillId); |
|
|
|
|
// Integer totalCount = trunklineWaybillOrderService.getOrderPackageNumByWaybillId(waybillId);
|
|
|
|
|
|
|
|
|
|
Integer enterNum = billladingWaybillDTO.getEnterNum(); |
|
|
|
|
if(tNum+enterNum > totalCount){ |
|
|
|
|
log.warn("###############updateBillladingWaybillNum: 运单提货数量已经大于总数 waybillId={} totalCount={}",waybillId,totalCount); |
|
|
|
|
throw new CustomerException(405,"【"+waybillNo+"】运单提货数量已经大于总数"); |
|
|
|
|
if(enterNum > planNum){ |
|
|
|
|
log.warn("###############updateBillladingWaybillNum: 运单提货数量已经大于计划数 waybillId={} planNum={}",waybillId,planNum); |
|
|
|
|
throw new CustomerException(405,"【"+waybillNo+"】运单提货数量已经大于计划数"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
BigDecimal enterWeight = billladingWaybillDTO.getEnterWeight(); |
|
|
|
|
BigDecimal enterVolume = billladingWaybillDTO.getEnterVolume(); |
|
|
|
|
|
|
|
|
|
stockNum = stockNum + enterNum; |
|
|
|
|
stockWeight = stockWeight.add(enterWeight); |
|
|
|
|
stockVolume = stockVolume.add(enterVolume); |
|
|
|
|
billladingWaybillService.updateDataByBillladingWaybillId(billladingWaybillId,enterNum,enterWeight,enterVolume); |
|
|
|
|
|
|
|
|
|
WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); |
|
|
|
|
waybillEntity.setStockCount(enterNum); |
|
|
|
|
waybillEntity.setStockWeight(enterWeight); |
|
|
|
|
waybillEntity.setStockVolume(enterVolume); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(totalCount.equals(enterNum)){ |
|
|
|
|
waybillEntity.setWaybillStatus("10"); |
|
|
|
|
try{ |
|
|
|
|
TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity(); |
|
|
|
|
waybillTrackEntity.setWarehouseId(billladingEntity.getWarehouseId()); |
|
|
|
|
waybillTrackEntity.setWarehouseName(billladingEntity.getWarehouseName()); |
|
|
|
|
waybillTrackEntity.setWaybillId(waybillId); |
|
|
|
|
waybillTrackEntity.setWaybillNo(waybillNo); |
|
|
|
|
waybillTrackEntity.setTrackType("20"); |
|
|
|
|
waybillTrackEntity.setRefer("已入库"); |
|
|
|
|
waybillTrackEntity.setOperationRemark("运单入库："+enterNum+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(new Date())); |
|
|
|
|
trunklineWaybillTrackService.save(waybillTrackEntity); |
|
|
|
|
}catch (Exception e){ |
|
|
|
|
log.warn("#################updateBillladingWaybillNum: 存入日志失败"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
warehouseWaybillClient.updateEntity(waybillEntity); |
|
|
|
|
// Integer diffNum = enterNum-realNum;
|
|
|
|
|
// BigDecimal diffWeight = realWeight.subtract(enterWeight);
|
|
|
|
|
// BigDecimal diffVolume = realVolume.subtract(enterVolume);
|
|
|
|
|
|
|
|
|
|
// WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
|
|
|
|
|
// waybillEntity.setStockCount(Math.max(waybillEntity.getStockCount() + diffNum, 0));
|
|
|
|
|
// waybillEntity.setStockWeight(waybillEntity.getStockWeight().add(diffWeight).compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : diffWeight);
|
|
|
|
|
// waybillEntity.setStockVolume(waybillEntity.getStockVolume().add(diffVolume).compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : diffVolume);
|
|
|
|
|
|
|
|
|
|
// Integer totalCount = waybillEntity.getTotalCount();
|
|
|
|
|
// Integer stockCount = waybillEntity.getStockCount();
|
|
|
|
|
|
|
|
|
|
// if(totalCount.equals(stockCount)){
|
|
|
|
|
// waybillEntity.setWaybillStatus("10");
|
|
|
|
|
// try{
|
|
|
|
|
// TrunklineWaybillTrackEntity waybillTrackEntity = new TrunklineWaybillTrackEntity();
|
|
|
|
|
// waybillTrackEntity.setWarehouseId(billladingEntity.getWarehouseId());
|
|
|
|
|
// waybillTrackEntity.setWarehouseName(billladingEntity.getWarehouseName());
|
|
|
|
|
// waybillTrackEntity.setWaybillId(waybillId);
|
|
|
|
|
// waybillTrackEntity.setWaybillNo(waybillNo);
|
|
|
|
|
// waybillTrackEntity.setTrackType("20");
|
|
|
|
|
// waybillTrackEntity.setRefer("已入库");
|
|
|
|
|
// waybillTrackEntity.setOperationRemark("运单入库："+enterNum+"/"+totalCount+",入库类型：【批量入库】,入库时间："+ CommonUtil.dateToString(new Date()));
|
|
|
|
|
// trunklineWaybillTrackService.save(waybillTrackEntity);
|
|
|
|
|
// }catch (Exception e){
|
|
|
|
|
// log.warn("#################updateBillladingWaybillNum: 存入日志失败");
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// warehouseWaybillClient.updateEntity(waybillEntity);
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
billladingEntity.setRealNum(stockNum); |
|
|
|
|
billladingEntity.setRealWeight(stockWeight); |
|
|
|
|
billladingEntity.setRealVolume(stockVolume); |
|
|
|
|
TrunklineBillladingNumVO numVO = billladingWaybillService.getNumVOByBillladingId(billladingId); |
|
|
|
|
|
|
|
|
|
billladingEntity.setRealNum(numVO.getNum()); |
|
|
|
|
billladingEntity.setRealWeight(numVO.getWeight()); |
|
|
|
|
billladingEntity.setRealVolume(numVO.getVolume()); |
|
|
|
|
updateById(billladingEntity); |
|
|
|
|
|
|
|
|
|
billladingWaybillService.updateBillladingFeeByBillladingId(billladingEntity); |
|
|
|
|
|
zhenghaoyu
10 months ago