From 78c0d6c79dcd5a8e2e2f99199dbcf5504fe8687b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 24 五月 2025 15:45:56 +0800
Subject: [PATCH] 采购管理模块
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 c2bef5b..3be1a26 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -17,8 +17,10 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.mapper.ProductRecordMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
+import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
@@ -76,6 +78,8 @@
private final ProductModelMapper productModelMapper;
private final TicketRegistrationMapper ticketRegistrationMapper;
+
+ private final ProductRecordMapper productRecordMapper;
@Value("${file.upload-dir}")
private String uploadDir;
@@ -285,6 +289,23 @@
@Override
public int deletePurchaseLedgerByIds(Long[] ids) {
+ if (ids == null || ids.length == 0) {
+ throw new BaseException("璇烽�変腑鑷冲皯涓�鏉℃暟鎹�");
+ }
+ // 鎵归噺鍒犻櫎鍏宠仈鐨勯噰璐彴璐︿骇鍝�
+ LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, ids)
+ .eq(SalesLedgerProduct::getType, "2");
+ salesLedgerProductMapper.delete(queryWrapper);
+ // 鎵归噺鍒犻櫎鍏宠仈鐨勯噰璐彴璐︾殑鏉ョエ鐧昏
+ LambdaQueryWrapper<TicketRegistration> ticketRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ ticketRegistrationLambdaQueryWrapper.in(TicketRegistration::getSalesLedgerId,ids);
+ ticketRegistrationMapper.delete(ticketRegistrationLambdaQueryWrapper);
+ // 鎵归噺鍒犻櫎鍏宠仈鐨勯噰璐彴璐︾殑鏉ョエ鐧昏璁板綍
+ LambdaQueryWrapper<ProductRecord> productRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ productRecordLambdaQueryWrapper.in(ProductRecord::getPurchaseLedgerId,ids);
+ productRecordMapper.delete(productRecordLambdaQueryWrapper);
+ // 鎵归噺鍒犻櫎閲囪喘鍙拌处
return purchaseLedgerMapper.deleteBatchIds(Arrays.asList(ids));
}
@@ -355,9 +376,10 @@
productList.forEach(product -> {
product.setFutureTickets(product.getFutureTickets() != null ? product.getFutureTickets() : product.getQuantity().longValue());
product.setFutureTicketsAmount(product.getFutureTicketsAmount() != null ? product.getFutureTicketsAmount() : product.getTaxInclusiveTotalPrice());
+ product.setTicketsNum(null);
+ product.setTicketsAmount(null);
});
resultDto.setProductData(productList);
-
return resultDto;
}
@@ -381,13 +403,13 @@
public PurchaseLedgerDto getPurchaseNoById(Long id) {
PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
- BeanUtils.copyProperties(purchaseLedger,purchaseLedgerDto);
- TicketRegistration ticketRegistration = ticketRegistrationMapper.selectOne(new LambdaQueryWrapper<TicketRegistration>().eq(TicketRegistration::getPurchaseLedgerId, id));
- if (ticketRegistration != null) {
- purchaseLedgerDto.setInvoiceNumber(ticketRegistration.getInvoiceNumber());
- purchaseLedgerDto.setInvoiceAmount(ticketRegistration.getInvoiceAmount());
- purchaseLedgerDto.setTicketRegistrationId(ticketRegistration.getId());
- }
+ BeanUtils.copyProperties(purchaseLedger, purchaseLedgerDto);
+// TicketRegistration ticketRegistration = ticketRegistrationMapper.selectOne(new LambdaQueryWrapper<TicketRegistration>().eq(TicketRegistration::getPurchaseLedgerId, id));
+// if (ticketRegistration != null) {
+// purchaseLedgerDto.setInvoiceNumber(ticketRegistration.getInvoiceNumber());
+// purchaseLedgerDto.setInvoiceAmount(ticketRegistration.getInvoiceAmount());
+// purchaseLedgerDto.setTicketRegistrationId(ticketRegistration.getId());
+// }
return purchaseLedgerDto;
}
--
Gitblit v1.9.3