product-inventory-management-after.git

			@@ -437,7 +437,7 @@
			for (ProcurementPageDto dto : procurementPageDtos) {
			// 根据采购台账ID筛选对应的出库记录
			List<ProcurementRecordOut> collect1 = procurementRecords.stream()
			.filter(ProcurementRecordOut -> ProcurementRecordOut.getProcurementRecordStorageId().equals(dto.getId()))
			.filter(item -> item.getProcurementRecordStorageId().equals(dto.getId()))
			.collect(Collectors.toList());

			// 如果没有相关的出库记录，跳过该条数据
			@@ -478,20 +478,6 @@

			@Override
			public IPage<CustomStorage> listPageByCustom(Page page, CustomStorage customStorage) {
			// LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
			// if(customStorage != null){
			// if(!StringUtils.isEmpty(customStorage.getSupplierName())){
			// customStorageLambdaQueryWrapper.like(CustomStorage::getSupplierName, customStorage.getSupplierName());
			// }
			// // 筛选入库时间
			// if(customStorage.getTimeStr() != null){
			// customStorageLambdaQueryWrapper.eq(CustomStorage::getInboundDate, customStorage.getTimeStr());
			// }
			// if(!StringUtils.isEmpty(customStorage.getProductCategory())){
			// customStorageLambdaQueryWrapper.like(CustomStorage::getProductCategory, customStorage.getProductCategory());
			// }
			// }
			// customStorageLambdaQueryWrapper.orderByDesc(CustomStorage::getInboundDate);
			IPage<CustomStorage> procurementPageDtoIPage = customStorageMapper.listPageByCustom(page, customStorage);
			procurementPageDtoIPage.getRecords().forEach(item -> item.setInboundNum0(item.getInboundNum()));
			List<CustomStorage> procurementPageDtos = procurementPageDtoIPage.getRecords();

			@@ -246,6 +246,7 @@
			t3.sales_contract_no,
			t3.customer_name,
			t2.product_category,
			group_concat(t1.id) as ids,
			t1.id,
			t1.sales_ledger_product_id,
			t1.create_user,
			@@ -268,7 +269,7 @@
			from procurement_record_storage t1
			left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
			left join sales_ledger t3 on t3.id = t2.sales_ledger_id
			left join procurement_record_out t4 on t4.procurement_record_storage_id = t1.id and t1.type = 2
			left join procurement_record_out t4 on t4.procurement_record_storage_id = t1.id and t4.type = 2
			<where>
			t1.type = 2
			<if test="req.customerName != null and req.customerName != ''">

	src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -17,6 +17,7 @@
			*/
			@Data
			public class ProcurementPageDto {
			private String ids;

			private Integer id;