From 31995aba43c8e6f665f2f1451223fae1f5fd69f4 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 05 一月 2026 10:38:41 +0800
Subject: [PATCH] feat(production): 修改
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 205 insertions(+), 10 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 793722e..3d51cb0 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -1,15 +1,38 @@
package com.ruoyi.sales.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.production.mapper.ProcessRouteItemMapper;
+import com.ruoyi.production.mapper.ProcessRouteMapper;
+import com.ruoyi.production.mapper.ProductOrderMapper;
+import com.ruoyi.production.mapper.ProductProcessRouteItemMapper;
+import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.pojo.ProductOrder;
+import com.ruoyi.production.pojo.ProductProcessRouteItem;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
+import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
+import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
-import java.util.Arrays;
-import java.util.List;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 浜у搧淇℃伅Service涓氬姟灞傚鐞�
@@ -18,9 +41,23 @@
* @date 2025-05-08
*/
@Service
+@AllArgsConstructor
public class SalesLedgerProductServiceImpl extends ServiceImpl<SalesLedgerProductMapper, SalesLedgerProduct> implements ISalesLedgerProductService {
- @Autowired
+
private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ private SalesLedgerMapper salesLedgerMapper;
+
+ private PurchaseLedgerMapper purchaseLedgerMapper;
+
+ private ProductOrderMapper productOrderMapper;
+
+ private ProcessRouteItemMapper processRouteItemMapper;
+ private ProductProcessRouteItemMapper productProcessRouteItemMapper;
+ @Autowired
+ private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ @Autowired
+ private ProcessRouteMapper processRouteMapper;
@Override
public SalesLedgerProduct selectSalesLedgerProductById(Long id) {
@@ -30,21 +67,179 @@
@Override
public List<SalesLedgerProduct> selectSalesLedgerProductList(SalesLedgerProduct salesLedgerProduct) {
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId,salesLedgerProduct.getSalesLedgerId());
- return salesLedgerProductMapper.selectList(queryWrapper);
+ queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerProduct.getSalesLedgerId())
+ .eq(SalesLedgerProduct::getType, salesLedgerProduct.getType());
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(queryWrapper);
+ if (!CollectionUtils.isEmpty(salesLedgerProducts)) {
+ InvoiceRegistrationProductDto invoiceRegistrationProductDto = new InvoiceRegistrationProductDto();
+ invoiceRegistrationProductDto.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId().intValue());
+ List<InvoiceRegistrationProductDto> invoiceRegistrationProductDtoList = invoiceRegistrationProductMapper.invoiceRegistrationProductList(invoiceRegistrationProductDto);
+ // 缁熻寮�绁ㄧ櫥璁颁骇鍝佺殑宸插紑绁ㄦ暟/宸插紑绁ㄩ噾棰�
+ if (!CollectionUtils.isEmpty(invoiceRegistrationProductDtoList)) {
+ for (SalesLedgerProduct ledgerProduct : salesLedgerProducts) {
+ BigDecimal invoiceNum = BigDecimal.ZERO;
+ BigDecimal invoiceAmount = BigDecimal.ZERO;
+ for (InvoiceRegistrationProductDto registrationProductDto : invoiceRegistrationProductDtoList) {
+ if (ledgerProduct.getId().intValue() == registrationProductDto.getSalesLedgerProductId()) {
+ invoiceNum = invoiceNum.add(registrationProductDto.getInvoiceNum());
+ invoiceAmount = invoiceAmount.add(registrationProductDto.getInvoiceAmount());
+ }
+ }
+ ledgerProduct.setInvoiceNum(invoiceNum);
+ ledgerProduct.setInvoiceAmount(invoiceAmount);
+ }
+ }
+
+ }
+ return salesLedgerProducts;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public int deleteSalesLedgerProductByIds(Long[] ids) {
- return salesLedgerProductMapper.deleteBatchIds(Arrays.asList(ids));
+ if (ids == null || ids.length == 0) {
+ return 0;
+ }
+
+ // 1. 鍏堟煡璇㈣鍒犻櫎鐨勫瓙琛ㄨ褰曪紝鑾峰彇瀵瑰簲鐨� salesLedgerId
+ List<SalesLedgerProduct> deletedProducts = salesLedgerProductMapper.selectBatchIds(Arrays.asList(ids));
+ if (deletedProducts.isEmpty()) {
+ return 0; // 娌℃湁鍙垹闄ょ殑鏁版嵁
+ }
+
+ // 鍙兘灞炰簬澶氫釜涓昏〃锛堜絾閫氬父涓�涓帴鍙e彧澶勭悊涓�涓富琛級
+ Set<Long> mainIds = deletedProducts.stream()
+ .map(SalesLedgerProduct::getSalesLedgerId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ // 2. 鎵ц鍒犻櫎鎿嶄綔
+ int result = salesLedgerProductMapper.deleteBatchIds(Arrays.asList(ids));
+ //鍒犻櫎瀵瑰簲鐨勭敓浜ц鍗�
+ for (Long id : ids) {
+ ProductOrder productOrder = productOrderMapper.selectOne(new LambdaQueryWrapper<ProductOrder>().eq(ProductOrder::getProductModelId, id));
+ if (productOrder != null) {
+ productProcessRouteItemMapper.delete(new LambdaQueryWrapper<ProductProcessRouteItem>().eq(ProductProcessRouteItem::getRouteId, productOrder.getId()));
+ productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>().eq(ProductOrder::getProductModelId, id));
+ }
+ }
+
+ // 3. 瀵规瘡涓富琛↖D杩涜閲戦鏇存柊
+ for (Long salesLedgerId : mainIds) {
+ LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId);
+ List<SalesLedgerProduct> remainingProducts = salesLedgerProductMapper.selectList(wrapper);
+
+ // 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
+ updateMainContractAmount(
+ salesLedgerId,
+ remainingProducts,
+ SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ salesLedgerMapper,
+ SalesLedger.class
+ );
+ }
+ return result;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public int addOrUpdateSalesLedgerProduct(SalesLedgerProduct salesLedgerProduct) {
- if (salesLedgerProduct.getId() == null){
- return salesLedgerProductMapper.insert(salesLedgerProduct);
- }else {
- return salesLedgerProductMapper.updateById(salesLedgerProduct);
+ //鏈紑绁ㄦ暟閲�+閲戦
+ salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ int result;
+ Long salesLedgerId = salesLedgerProduct.getSalesLedgerId();
+ if (salesLedgerProduct.getId() == null) {
+ result = salesLedgerProductMapper.insert(salesLedgerProduct);
+ ProductOrder productOrder = new ProductOrder();
+ productOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
+ productOrder.setProductModelId(salesLedgerProduct.getId());
+ productOrder.setNpsNo("SC" + String.format("%08d", salesLedgerProduct.getId()));
+ productOrderMapper.insert(productOrder);
+
+ ProcessRoute processRoute = processRouteMapper.selectOne(new QueryWrapper<ProcessRoute>().lambda().eq(ProcessRoute::getProductModelId, salesLedgerProduct.getProductModelId()));
+ if (processRoute != null) {
+ List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
+ for (ProcessRouteItem processRouteItem : processRouteItems) {
+ ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();
+ productProcessRouteItem.setProductModelId(productOrder.getProductModelId());
+ productProcessRouteItem.setProcessId(processRouteItem.getProcessId());
+ productProcessRouteItem.setRouteId(productOrder.getId());
+ productProcessRouteItemMapper.insert(productProcessRouteItem);
+ }
+ productOrder.setRouteId(processRoute.getId());
+ productOrderMapper.updateById(productOrder);
+ }
+
+
+ } else {
+ salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
+ result = salesLedgerProductMapper.updateById(salesLedgerProduct);
+ }
+
+ // 濡傛灉鎻掑叆鎴栨洿鏂版垚鍔燂紝骞朵笖鏈� salesLedgerId锛屾墠缁х画鏇存柊涓昏〃閲戦
+ if (result > 0 && salesLedgerId != null) {
+ // 鏌ヨ璇ヤ富琛ㄤ笅鐨勬墍鏈夊瓙琛ㄦ暟鎹�
+ LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
+ .eq(SalesLedgerProduct::getType, salesLedgerProduct.getType());
+ List<SalesLedgerProduct> productList = salesLedgerProductMapper.selectList(wrapper);
+ if (salesLedgerProduct.getType() == 1) {
+ // 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
+ updateMainContractAmount(
+ salesLedgerId,
+ productList,
+ SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ salesLedgerMapper,
+ SalesLedger.class
+ );
+ } else {
+ // 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
+ updateMainContractAmount(
+ salesLedgerId,
+ productList,
+ SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ purchaseLedgerMapper,
+ PurchaseLedger.class
+ );
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 閫氱敤鏂规硶锛氭牴鎹富琛↖D鍜屽瓙琛ㄥ垪琛紝鏇存柊涓昏〃鐨勫悎鍚岄噾棰�
+ */
+ public <T, S> void updateMainContractAmount(
+ Long mainId,
+ List<T> subList,
+ Function<T, BigDecimal> amountGetter,
+ BaseMapper<S> mainMapper,
+ Class<S> mainEntityClass) {
+
+ if (mainId == null || subList == null || subList.isEmpty()) {
+ return;
+ }
+
+ BigDecimal totalAmount = subList.stream()
+ .map(amountGetter)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ try {
+ S entity = mainEntityClass.getDeclaredConstructor().newInstance();
+ Field idField = mainEntityClass.getDeclaredField("id");
+ idField.setAccessible(true);
+ idField.set(entity, mainId);
+
+ Field amountField = mainEntityClass.getDeclaredField("contractAmount");
+ amountField.setAccessible(true);
+ amountField.set(entity, totalAmount);
+
+ mainMapper.updateById(entity);
+ } catch (Exception e) {
+ throw new RuntimeException("鍔ㄦ�佹洿鏂颁富琛ㄩ噾棰濆け璐�", e);
}
}
}
--
Gitblit v1.9.3