|
|
|
|
@ -606,7 +606,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
|
|
} |
|
|
|
|
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); |
|
|
|
|
distributionLoadscanEntity.setScanStatus(2); |
|
|
|
|
distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue()); |
|
|
|
|
distributionLoadscanEntity.setScanType("1"); |
|
|
|
|
distributionLoadscanEntity.setScanTime(new Date()); |
|
|
|
|
distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); |
|
|
|
|
@ -706,7 +706,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
// distributionAsyncService.changeOrderStatus(distrilbutionloadingscanDTO.getBarcode(),deliveryId);
|
|
|
|
|
//修改配送任务状态
|
|
|
|
|
String barcode = distrilbutionloadingscanDTO.getBarcode(); |
|
|
|
|
distributionAsyncService.changeDeliveryListStatus(barcode, deliveryId); |
|
|
|
|
DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.<DistributionDeliveryListEntity>query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId)); |
|
|
|
|
//判断配送计划是否需要进行库存品状态的变更
|
|
|
|
|
if (deliveryListEntity.getType().equals(DistributionTypeConstant.shangpei.getValue())){ |
|
|
|
|
distributionAsyncService.changeDiscussDeliveryListStatus(barcode, deliveryId); |
|
|
|
|
}else if (deliveryListEntity.getType().equals(DistributionTypeConstant.shipie.getValue())){ |
|
|
|
|
//需要判断是否依据库存品进行变更
|
|
|
|
|
distributionAsyncService.changeMarketDeliveryListStatus(barcode, deliveryId); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// this.changeDeliveryListStatuss(distrilbutionloadingscanDTO.getBarcode(), deliveryId);
|
|
|
|
|
|
|
|
|
|
return Resp.scanSuccess("成功", "成功"); |
|
|
|
|
@ -891,7 +900,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
distributionLoadscanService.save(distributionLoadscanEntity); |
|
|
|
|
Long packageId = distributionLoadscanEntity.getPackageId(); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(packageId); |
|
|
|
|
distributionAsyncService.changeDeliveryListStatus(parcelListEntity.getOrderPackageCode(),distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
//TODO 这里一件装车需要进行判断
|
|
|
|
|
distributionAsyncService.changeDiscussDeliveryListStatus(parcelListEntity.getOrderPackageCode(),distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
} |
|
|
|
|
// distributionLoadscanService.saveBatch(distributionLoadscanEntities);
|
|
|
|
|
} |
|
|
|
|
@ -942,7 +952,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
|
|
} |
|
|
|
|
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); |
|
|
|
|
distributionLoadscanEntity.setScanStatus(2); |
|
|
|
|
distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue()); |
|
|
|
|
distributionLoadscanEntity.setScanType("1"); |
|
|
|
|
distributionLoadscanEntity.setScanTime(new Date()); |
|
|
|
|
if (null == distributionLoadscanEntity.getPackageNub()) { |
|
|
|
|
@ -1126,75 +1136,85 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
public R loadinginventory(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { |
|
|
|
|
//库存品
|
|
|
|
|
//获取当前用户司机
|
|
|
|
|
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
DistributionDeliverySelfEntity distributionDeliverySelfEntity = null; |
|
|
|
|
if (distributionDeliveryListEntity.getKind().equals("1")) { |
|
|
|
|
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId()); |
|
|
|
|
} else { |
|
|
|
|
DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId()); |
|
|
|
|
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity); |
|
|
|
|
} |
|
|
|
|
boolean b = false; |
|
|
|
|
|
|
|
|
|
//根据传递进来的库存品条码进行库存品的校验
|
|
|
|
|
//获取之前的
|
|
|
|
|
String barcode = distrilbutionloadingscanDTO.getBarcode(); |
|
|
|
|
//查询是否重复扫描
|
|
|
|
|
List<DistributionLoadscaninvnEntity> distributionLoadscaninvnEntities = distributionLoadscaninvnMapper.selectList(Wrappers.<DistributionLoadscaninvnEntity>query().lambda() |
|
|
|
|
.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()) |
|
|
|
|
.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); |
|
|
|
|
if (distributionLoadscaninvnEntities.size()>0 ){ |
|
|
|
|
return R.fail("重复扫描"); |
|
|
|
|
} |
|
|
|
|
try { |
|
|
|
|
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
DistributionDeliverySelfEntity distributionDeliverySelfEntity = null; |
|
|
|
|
if (distributionDeliveryListEntity.getKind().equals("1")) { |
|
|
|
|
distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId()); |
|
|
|
|
} else { |
|
|
|
|
DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId()); |
|
|
|
|
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity); |
|
|
|
|
} |
|
|
|
|
boolean b = false; |
|
|
|
|
|
|
|
|
|
//根据传递进来的库存品条码进行库存品的校验
|
|
|
|
|
//获取之前的
|
|
|
|
|
String barcode = distrilbutionloadingscanDTO.getBarcode(); |
|
|
|
|
//查询是否重复扫描
|
|
|
|
|
List<DistributionLoadscaninvnEntity> distributionLoadscaninvnEntities = distributionLoadscaninvnMapper.selectList(Wrappers.<DistributionLoadscaninvnEntity>query().lambda() |
|
|
|
|
.eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()) |
|
|
|
|
.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); |
|
|
|
|
if (distributionLoadscaninvnEntities.size()>0 ){ |
|
|
|
|
return R.fail("重复扫描"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//这里就需要将此库存品和计划中的进行校验，如果此时无法从
|
|
|
|
|
//查询出该客户下的所有库存品包件信息
|
|
|
|
|
List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda().eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())); |
|
|
|
|
if ( list.size() < 0 ){ |
|
|
|
|
return R.fail("无效包条!!"); |
|
|
|
|
} |
|
|
|
|
//1、不存在这个客户的库存品列表中，串货
|
|
|
|
|
List<DisStockListDetailEntity> disStockListDetailEntities = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda() |
|
|
|
|
.eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) |
|
|
|
|
.eq(DisStockListDetailEntity::getStockPackageCode, distrilbutionloadingscanDTO.getBarcode())); |
|
|
|
|
if (disStockListDetailEntities.size() == 1){ |
|
|
|
|
//这里就需要插入库存品扫描信息
|
|
|
|
|
ArrayList<DistributionLoadscaninvnEntity> distributionLoadscaninvnEntityArrayList = new ArrayList<>(); |
|
|
|
|
for (int i = 0; i < disStockListDetailEntities.size(); i++) { |
|
|
|
|
//依次插入该装车记录,设置车辆
|
|
|
|
|
DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity(); |
|
|
|
|
if (null != distributionDeliverySelfEntity.getDriverId()) { |
|
|
|
|
distributionLoadscaninvnEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
|
|
} |
|
|
|
|
distributionLoadscaninvnEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); |
|
|
|
|
distributionLoadscaninvnEntity.setScanStatus(2); |
|
|
|
|
distributionLoadscaninvnEntity.setScanType("1"); |
|
|
|
|
distributionLoadscaninvnEntity.setScanTime(new Date()); |
|
|
|
|
distributionLoadscaninvnEntity.setOrderPackageCode(disStockListDetailEntities.get(i).getStockPackageCode()); |
|
|
|
|
if (null == distributionLoadscaninvnEntity.getPackageNub()) { |
|
|
|
|
distributionLoadscaninvnEntity.setPackageNub(1); |
|
|
|
|
} |
|
|
|
|
distributionLoadscaninvnEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); |
|
|
|
|
distributionLoadscaninvnEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); |
|
|
|
|
if (null != distributionDeliverySelfEntity.getDriverPhone()) { |
|
|
|
|
distributionLoadscaninvnEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); |
|
|
|
|
} |
|
|
|
|
if (null != distributionDeliverySelfEntity.getVehicleId()) { |
|
|
|
|
distributionLoadscaninvnEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); |
|
|
|
|
} |
|
|
|
|
//查询本车次是否第一次扫码,没有则更新上车时间
|
|
|
|
|
Integer a = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
//更新签收表的装车数量
|
|
|
|
|
Integer j = distributionSignforMapper.updateloadByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getPackageNub()); |
|
|
|
|
distributionLoadscaninvnEntityArrayList.add(distributionLoadscaninvnEntity); |
|
|
|
|
//这里就需要将此库存品和计划中的进行校验，如果此时无法从
|
|
|
|
|
//查询出该客户下的所有库存品包件信息
|
|
|
|
|
List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda().eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())); |
|
|
|
|
if ( list.size() < 0 ){ |
|
|
|
|
return R.fail("无效包条!!"); |
|
|
|
|
} |
|
|
|
|
//1、不存在这个客户的库存品列表中，串货
|
|
|
|
|
List<DisStockListDetailEntity> disStockListDetailEntities = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda() |
|
|
|
|
.eq(DisStockListDetailEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) |
|
|
|
|
.eq(DisStockListDetailEntity::getStockPackageCode, distrilbutionloadingscanDTO.getBarcode())); |
|
|
|
|
if (disStockListDetailEntities.size() == 1){ |
|
|
|
|
//这里就需要插入库存品扫描信息
|
|
|
|
|
ArrayList<DistributionLoadscaninvnEntity> distributionLoadscaninvnEntityArrayList = new ArrayList<>(); |
|
|
|
|
for (int i = 0; i < disStockListDetailEntities.size(); i++) { |
|
|
|
|
//依次插入该装车记录,设置车辆
|
|
|
|
|
DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity(); |
|
|
|
|
if (null != distributionDeliverySelfEntity.getDriverId()) { |
|
|
|
|
distributionLoadscaninvnEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
|
|
} |
|
|
|
|
distributionLoadscaninvnEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); |
|
|
|
|
distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue()); |
|
|
|
|
distributionLoadscaninvnEntity.setScanType("1"); |
|
|
|
|
BladeUser user = AuthUtil.getUser(); |
|
|
|
|
distributionLoadscaninvnEntity.setScanUser(user.getNickName()); |
|
|
|
|
distributionLoadscaninvnEntity.setScanTime(new Date()); |
|
|
|
|
distributionLoadscaninvnEntity.setOrderPackageCode(disStockListDetailEntities.get(i).getStockPackageCode()); |
|
|
|
|
if (null == distributionLoadscaninvnEntity.getPackageNub()) { |
|
|
|
|
distributionLoadscaninvnEntity.setPackageNub(1); |
|
|
|
|
} |
|
|
|
|
distributionLoadscaninvnEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); |
|
|
|
|
distributionLoadscaninvnEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); |
|
|
|
|
if (null != distributionDeliverySelfEntity.getDriverPhone()) { |
|
|
|
|
distributionLoadscaninvnEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); |
|
|
|
|
} |
|
|
|
|
if (null != distributionDeliverySelfEntity.getVehicleId()) { |
|
|
|
|
distributionLoadscaninvnEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); |
|
|
|
|
} |
|
|
|
|
//查询本车次是否第一次扫码,没有则更新上车时间
|
|
|
|
|
Integer a = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
//更新签收表的装车数量
|
|
|
|
|
Integer j = distributionSignforMapper.updateloadByinvn(distrilbutionloadingscanDTO.getDeliveryId(), distrilbutionloadingscanDTO.getReservationId(), distributionLoadscaninvnEntity.getPackageNub()); |
|
|
|
|
distributionLoadscaninvnEntityArrayList.add(distributionLoadscaninvnEntity); |
|
|
|
|
} |
|
|
|
|
b = distributionLoadscaninvnService.saveBatch(distributionLoadscaninvnEntityArrayList); |
|
|
|
|
|
|
|
|
|
}else { |
|
|
|
|
return R.fail("重复包条码!!"); |
|
|
|
|
}else { |
|
|
|
|
return R.fail("重复包条码!!"); |
|
|
|
|
} |
|
|
|
|
//2、不存在这个车次中无效包条码
|
|
|
|
|
//3、重复扫码
|
|
|
|
|
distributionAsyncService.changeMarketDeliveryListStatus(distrilbutionloadingscanDTO.getBarcode(),distrilbutionloadingscanDTO.getDeliveryId()); |
|
|
|
|
return R.status(b); |
|
|
|
|
|
|
|
|
|
}catch (Exception e){ |
|
|
|
|
e.printStackTrace(); |
|
|
|
|
} |
|
|
|
|
//2、不存在这个车次中无效包条码
|
|
|
|
|
//3、重复扫码
|
|
|
|
|
return null; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1253,7 +1273,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
// //TODO 库存品手动输入
|
|
|
|
|
//
|
|
|
|
|
// }
|
|
|
|
|
return R.status(b); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2315,7 +2334,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
|
|
} |
|
|
|
|
distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); |
|
|
|
|
distributionLoadscanEntity.setScanStatus(2); |
|
|
|
|
distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue()); |
|
|
|
|
distributionLoadscanEntity.setScanType("1"); |
|
|
|
|
distributionLoadscanEntity.setScanTime(new Date()); |
|
|
|
|
if (null == distributionLoadscanEntity.getPackageNub()) { |
|
|
|
|
|
kilo
2 years ago