From 164d1bace8b1fd0f1be79428b5b15df9c10bec72 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 10 一月 2026 10:30:36 +0800
Subject: [PATCH] yys 修改成品出库管理
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 3 ++-
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 1 +
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 16 +---------------
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 27ac770..12e4230 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -17,6 +17,7 @@
*/
@Data
public class ProcurementPageDto {
+ private String ids;
private Integer id;
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 0f13b51..efe8148 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -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();
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index dd03d4d..3c7e470 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -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 != ''">
--
Gitblit v1.9.3