From 1fd5eac12e532a9906e0c1d57676c692c68d1f32 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 20 五月 2025 17:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index db3990a..af2171e 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
+import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
@@ -65,6 +69,10 @@
private final SupplierManageMapper supplierManageMapper;
+ private final ProductMapper productMapper;
+
+ private final ProductModelMapper productModelMapper;
+
@Value("${file.upload-dir}")
private String uploadDir;
@@ -72,7 +80,7 @@
public List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger) {
LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(purchaseLedger.getPurchaseContractNumber())) {
- queryWrapper.like(PurchaseLedger::getPurchaseContractNumber,purchaseLedger.getPurchaseContractNumber());
+ queryWrapper.like(PurchaseLedger::getPurchaseContractNumber, purchaseLedger.getPurchaseContractNumber());
}
return purchaseLedgerMapper.selectList(queryWrapper);
}
@@ -81,9 +89,6 @@
public int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws IOException {
SalesLedger salesLedger = salesLedgerMapper.selectById(purchaseLedgerDto.getSalesLedgerId());
-
- //涓氬姟鍛�
- SysUser businessPerson = userMapper.selectUserById(purchaseLedgerDto.getBusinessPersonId());
if (salesLedger == null) {
throw new BaseException("閿�鍞彴璐︿笉瀛樺湪");
@@ -101,8 +106,6 @@
purchaseLedger.setSupplierName(supplierManage.getSupplierName());
purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
purchaseLedger.setRecorderName(sysUser.getNickName());
- purchaseLedger.setBusinessPersonId(purchaseLedgerDto.getBusinessPersonId());
- purchaseLedger.setBusinessPerson(businessPerson.getNickName());
purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
// 3. 鏂板鎴栨洿鏂颁富琛�
@@ -115,7 +118,7 @@
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
- handleSalesLedgerProducts(purchaseLedger.getId(), productList, purchaseLedgerDto.getType());
+ handleSalesLedgerProducts(purchaseLedger.getId(), purchaseLedgerDto.getProductId(), purchaseLedgerDto.getProductModelId(), productList, purchaseLedgerDto.getType());
}
// 5. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
@@ -126,10 +129,19 @@
return 1;
}
- private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
+ private void handleSalesLedgerProducts(Long salesLedgerId, Long productId, Long productModelId, List<SalesLedgerProduct> products, Integer type) {
+ Product pro = productMapper.selectById(productId);
+ ProductModel productModel = productModelMapper.selectById(productModelId);
+
// 鎸塈D鍒嗙粍锛屽尯鍒嗘柊澧炲拰鏇存柊鐨勮褰�
Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
- .peek(p -> p.setSalesLedgerId(salesLedgerId))
+ .peek(p -> {
+ p.setSalesLedgerId(salesLedgerId);
+ p.setProductId(productId);
+ p.setProductCategory(pro.getProductName());
+ p.setProductModelId(productModelId);
+ p.setSpecificationModel(productModel.getModel());
+ })
.collect(Collectors.partitioningBy(p -> p.getId() != null));
List<SalesLedgerProduct> updateList = partitionedProducts.get(true);
@@ -297,7 +309,6 @@
resultDto.setSalesContractNo(purchaseLedger.getSalesContractNo());
resultDto.setSupplierName(purchaseLedger.getSupplierName());
resultDto.setProjectName(purchaseLedger.getProjectName());
- resultDto.setBusinessPersonId(purchaseLedger.getBusinessPersonId());
// 鏌ヨ骞惰缃叧鑱斾骇鍝�
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
@@ -312,7 +323,7 @@
@Override
public List getPurchasesNo() {
LambdaQueryWrapper<PurchaseLedger> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(PurchaseLedger::getId, PurchaseLedger::getPurchaseContractNumber,PurchaseLedger::getSupplierId);
+ queryWrapper.select(PurchaseLedger::getId, PurchaseLedger::getPurchaseContractNumber, PurchaseLedger::getSupplierId);
// 鑾峰彇鍘熷鏌ヨ缁撴灉
List<Map<String, Object>> result = purchaseLedgerMapper.selectMaps(queryWrapper);
--
Gitblit v1.9.3