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/purchase/service/impl/PurchaseLedgerServiceImpl.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 142 insertions(+), 37 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 d71b3bb..abc7c95 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -17,13 +17,11 @@
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -51,7 +49,6 @@
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
-import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
@@ -62,8 +59,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.file.Files;
@@ -159,7 +156,43 @@
if (StringUtils.isNotBlank(purchaseLedger.getPurchaseContractNumber())) {
queryWrapper.like(PurchaseLedger::getPurchaseContractNumber, purchaseLedger.getPurchaseContractNumber());
}
- return purchaseLedgerMapper.selectList(queryWrapper);
+ if (purchaseLedger.getSupplierId() != null) {
+ queryWrapper.eq(PurchaseLedger::getSupplierId, purchaseLedger.getSupplierId());
+ }
+ if (purchaseLedger.getApprovalStatus() != null) {
+ queryWrapper.eq(PurchaseLedger::getApprovalStatus, purchaseLedger.getApprovalStatus());
+ }
+ if (StringUtils.isNotBlank(purchaseLedger.getSupplierName())) {
+ queryWrapper.like(PurchaseLedger::getSupplierName, purchaseLedger.getSupplierName());
+ }
+ if (StringUtils.isNotBlank(purchaseLedger.getSalesContractNo())) {
+ queryWrapper.like(PurchaseLedger::getSalesContractNo, purchaseLedger.getSalesContractNo());
+ }
+ if (StringUtils.isNotBlank(purchaseLedger.getProjectName())) {
+ queryWrapper.like(PurchaseLedger::getProjectName, purchaseLedger.getProjectName());
+ }
+ queryWrapper.orderByDesc(PurchaseLedger::getEntryDate);
+
+ List<PurchaseLedger> list = purchaseLedgerMapper.selectList(queryWrapper);
+ if (CollectionUtils.isNotEmpty(list)) {
+ Set<Long> supplierIds = list.stream()
+ .map(PurchaseLedger::getSupplierId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ if (!supplierIds.isEmpty()) {
+ List<SupplierManage> suppliers = supplierManageMapper.selectBatchIds(supplierIds);
+ Map<Long, Integer> typeMap = suppliers.stream()
+ .collect(Collectors.toMap(SupplierManage::getId, SupplierManage::getSupplierType, (k1, k2) -> k1));
+
+ list.forEach(item -> {
+ if (item.getSupplierId() != null) {
+ item.setPurchaseType(typeMap.get(item.getSupplierId()));
+ }
+ });
+ }
+ }
+ return list;
}
@Override
@@ -170,7 +203,10 @@
//褰曞叆浜�
SysUser sysUser = userMapper.selectUserById(purchaseLedgerDto.getRecorderId());
- SupplierManage supplierManage = supplierManageMapper.selectById(purchaseLedgerDto.getSupplierId());
+ SupplierManage supplierManage = null;
+ if (purchaseLedgerDto.getSupplierId() != null) {
+ supplierManage = supplierManageMapper.selectById(purchaseLedgerDto.getSupplierId());
+ }
// DTO杞珽ntity
PurchaseLedger purchaseLedger = new PurchaseLedger();
@@ -181,7 +217,7 @@
}
purchaseLedger.setSalesContractNo(ObjectUtils.isNotEmpty(salesLedger) ? salesLedger.getSalesContractNo() : "");
purchaseLedger.setSalesLedgerId(ObjectUtils.isNotEmpty(salesLedger) ? salesLedger.getId() : -1);
- purchaseLedger.setSupplierName(supplierManage.getSupplierName());
+ purchaseLedger.setSupplierName(supplierManage != null ? supplierManage.getSupplierName() : purchaseLedgerDto.getSupplierName());
purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
purchaseLedger.setRecorderName(sysUser.getNickName());
purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
@@ -322,22 +358,29 @@
LocalDateTime localDateTime = entryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
salesLedgerProduct.setRegisterDate(localDateTime);
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
- salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ if (Integer.valueOf(2).equals(purchaseLedger.getPurchaseType())) {
+ salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO);
+ salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO);
+ } else {
+ salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ }
salesLedgerProductMapper.insert(salesLedgerProduct);
}
}
- // 璁＄畻鎬诲惈绋庨噾棰�
- BigDecimal totalTaxInclusiveAmount = products.stream()
- .map(SalesLedgerProduct::getTaxInclusiveTotalPrice)
+ // 璁＄畻鎬婚噾棰�
+ BigDecimal totalAmount = products.stream()
+ .map(p -> Integer.valueOf(2).equals(purchaseLedger.getPurchaseType()) ?
+ (p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO) :
+ (p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO))
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 鏇存柊涓昏〃鐨勬�婚噾棰濆瓧娈�
if (salesLedgerId != null) {
- // 鐩存帴鏇存柊鎸囧畾ID鐨勮褰曠殑contractAmount瀛楁涓簍otalTaxInclusiveAmount
- purchaseLedgerMapper.updateContractAmountById(salesLedgerId, totalTaxInclusiveAmount);
+ // 鐩存帴鏇存柊鎸囧畾ID鐨勮褰曠殑contractAmount瀛楁涓簍otalAmount
+ purchaseLedgerMapper.updateContractAmountById(salesLedgerId, totalAmount);
}
}
@@ -654,14 +697,14 @@
public AjaxResult importData(MultipartFile file) {
LoginUser loginUser = SecurityUtils.getLoginUser();
try {
- InputStream inputStream = file.getInputStream();
+ byte[] fileBytes = file.getBytes();
ExcelUtil<PurchaseLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(PurchaseLedgerImportDto.class);
- Map<String, List<PurchaseLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("閲囪喘鍙拌处鏁版嵁", "閲囪喘浜у搧鏁版嵁"), inputStream, 0);
- if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("閲囪喘琛ㄦ牸涓虹┖锛�");
- // 涓氬姟灞傚悎骞�
- List<PurchaseLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("閲囪喘鍙拌处鏁版嵁");
+ // 閲囪喘鍙拌处鏁版嵁涓嶈烦杩囨爣棰�
+ List<PurchaseLedgerImportDto> salesLedgerImportDtoList = salesLedgerImportDtoExcelUtil.importExcel("閲囪喘鍙拌处鏁版嵁", new ByteArrayInputStream(fileBytes), 0);
+ // 閲囪喘浜у搧鏁版嵁璺宠繃1琛屾爣棰�
+ List<PurchaseLedgerImportDto> salesLedgerProductImportDtoList = salesLedgerImportDtoExcelUtil.importExcel("閲囪喘浜у搧鏁版嵁", new ByteArrayInputStream(fileBytes), 1);
+
if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("閲囪喘鍙拌处鏁版嵁涓虹┖锛�");
- List<PurchaseLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("閲囪喘浜у搧鏁版嵁");
if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("閲囪喘浜у搧鏁版嵁涓虹┖锛�");
// 渚涘簲鍟嗘暟鎹�
List<SupplierManage> customers = supplierManageMapper.selectList(new LambdaQueryWrapper<SupplierManage>().in(SupplierManage::getSupplierName,
@@ -679,12 +722,19 @@
}
PurchaseLedger salesLedger = new PurchaseLedger();
BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
- // 閫氳繃渚涘簲鍟嗗悕绉版煡璇D
- salesLedger.setSupplierId(customers.stream()
+ // 鏌ヨ渚涘簲鍟嗘。妗堝苟璁剧疆閲囪喘绫诲瀷锛堝鍏�1/瀵圭2锛�
+ SupplierManage matchedSupplier = customers.stream()
.filter(customer -> customer.getSupplierName().equals(salesLedger.getSupplierName()))
.findFirst()
- .map(SupplierManage::getId)
- .orElse(null));
+ .orElse(null);
+
+ if (matchedSupplier != null) {
+ salesLedger.setSupplierId(matchedSupplier.getId());
+ salesLedger.setPurchaseType(matchedSupplier.getSupplierType());
+ } else {
+ salesLedger.setPurchaseType(1); // 榛樿瀵瑰叕
+ }
+
Long aLong = sysUsers.stream()
.filter(sysUser -> sysUser.getNickName().equals(salesLedger.getRecorderName()))
.findFirst()
@@ -693,15 +743,30 @@
if (aLong == null)
throw new RuntimeException("褰曞叆浜�:" + salesLedger.getRecorderName() + ",鏃犲搴旂敤鎴凤紒");
salesLedger.setRecorderId(aLong);
- // 閲囪喘浜у搧鏁版嵁缁戝畾锛岄�氳繃閲囪喘鍗曞彿鑾峰彇瀵瑰簲閲囪喘浜у搧鏁版嵁
+
+ // 閲囪喘浜у搧鏁版嵁缁戝畾
List<PurchaseLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
.filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getPurchaseContractNumber().equals(salesLedger.getPurchaseContractNumber()))
.collect(Collectors.toList());
+
if (CollectionUtils.isEmpty(salesLedgerProductImportDtos))
throw new RuntimeException("閲囪喘鍗曞彿:" + salesLedgerImportDto.getPurchaseContractNumber() + ",鏃犲搴斾骇鍝佹暟鎹紒");
+
+ boolean isPrivate = Integer.valueOf(2).equals(salesLedger.getPurchaseType());
+
+ // 缁熶竴璁＄畻涓昏〃鍚堝悓閲戦
salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()
- .map(PurchaseLedgerProductImportDto::getTaxInclusiveTotalPrice)
- .reduce(BigDecimal.ZERO,BigDecimal::add));
+ .map(dto -> {
+ if (isPrivate) {
+ if (dto.getTotalPrice() != null) return dto.getTotalPrice();
+ BigDecimal up = dto.getUnitPrice() != null ? dto.getUnitPrice() : BigDecimal.ZERO;
+ BigDecimal qty = dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO;
+ return up.multiply(qty);
+ } else {
+ return dto.getTaxInclusiveTotalPrice() != null ? dto.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ }
+ })
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
// 閫氳繃閿�鍞崟鍙风粦瀹氶攢鍞�
SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
.eq(SalesLedger::getSalesContractNo, salesLedger.getSalesContractNo())
@@ -713,8 +778,8 @@
// 閫氳繃鏄电О鑾峰彇鐢ㄦ埛ID
String[] split = salesLedger.getApproveUserIds().split("锛�");
List<Long> ids = new ArrayList<>();
- for (int i = 0; i < split.length; i++) {
- SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getNickName, split[i])
+ for (String s : split) {
+ SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getNickName, s)
.last("LIMIT 1"));
if (sysUser != null) {
ids.add(sysUser.getUserId());
@@ -730,10 +795,48 @@
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
salesLedgerProduct.setType(2);
- // 璁＄畻涓嶅惈绋庢�讳环
- salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice().divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP));
+
+ // 鏈潵绁ㄦ暟閲�
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxExclusiveTotalPrice());
+
+ if (isPrivate) {
+ // 瀵圭閲囪喘閫昏緫
+ if (salesLedgerProduct.getTotalPrice() == null && salesLedgerProduct.getUnitPrice() != null && salesLedgerProduct.getQuantity() != null) {
+ salesLedgerProduct.setTotalPrice(salesLedgerProduct.getUnitPrice().multiply(salesLedgerProduct.getQuantity()));
+ }
+
+ BigDecimal tp = salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO;
+ salesLedgerProduct.setTaxInclusiveTotalPrice(tp);
+ salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getUnitPrice() != null ?
+ salesLedgerProduct.getUnitPrice().multiply(salesLedgerProduct.getQuantity()) : tp);
+
+ // 缁熶竴閲戦
+ salesLedgerProduct.setFutureTicketsAmount(tp);
+ salesLedgerProduct.setPendingTicketsTotal(tp);
+
+ salesLedgerProduct.setTaxRate(null);
+ salesLedgerProduct.setTaxInclusiveUnitPrice(null);
+ salesLedgerProduct.setInvoiceType(null);
+ } else {
+ // 瀵瑰叕閲囪喘閫昏緫
+ // 琛ュ叏涓嶅惈绋庢�讳环
+ if (salesLedgerProduct.getTaxInclusiveTotalPrice() != null && salesLedgerProduct.getTaxRate() != null) {
+ salesLedgerProduct.setTaxExclusiveTotalPrice(
+ salesLedgerProduct.getTaxInclusiveTotalPrice()
+ .divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP)
+ );
+ }
+
+ // 瀵瑰叕缁熶竴浣跨敤鍚◣鎬讳环
+ BigDecimal titp = salesLedgerProduct.getTaxInclusiveTotalPrice() != null ? salesLedgerProduct.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ salesLedgerProduct.setFutureTicketsAmount(titp);
+ salesLedgerProduct.setPendingTicketsTotal(titp);
+
+ salesLedgerProduct.setUnitPrice(null);
+ salesLedgerProduct.setTotalPrice(null);
+ }
+
+ // 鍖归厤浜у搧绉嶇被鍜岃鏍煎瀷鍙锋槧灏処D
list.stream()
.filter(map -> map.get("productName").equals(salesLedgerProduct.getProductCategory()) && map.get("model").equals(salesLedgerProduct.getSpecificationModel()))
.findFirst()
@@ -741,13 +844,15 @@
salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
});
+
+ // 濉厖鐧昏淇℃伅
salesLedgerProduct.setRegister(loginUser.getNickName());
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
salesLedgerProduct.setApproveStatus(0);
- salesLedgerProduct.setPendingTicketsTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
+
// 鏄惁璐ㄦ鍒ゆ柇
- salesLedgerProduct.setIsChecked(salesLedgerProductImportDto.getIsChecked() == 1);
- if(salesLedgerProductImportDto.getIsChecked() == 1){
+ salesLedgerProduct.setIsChecked(salesLedgerProductImportDto.getIsChecked() != null && salesLedgerProductImportDto.getIsChecked() == 1);
+ if(salesLedgerProduct.getIsChecked()){
addQualityInspect(salesLedger, salesLedgerProduct);
}
salesLedgerProductMapper.insert(salesLedgerProduct);
@@ -758,9 +863,9 @@
return AjaxResult.success("瀵煎叆鎴愬姛");
} catch (Exception e) {
- e.printStackTrace();
+ log.error("瀵煎叆澶辫触锛�", e);
+ throw new RuntimeException("瀵煎叆鏁版嵁杩囩▼涓彂鐢熶簡閿欒锛�" + e.getMessage());
}
- return AjaxResult.success("瀵煎叆澶辫触");
}
@Override
--
Gitblit v1.9.3