From eaed2b68c6ae85f5b7c177a595f5b0b60b5fb3be Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 25 十二月 2025 18:01:42 +0800
Subject: [PATCH] yys 增加字段
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 45 ++++++++++++++++++---------------------------
1 files changed, 18 insertions(+), 27 deletions(-)
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 b8009fd..73f3071 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -22,6 +22,7 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -575,21 +576,6 @@
@Override
public IPage<CustomStorage> listPageCopyByCustom(Page page, CustomStorage customStorage) {
-// LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
-// customStorageLambdaQueryWrapper.groupBy(CustomStorage::getProductCategory, CustomStorage::getSpecificationModel,CustomStorage::getTaxInclusiveUnitPrice);
-// if(customStorage != null){
-// if(!StringUtils.isEmpty(customStorage.getSupplierName())){
-// customStorageLambdaQueryWrapper.like(CustomStorage::getSupplierName, customStorage.getSupplierName());
-// }
-// // 绛涢�夊叆搴撴椂闂�
-// if(customStorage.getInboundDate() != null){
-// customStorageLambdaQueryWrapper.eq(CustomStorage::getInboundDate, customStorage.getInboundDate());
-// }
-// if(!StringUtils.isEmpty(customStorage.getProductCategory())){
-// customStorageLambdaQueryWrapper.like(CustomStorage::getProductCategory, customStorage.getProductCategory());
-// }
-// }
-// customStorageLambdaQueryWrapper.orderByDesc(CustomStorage::getInboundDate);
IPage<CustomStorage> pageList = customStorageMapper.listPageCopyByCustom(page, customStorage);
List<CustomStorage> procurementPageDtoCopyList = pageList.getRecords();
@@ -668,9 +654,20 @@
}
@Override
- public ProcurementRecordStorage detail(ProcurementUpdateDto procurementDto) {
- if(procurementDto == null) return null;
- return procurementRecordMapper.selectById(procurementDto.getId());
+ public ProcurementPageDto detail(ProcurementUpdateDto procurementDto) {
+ ProcurementPageDto procurementPageDto = new ProcurementPageDto();
+ if(procurementDto == null) return procurementPageDto;
+ ProcurementRecordStorage procurementRecordStorage = procurementRecordMapper.selectById(procurementDto.getId());
+ if(procurementRecordStorage == null) return procurementPageDto;
+ BeanUtils.copyProperties(procurementRecordStorage, procurementPageDto);
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(procurementRecordStorage.getSalesLedgerProductId());
+ if(salesLedgerProduct != null){
+ procurementPageDto.setProductCategory(salesLedgerProduct.getProductCategory());
+ procurementPageDto.setSpecificationModel(salesLedgerProduct.getSpecificationModel());
+ procurementPageDto.setUnit(salesLedgerProduct.getUnit());
+ procurementPageDto.setTaxInclusiveUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
+ }
+ return procurementPageDto;
}
@Override
@@ -695,18 +692,12 @@
.createTime(LocalDateTime.now())
.createUser(loginUser.getUserId())
.updateTime(LocalDateTime.now())
+ .boxNum(detail.getBoxNum())
+ .cartonSpecifications(detail.getCartonSpecifications())
+ .dollarPrice(detail.getDollarPrice())
.updateUser(loginUser.getUserId())
.createBy(procurementDto.getNickName());
this.save(procurementRecordBuilder.build());
- // 鍏ュ簱鎴愬姛鍑忔帀閲囪喘鏁伴噺
-// LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
-// salesLedgerProductLambdaQueryWrapper.eq(SalesLedgerProduct::getId, detail.getId());
-// SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectOne(salesLedgerProductLambdaQueryWrapper);
-// if(salesLedgerProduct == null){
-// throw new RuntimeException("鏈壘鍒拌鍟嗗搧");
-// }
-// salesLedgerProduct.setQuantity(salesLedgerProduct.getQuantity().subtract(detail.getInboundQuantity()));
-// salesLedgerProductMapper.updateById(salesLedgerProduct);
}
return 1;
}
--
Gitblit v1.9.3