|
|
|
@ -2266,19 +2266,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
trunklineWaybillPackageService.updateBatchById(trunklineWaybillPackageEntities); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if(CollUtil.isNotEmpty(noArriveWarehousePackageCode)){ |
|
|
|
|
QueryWrapper<TrunklineWaybillPackageEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
queryWrapper.in("order_package_code",noArriveWarehousePackageCode) |
|
|
|
|
.eq("is_deleted",0); |
|
|
|
|
List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities = trunklineWaybillPackageService.list(queryWrapper); |
|
|
|
|
if(!trunklineWaybillPackageEntities.isEmpty()){ |
|
|
|
|
for (TrunklineWaybillPackageEntity trunklineWaybillPackageEntity : trunklineWaybillPackageEntities) { |
|
|
|
|
trunklineWaybillPackageEntity.setPackageStatus(WorkNodeEnums.INITIAL_WAREHOUSE_DEPART.getCode()); |
|
|
|
|
} |
|
|
|
|
trunklineWaybillPackageService.updateBatchById(trunklineWaybillPackageEntities); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
trunklineWaybillPackageService.updateWaybillStatus(waybillEntity); |
|
|
|
|
// if(CollUtil.isNotEmpty(noArriveWarehousePackageCode)){
|
|
|
|
|
// QueryWrapper<TrunklineWaybillPackageEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
// queryWrapper.in("order_package_code",noArriveWarehousePackageCode)
|
|
|
|
|
// .eq("is_deleted",0);
|
|
|
|
|
// List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities = trunklineWaybillPackageService.list(queryWrapper);
|
|
|
|
|
// if(!trunklineWaybillPackageEntities.isEmpty()){
|
|
|
|
|
// for (TrunklineWaybillPackageEntity trunklineWaybillPackageEntity : trunklineWaybillPackageEntities) {
|
|
|
|
|
// trunklineWaybillPackageEntity.setPackageStatus(WorkNodeEnums.INITIAL_WAREHOUSE_DEPART.getCode());
|
|
|
|
|
// }
|
|
|
|
|
// trunklineWaybillPackageService.updateBatchById(trunklineWaybillPackageEntities);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// trunklineWaybillPackageService.updateWaybillStatus(waybillEntity);
|
|
|
|
|
} |
|
|
|
|
openOrderAsyncService.sendUpdateWaybillFanout(waybillEntity,wayBillDetailList,advanceIds,oldConsignee); |
|
|
|
|
return R.success("改单成功"); |
|
|
|
|