From 65bf12d8c871308e36fff97d985f49ad6bce6adc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 07 四月 2026 16:01:09 +0800
Subject: [PATCH] feat: 支持个人对私录入销售订单；支持个人采购；供应商、客户档案、销售采购导入导出修改
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 182 +++++++++++++++++++++++++++++++++++---------
1 files changed, 143 insertions(+), 39 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 c0c53ca..f2d0f4d 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -5,14 +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.utils.StringUtils;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
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.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.quality.mapper.QualityInspectMapper;
@@ -23,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;
@@ -40,6 +40,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
@@ -89,6 +90,8 @@
private ProductStructureMapper productStructureMapper;
@Autowired
private StockInventoryMapper stockInventoryMapper;
+ @Autowired
+ private ProductOrderServiceImpl productOrderServiceImpl;
@Override
public SalesLedgerProduct selectSalesLedgerProductById(Long id) {
@@ -168,10 +171,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));
@@ -179,19 +181,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;
}
@@ -199,22 +226,88 @@
@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);
addProductionData(salesLedgerProduct);
} else {
@@ -224,9 +317,7 @@
/*鍒犻櫎瀵瑰簲鐨勭敓浜ф暟鎹苟閲嶆柊鏂板*/
deleteProductionData(Arrays.asList(salesLedgerProduct.getId()));
// 鍒犻櫎鐢熶骇鏍哥畻鏁版嵁
- LambdaQueryWrapper<SalesLedgerProductionAccounting> reportWrapper = new LambdaQueryWrapper<>();
- reportWrapper.in(SalesLedgerProductionAccounting::getSalesLedgerId, salesLedgerId);
- salesLedgerProductionAccountingMapper.delete(reportWrapper);
+
addProductionData(salesLedgerProduct);
}
@@ -237,12 +328,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
);
@@ -251,7 +347,7 @@
updateMainContractAmount(
salesLedgerId,
productList,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ amountGetter,
purchaseLedgerMapper,
PurchaseLedger.class
);
@@ -266,8 +362,10 @@
public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
ProductOrder productOrder = new ProductOrder();
productOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
- productOrder.setProductModelId(salesLedgerProduct.getId());
- productOrder.setNpsNo("SC" + String.format("%08d", salesLedgerProduct.getId()));
+ productOrder.setProductModelId(salesLedgerProduct.getProductModelId());
+ productOrder.setSaleLedgerProductId(salesLedgerProduct.getId());
+ String string = productOrderServiceImpl.generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+ productOrder.setNpsNo(string);
productOrder.setQuantity(salesLedgerProduct.getQuantity());//闇�姹傛暟閲�
productOrder.setCompleteQuantity(BigDecimal.ZERO);//瀹屾垚鏁伴噺
productOrderMapper.insert(productOrder);
@@ -298,13 +396,7 @@
int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
if (insert > 0) {
// 鏌ヨ浠婃棩宸插瓨鍦ㄧ殑鏈�澶у伐鍗曞彿
- QueryWrapper<ProductWorkOrder> queryWrapper = new QueryWrapper<>();
- queryWrapper.likeRight("work_order_no", datePrefix)
- .orderByDesc("work_order_no")
- .last("LIMIT 1");
-
- ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectOne(queryWrapper);
-
+ ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectMax(datePrefix);
int sequenceNumber = 1; // 榛樿搴忓彿
if (lastWorkOrder != null && lastWorkOrder.getWorkOrderNo() != null) {
String lastNo = lastWorkOrder.getWorkOrderNo().toString();
@@ -318,7 +410,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());
@@ -339,10 +431,13 @@
* 鍒犻櫎鐢熶骇鏁版嵁
*/
public void deleteProductionData(List<Long> productIds) {
+ if (productIds == null || productIds.isEmpty()){
+ return;
+ }
//鎵归噺鏌ヨproductOrder
List<ProductOrder> productOrders = productOrderMapper.selectList(
new LambdaQueryWrapper<ProductOrder>()
- .in(ProductOrder::getProductModelId, productIds)
+ .in(ProductOrder::getSaleLedgerProductId, productIds)
);
if (!org.springframework.util.CollectionUtils.isEmpty(productOrders)) {
List<Long> orderIds = productOrders.stream()
@@ -388,6 +483,13 @@
new LambdaQueryWrapper<QualityInspect>()
.in(QualityInspect::getProductMainId, productMainIds)
);
+ //鍒犻櫎鍑哄簱璁板綍
+ for (Long productMainId : productMainIds) {
+ //鍒犻櫎鐢熶骇鍑哄簱璁板綍
+ stockUtils.deleteStockOutRecord(productMainId, StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode());
+ //鍒犻櫎鎶ュ簾鐨勫叆搴撹褰�
+ stockUtils.deleteStockInRecord(productMainId, StockInUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode());
+ }
qualityInspects.forEach(qualityInspect -> {
//inspectState=1 宸叉彁浜� 涓嶈兘鍒犻櫎
if (qualityInspect.getInspectState() == 1) {
@@ -395,6 +497,8 @@
}
});
qualityInspectMapper.deleteByProductMainIds(productMainIds);
+ salesLedgerProductionAccountingMapper.delete(new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
+ .in(SalesLedgerProductionAccounting::getProductMainId, productMainIds));
}
// 鍒犻櫎鐢熶骇涓昏〃鏁版嵁
@@ -415,7 +519,7 @@
// 鎵归噺鍒犻櫎productOrder
productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
- .in(ProductOrder::getProductModelId, productIds));
+ .in(ProductOrder::getSaleLedgerProductId, productIds));
}
}
@@ -438,7 +542,7 @@
IPage<SalesLedgerProductDto> salesLedgerProductDtoIPage = salesLedgerProductMapper.listPagePurchaseLedger(page, salesLedgerProduct);
salesLedgerProductDtoIPage.getRecords().forEach(item -> {
// 鍒ゆ柇鐘舵��
- if(item.getTaxInclusiveTotalPrice().compareTo(item.getInvoiceTotal()) == 0){
+ if(item.getTaxInclusiveTotalPrice().compareTo(item.getTicketsTotal()) == 0){
item.setStatusName("宸插畬鎴愪粯娆�");
}else{
item.setStatusName("鏈畬鎴愪粯娆�");
--
Gitblit v1.9.3