From dc22724f61e0b792d327fa812895f6dc4fcf129d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 08 四月 2026 15:04:11 +0800
Subject: [PATCH] fix:groupBy
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 158 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 127 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 25069c3..eb416fb 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -5,18 +5,15 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockUnQualifiedRecordTypeEnum;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.impl.ProductOrderServiceImpl;
-import com.ruoyi.production.service.impl.SalesLedgerProductionAccountingServiceImpl;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.quality.mapper.QualityInspectMapper;
@@ -27,7 +24,6 @@
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
@@ -46,7 +42,10 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -175,10 +174,9 @@
}
// 鍙兘灞炰簬澶氫釜涓昏〃
- Set<Long> mainIds = deletedProducts.stream()
- .map(SalesLedgerProduct::getSalesLedgerId)
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
+ Map<Long, Integer> mainIdTypeMap = deletedProducts.stream()
+ .filter(p -> p.getSalesLedgerId() != null)
+ .collect(Collectors.toMap(SalesLedgerProduct::getSalesLedgerId, SalesLedgerProduct::getType, (existing, replacement) -> existing));
// 2. 鎵ц鍒犻櫎鎿嶄綔
int result = salesLedgerProductMapper.deleteBatchIds(Arrays.asList(ids));
@@ -186,19 +184,44 @@
deleteProductionData(Arrays.asList(ids));
// 3. 瀵规瘡涓富琛↖D杩涜閲戦鏇存柊
- for (Long salesLedgerId : mainIds) {
+ for (Map.Entry<Long, Integer> entry : mainIdTypeMap.entrySet()) {
+ Long salesLedgerId = entry.getKey();
+ Integer type = entry.getValue();
+
LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId);
+ wrapper.eq(SalesLedgerProduct::getType, type);
List<SalesLedgerProduct> remainingProducts = salesLedgerProductMapper.selectList(wrapper);
- // 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
- updateMainContractAmount(
- salesLedgerId,
- remainingProducts,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
- salesLedgerMapper,
- SalesLedger.class
- );
+ if (type == 1) {
+ SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ if (salesLedger != null) {
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = Integer.valueOf(2).equals(salesLedger.getSalesType()) ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ updateMainContractAmount(
+ salesLedgerId,
+ remainingProducts,
+ amountGetter,
+ salesLedgerMapper,
+ SalesLedger.class
+ );
+ }
+ } else {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(salesLedgerId);
+ if (purchaseLedger != null) {
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = Integer.valueOf(2).equals(purchaseLedger.getPurchaseType()) ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ updateMainContractAmount(
+ salesLedgerId,
+ remainingProducts,
+ amountGetter,
+ purchaseLedgerMapper,
+ PurchaseLedger.class
+ );
+ }
+ }
}
return result;
}
@@ -206,21 +229,86 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addOrUpdateSalesLedgerProduct(SalesLedgerProduct salesLedgerProduct) {
+ if (salesLedgerProduct.getId() != null) {
+ SalesLedgerProduct dbProduct = salesLedgerProductMapper.selectById(salesLedgerProduct.getId());
+ if (dbProduct != null) {
+ if (salesLedgerProduct.getSalesLedgerId() == null) {
+ salesLedgerProduct.setSalesLedgerId(dbProduct.getSalesLedgerId());
+ }
+ if (salesLedgerProduct.getType() == null) {
+ salesLedgerProduct.setType(dbProduct.getType());
+ }
+ if (salesLedgerProduct.getInvoiceTotal() == null) {
+ salesLedgerProduct.setInvoiceTotal(dbProduct.getInvoiceTotal());
+ }
+ if (salesLedgerProduct.getTicketsTotal() == null) {
+ salesLedgerProduct.setTicketsTotal(dbProduct.getTicketsTotal());
+ }
+ if (salesLedgerProduct.getQuantity() == null) {
+ salesLedgerProduct.setQuantity(dbProduct.getQuantity());
+ }
+ if (salesLedgerProduct.getTotalPrice() == null) {
+ salesLedgerProduct.setTotalPrice(dbProduct.getTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxInclusiveTotalPrice() == null) {
+ salesLedgerProduct.setTaxInclusiveTotalPrice(dbProduct.getTaxInclusiveTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxExclusiveTotalPrice() == null) {
+ salesLedgerProduct.setTaxExclusiveTotalPrice(dbProduct.getTaxExclusiveTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxRate() == null) {
+ salesLedgerProduct.setTaxRate(dbProduct.getTaxRate());
+ }
+ if (salesLedgerProduct.getUnitPrice() == null) {
+ salesLedgerProduct.setUnitPrice(dbProduct.getUnitPrice());
+ }
+ if (salesLedgerProduct.getFreight() == null) {
+ salesLedgerProduct.setFreight(dbProduct.getFreight());
+ }
+ if (salesLedgerProduct.getPriceWithFreight() == null) {
+ salesLedgerProduct.setPriceWithFreight(dbProduct.getPriceWithFreight());
+ }
+ }
+ }
+
+ Long salesLedgerId = salesLedgerProduct.getSalesLedgerId();
+ SalesLedger salesLedger = null;
+ PurchaseLedger purchaseLedger = null;
+ boolean isPrivate = false;
+
+ if (salesLedgerProduct.getType() != null && salesLedgerProduct.getType().equals(1)) {
+ salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ if (salesLedger != null && Integer.valueOf(2).equals(salesLedger.getSalesType())) {
+ isPrivate = true;
+ }
+ } else {
+ purchaseLedger = purchaseLedgerMapper.selectById(salesLedgerId);
+ if (purchaseLedger != null && Integer.valueOf(2).equals(purchaseLedger.getPurchaseType())) {
+ isPrivate = true;
+ }
+ }
+
+ BigDecimal totalPrice = isPrivate ?
+ (salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO) :
+ (salesLedgerProduct.getTaxInclusiveTotalPrice() != null ? salesLedgerProduct.getTaxInclusiveTotalPrice() : BigDecimal.ZERO);
+
+ BigDecimal invoiceTotal = salesLedgerProduct.getInvoiceTotal() != null ? salesLedgerProduct.getInvoiceTotal() : BigDecimal.ZERO;
+ BigDecimal ticketsTotal = salesLedgerProduct.getTicketsTotal() != null ? salesLedgerProduct.getTicketsTotal() : BigDecimal.ZERO;
+
// 寰呭洖娆撅紝浠樻
if(salesLedgerProduct.getType().equals(1)){
- salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
+ salesLedgerProduct.setPendingInvoiceTotal(totalPrice.subtract(invoiceTotal));
//鏈紑绁ㄦ暟閲�+閲戦
salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setNoInvoiceAmount(totalPrice);
}else{
- salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getTicketsTotal()));
+ salesLedgerProduct.setPendingTicketsTotal(totalPrice.subtract(ticketsTotal));
// 鏈潵绁ㄦ暟閲�+閲戦
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setFutureTicketsAmount(totalPrice);
}
int result;
- Long salesLedgerId = salesLedgerProduct.getSalesLedgerId();
if (salesLedgerProduct.getId() == null) {
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
result = salesLedgerProductMapper.insert(salesLedgerProduct);
@@ -243,12 +331,17 @@
wrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
.eq(SalesLedgerProduct::getType, salesLedgerProduct.getType());
List<SalesLedgerProduct> productList = salesLedgerProductMapper.selectList(wrapper);
+
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = isPrivate ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+
if (salesLedgerProduct.getType() == 1) {
// 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
updateMainContractAmount(
salesLedgerId,
productList,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ amountGetter,
salesLedgerMapper,
SalesLedger.class
);
@@ -257,7 +350,7 @@
updateMainContractAmount(
salesLedgerId,
productList,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ amountGetter,
purchaseLedgerMapper,
PurchaseLedger.class
);
@@ -295,7 +388,7 @@
//鏂板鐢熶骇璁㈠崟宸ヨ壓璺嚎瀛愯〃
List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
// 鐢熸垚褰撳墠鏃ユ湡鐨勫墠缂�锛氬勾鏈堟棩
- String datePrefix = "GD" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
for (ProcessRouteItem processRouteItem : processRouteItems) {
ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();
productProcessRouteItem.setProductModelId(processRouteItem.getProductModelId());
@@ -320,7 +413,7 @@
}
}
// 鐢熸垚瀹屾暣鐨勫伐鍗曞彿
- String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
+ String workOrderNoStr ="GD"+ String.format("%s%03d", datePrefix, sequenceNumber);
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
productWorkOrder.setProductOrderId(productOrder.getId());
@@ -341,6 +434,9 @@
* 鍒犻櫎鐢熶骇鏁版嵁
*/
public void deleteProductionData(List<Long> productIds) {
+ if (productIds == null || productIds.isEmpty()){
+ return;
+ }
//鎵归噺鏌ヨproductOrder
List<ProductOrder> productOrders = productOrderMapper.selectList(
new LambdaQueryWrapper<ProductOrder>()
@@ -393,9 +489,9 @@
//鍒犻櫎鍑哄簱璁板綍
for (Long productMainId : productMainIds) {
//鍒犻櫎鐢熶骇鍑哄簱璁板綍
- stockUtils.deleteStockOutRecord(productMainId, StockQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode());
+ stockUtils.deleteStockOutRecord(productMainId, StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode());
//鍒犻櫎鎶ュ簾鐨勫叆搴撹褰�
- stockUtils.deleteStockInRecord(productMainId, StockUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode());
+ stockUtils.deleteStockInRecord(productMainId, StockInUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode());
}
qualityInspects.forEach(qualityInspect -> {
//inspectState=1 宸叉彁浜� 涓嶈兘鍒犻櫎
--
Gitblit v1.9.3