|
|
|
@ -665,6 +665,7 @@ public class VoucherController {
|
|
|
|
|
for (WarehousingStorageEntity storageEntity : warehousingStorageEntityList){
|
|
|
|
|
QueryWrapper<WarehousingStoragePoundlistEntity> pountlistQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
pountlistQueryWrapper.lambda().eq(WarehousingStoragePoundlistEntity::getWarehousingStorageId,storageEntity.getId());
|
|
|
|
|
pountlistQueryWrapper.lambda().notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),WarehousingStoragePoundlistEntity::getVoucherId,voucherPagination.getExcludeIdList());
|
|
|
|
|
List<WarehousingStoragePoundlistEntity> warehousingStoragePoundlistEntityList = warehousingStoragePoundlistService.list(pountlistQueryWrapper);
|
|
|
|
|
storagePoundlistEntityList.addAll(warehousingStoragePoundlistEntityList);
|
|
|
|
|
}
|
|
|
|
@ -687,6 +688,7 @@ public class VoucherController {
|
|
|
|
|
for (WarehousingStorageEntity warehousingStorageEntity : warehousingStorageEntityList){
|
|
|
|
|
QueryWrapper<WarehousingStoragePoundlistEntity> pountlistQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
pountlistQueryWrapper.lambda().eq(WarehousingStoragePoundlistEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
|
|
|
|
|
pountlistQueryWrapper.lambda().notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),WarehousingStoragePoundlistEntity::getVoucherId,voucherPagination.getExcludeIdList());
|
|
|
|
|
List<WarehousingStoragePoundlistEntity> warehousingStoragePoundlistEntityList = warehousingStoragePoundlistService.list(pountlistQueryWrapper);
|
|
|
|
|
storagePoundlistEntityList.addAll(warehousingStoragePoundlistEntityList);
|
|
|
|
|
}
|
|
|
|
@ -704,13 +706,19 @@ public class VoucherController {
|
|
|
|
|
product.setNetWeight(storagePoundlistEntity.getNetWeight());//净重
|
|
|
|
|
}
|
|
|
|
|
storagePoundlistEntity.setWarehousingStorageProductEntityList(productList);
|
|
|
|
|
VoucherEntity voucherEntity = voucherService.queryVoucherInfo(storagePoundlistEntity.getVoucherId());
|
|
|
|
|
storagePoundlistEntity.setDocumentType1(voucherEntity.getDocumentType1());
|
|
|
|
|
storagePoundlistEntity.setVoucherType1(voucherEntity.getVoucherType1());
|
|
|
|
|
storagePoundlistEntity.setVehicleNumber(voucherEntity.getVehicleNumber());
|
|
|
|
|
storagePoundlistEntity.setVoucherCode(voucherEntity.getVoucherCode());
|
|
|
|
|
storagePoundlistEntity.setPoundCode(voucherEntity.getPoundCode());
|
|
|
|
|
}
|
|
|
|
|
for(WarehousingStoragePoundlistEntity poundlistEntity : storagePoundlistEntityList){
|
|
|
|
|
VoucherEntity voucherEntity = voucherService.queryVoucherInfo(poundlistEntity.getVoucherId());
|
|
|
|
|
poundlistEntity.setDocumentType1(voucherEntity.getDocumentType1());
|
|
|
|
|
poundlistEntity.setVoucherType1(voucherEntity.getVoucherType1());
|
|
|
|
|
poundlistEntity.setVehicleNumber(voucherEntity.getVehicleNumber());
|
|
|
|
|
}
|
|
|
|
|
// for(WarehousingStoragePoundlistEntity poundlistEntity : storagePoundlistEntityList){
|
|
|
|
|
// VoucherEntity voucherEntity = voucherService.queryVoucherInfo(poundlistEntity.getVoucherId());
|
|
|
|
|
// poundlistEntity.setDocumentType1(voucherEntity.getDocumentType1());
|
|
|
|
|
// poundlistEntity.setVoucherType1(voucherEntity.getVoucherType1());
|
|
|
|
|
// poundlistEntity.setVehicleNumber(voucherEntity.getVehicleNumber());
|
|
|
|
|
// }
|
|
|
|
|
// List<VoucherEntity> list= voucherService.queryVoucherPopupByReturnInfo(voucherPagination);
|
|
|
|
|
// for (VoucherEntity entity : list) {
|
|
|
|
|
// if (StringUtil.isNotEmpty(entity.getProductId())){
|
|
|
|
|