From ff5614116fe3f9a8d515ba7feb3c2e408d6af16a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 10:50:56 +0800
Subject: [PATCH] fix: 销售台账产品信息数据返回缺失
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 611 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 581 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index c73e1ea..87be01e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,8 +13,11 @@
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.CustomerRegions;
+import com.ruoyi.basic.service.ICustomerRegionsService;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.SaleEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.EnumUtil;
@@ -26,8 +29,10 @@
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProductionProductMainService;
-import com.ruoyi.project.system.domain.SysDept;
+
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
@@ -37,6 +42,7 @@
import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.*;
+import com.ruoyi.sales.service.ISalesLedgerProcessRouteService;
import com.ruoyi.sales.service.ISalesLedgerProductProcessBindService;
import com.ruoyi.sales.service.ISalesLedgerProductProcessService;
import com.ruoyi.sales.service.ISalesLedgerService;
@@ -117,6 +123,8 @@
private final ISalesLedgerProductProcessBindService salesLedgerProductProcessBindService;
+ private final ISalesLedgerProcessRouteService salesLedgerProcessRouteService;
+
@Autowired
private SysDeptMapper sysDeptMapper;
@Value("${file.upload-dir}")
@@ -135,6 +143,8 @@
;
@Autowired
private SysUserMapper sysUserMapper;
+
+ private final ICustomerRegionsService customerRegionsService;
@Override
public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
@@ -379,12 +389,6 @@
// 瀹㈡埛鏁版嵁
List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,
salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));
-// // 瑙勬牸鍨嬪彿鏁版嵁
-// List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getModel,
-// salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getSpecificationModel).collect(Collectors.toList())));
-// // 浜у搧澶х被鏁版嵁
-// List<Product> productList = productMapper.selectList(new LambdaQueryWrapper<Product>().in(Product::getProductName,
-// salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getProductCategory).collect(Collectors.toList())));
List<Map<String, Object>> list = productModelMapper.getProductAndModelList();
// 褰曞叆浜烘暟鎹�
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
@@ -394,7 +398,7 @@
.eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
.last("LIMIT 1"));
if (salesLedger1 != null) {
- continue;
+ throw new ServiceException("瀵煎叆澶辫触锛氬悎鍚屽彿 [" + salesLedgerImportDto.getSalesContractNo() + "] 宸插瓨鍦紝璇锋鏌ュ悗閲嶆柊瀵煎叆");
}
SalesLedger salesLedger = new SalesLedger();
BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
@@ -416,7 +420,7 @@
.map(SysUser::getUserId)
.orElse(null);
if (aLong == null)
- throw new RuntimeException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
+ throw new ServiceException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
salesLedger.setEntryPerson(aLong.toString());
// 閿�鍞骇鍝佹暟鎹粦瀹氾紝閫氳繃閿�鍞崟鍙疯幏鍙栧搴旈攢鍞骇鍝佹暟鎹�
List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
@@ -429,10 +433,12 @@
.reduce(BigDecimal.ZERO, BigDecimal::add));
salesLedgerMapper.insert(salesLedger);
-
for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
+ salesLedgerProduct.setFloorCode(salesLedgerProductImportDto.getFloorNo());
+ salesLedgerProduct.setProcessRequirement(salesLedgerProductImportDto.getProcessingRequirements());
+ salesLedgerProduct.setRemark(salesLedgerProductImportDto.getRemarks());
salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
salesLedgerProduct.setType(1);
// 璁＄畻涓嶅惈绋庢�讳环
@@ -446,21 +452,48 @@
salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
});
-// salesLedgerProduct.setProductId(productList.stream()
-// .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))
-// .findFirst()
-// .map(Product::getId)
-// .orElse(null));
-// salesLedgerProduct.setProductModelId(productModels.stream()
-// .filter(productModel -> productModel.getModel().equals(salesLedgerProduct.getSpecificationModel()))
-// .findFirst()
-// .map(ProductModel::getId)
-// .orElse(null));
salesLedgerProduct.setRegister(loginUser.getNickName());
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
salesLedgerProduct.setApproveStatus(0);
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
+
+ // 澶勭悊棰濆鍔犲伐淇℃伅
+ String extraProcessing = salesLedgerProductImportDto.getExtraProcessing();
+ if (StringUtils.hasText(extraProcessing)) {
+ List<SalesLedgerProductProcess> processList = new ArrayList<>();
+ // 涓嫳鏂囧垎鍙�
+ String[] items = extraProcessing.split("[;锛沒");
+ for (String item : items) {
+ if (StringUtils.hasText(item)) {
+ String[] parts = item.split("[-鈥攡锝瀅");
+ if (parts.length >= 2) {
+ String processName = parts[0].trim();
+ String qtyStr = parts[1].trim();
+ try {
+ BigDecimal quantity = new BigDecimal(qtyStr);
+ SalesLedgerProductProcess process = salesLedgerProductProcessService.getOne(
+ new LambdaQueryWrapper<SalesLedgerProductProcess>()
+ .eq(SalesLedgerProductProcess::getProcessName, processName)
+ .last("LIMIT 1")
+ );
+ if (process != null) {
+ SalesLedgerProductProcess p = new SalesLedgerProductProcess();
+ p.setId(process.getId());
+ p.setQuantity(quantity.intValue());
+ processList.add(p);
+ }
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽棰濆鍔犲伐鏁伴噺澶辫触: {}", qtyStr);
+ }
+ }
+ }
+ }
+ if (!processList.isEmpty()) {
+ salesLedgerProductProcessBindService.updateProductProcessBind(processList, salesLedgerProduct.getId());
+ }
+ }
+
// 娣诲姞鐢熶骇鏁版嵁
salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
}
@@ -519,6 +552,39 @@
return salesLedgerDtoIPage;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saleProcessBind(SalesLedgerProcessRoute salesLedgerProcessRoute) {
+ if (salesLedgerProcessRoute == null) {
+ throw new ServiceException("缁戝畾澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ }
+
+ SalesLedger salesLedger = baseMapper.selectById(salesLedgerProcessRoute.getSalesLedgerId());
+ if (salesLedger == null) {
+ throw new ServiceException("缁戝畾澶辫触,閿�鍞鍗曚笉瀛樺湪");
+ }
+ ProcessRoute processRoute = processRouteMapper.selectById(salesLedgerProcessRoute.getProcessRouteId());
+ if (processRoute == null) {
+ throw new ServiceException("缁戝畾澶辫触,宸ヨ壓璺嚎涓嶅瓨鍦�");
+ }
+ // 娓呴櫎宸茬粦瀹氱殑鏁版嵁
+ salesLedgerProcessRouteService.remove(new LambdaQueryWrapper<SalesLedgerProcessRoute>().eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedger.getId()));
+
+ // 灏嗘暟鎹縼绉诲埌sales_ledger_process_route
+ List<ProcessRouteItem> routeItems = processRouteItemMapper.selectList(new LambdaQueryWrapper<ProcessRouteItem>().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
+ SalesLedgerProcessRoute ledgerProcessRoute;
+ List<SalesLedgerProcessRoute> salesLedgerProcessRouteList = new ArrayList<>();
+ for (ProcessRouteItem routeItem : routeItems) {
+ ledgerProcessRoute = new SalesLedgerProcessRoute();
+ ledgerProcessRoute.setProcessRouteId(processRoute.getId());
+ ledgerProcessRoute.setSalesLedgerId(salesLedger.getId());
+ ledgerProcessRoute.setProcessRouteItemId(routeItem.getId());
+ ledgerProcessRoute.setDragSort(routeItem.getDragSort());
+ salesLedgerProcessRouteList.add(ledgerProcessRoute);
+ }
+ salesLedgerProcessRouteService.saveBatch(salesLedgerProcessRouteList);
}
/**
@@ -806,19 +872,20 @@
}
}
- if (!redisTemplate.hasKey(lockKey)) {
+ if (Boolean.FALSE.equals(redisTemplate.hasKey(lockKey))) {
throw new RuntimeException("鑾峰彇鍚堝悓缂栧彿鐢熸垚閿佸け璐ワ細瓒呮椂");
}
// 2. 鏌ヨ褰撳ぉ/鍏徃宸插瓨鍦ㄧ殑搴忓垪鍙凤紙涓庡師閫昏緫涓�鑷达級
- Long tenantId = SecurityUtils.getLoginUser().getTenantId();
- if (null != tenantId) {
- //鑾峰彇鍏徃缂栧彿
- SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
- if (!ObjectUtils.isEmpty(sysDept)) {
- datePart = (StringUtils.isEmpty(sysDept.getDeptNick()) ? "" : sysDept.getDeptNick()) + datePart;
- }
- }
+// Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+// if (null != tenantId) {
+// //鑾峰彇鍏徃缂栧彿
+// SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
+// if (!ObjectUtils.isEmpty(sysDept)) {
+// datePart = (StringUtils.isEmpty(sysDept.getDeptNick()) ? "" : sysDept.getDeptNick()) + datePart;
+// }
+// }
+ datePart = "D" + datePart;
List<Integer> existingSequences = salesLedgerMapper.selectSequencesByDate(datePart);
int nextSequence = findFirstMissingSequence(existingSequences);
@@ -834,6 +901,490 @@
}
}
+ @Override
+ public SalesLedgerProcessRouteDto salesProcess(Long salesLedgerId) {
+ SalesLedgerProcessRouteDto dto = new SalesLedgerProcessRouteDto();
+ List<SalesLedgerProcessRoute> list = baseMapper.selectSalesProcess(salesLedgerId);
+ if (CollectionUtils.isNotEmpty(list)) {
+ Long processRouteId = list.get(0).getProcessRouteId();
+ ProcessRoute processRoute = processRouteMapper.selectById(processRouteId);
+ if (processRoute != null) {
+ dto.setRouteId(processRoute.getId());
+ dto.setRouteName(processRoute.getProcessRouteName());
+ }
+ } else {
+ // 瑕佹槸list鏌ヨ涓虹┖鐨勮瘽锛屽氨鏌ヨ榛樿鐨勫伐鑹鸿矾绾胯繑鍥�
+ ProcessRoute defaultRoute = processRouteMapper.selectOne(new LambdaQueryWrapper<ProcessRoute>().eq(ProcessRoute::getIsDefault, 1).last("limit 1"));
+ if (defaultRoute != null) {
+ dto.setRouteId(defaultRoute.getId());
+ dto.setRouteName(defaultRoute.getProcessRouteName());
+ List<ProcessRouteItem> routeItems = processRouteItemMapper.selectList(new LambdaQueryWrapper<ProcessRouteItem>().eq(ProcessRouteItem::getRouteId, defaultRoute.getId()).orderByAsc(ProcessRouteItem::getDragSort));
+ list = routeItems.stream().map(item -> {
+ SalesLedgerProcessRoute salesLedgerProcessRoute = new SalesLedgerProcessRoute();
+ salesLedgerProcessRoute.setProcessRouteId(defaultRoute.getId());
+ salesLedgerProcessRoute.setSalesLedgerId(salesLedgerId);
+ salesLedgerProcessRoute.setProcessRouteItemId(item.getId());
+ salesLedgerProcessRoute.setProcessName(item.getProcessName());
+ salesLedgerProcessRoute.setDragSort(item.getDragSort());
+ return salesLedgerProcessRoute;
+ }).collect(Collectors.toList());
+ }
+ }
+ dto.setList(list);
+ return dto;
+ }
+
+ @Override
+ public SalesProcessCardDto processCard(Long salesLedgerId) {
+ if (salesLedgerId == null) {
+ throw new ServiceException("娴佺▼鍗℃墦鍗板け璐�,鎵撳嵃閿�鍞鍗曚笉鑳戒负绌�");
+ }
+ // 鏌ヨ閿�鍞鍗�
+ SalesLedger salesLedger = baseMapper.selectById(salesLedgerId);
+ if (salesLedger == null) {
+ throw new ServiceException("娴佺▼鍗℃墦鍗板け璐�,閿�鍞鍗曚笉瀛樺湪");
+ }
+
+ SalesProcessCardDto dto = new SalesProcessCardDto();
+ dto.setSalesContractNo(salesLedger.getSalesContractNo());
+ dto.setCustomerName(salesLedger.getCustomerName());
+ dto.setDeliveryDate(salesLedger.getDeliveryDate());
+ dto.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
+ dto.setRegisterDate(LocalDateTime.now());
+ dto.setOrderProcessRequirement(salesLedger.getRemarks());
+
+ // 鏌ヨ浜у搧鍒楄〃
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
+ new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));
+
+ BigDecimal totalQuantity = BigDecimal.ZERO;
+ BigDecimal totalArea = BigDecimal.ZERO;
+ List<SalesProcessCardDto.ProcessCardItemDto> itemDtos = new ArrayList<>();
+
+ for (SalesLedgerProduct p : products) {
+ SalesProcessCardDto.ProcessCardItemDto itemDto = new SalesProcessCardDto.ProcessCardItemDto();
+ itemDto.setFloorCode(p.getFloorCode());
+ // 缁勮浜у搧鎻忚堪锛氬ぇ绫� + (瑙勬牸)
+ String desc = (p.getProductCategory() != null ? p.getProductCategory() : "") +
+ (StringUtils.isNotBlank(p.getSpecificationModel()) ? " " + p.getSpecificationModel() : "");
+ itemDto.setProductDescription(desc.trim());
+ itemDto.setWidth(p.getWidth());
+ itemDto.setHeight(p.getHeight());
+ itemDto.setQuantity(p.getQuantity());
+
+ // 闈㈢Н璁＄畻(骞崇背)
+ BigDecimal area = p.getActualPieceArea() != null ? p.getActualPieceArea() : p.getSettlePieceArea();
+ if (area == null && p.getWidth() != null && p.getHeight() != null) {
+ area = p.getWidth().multiply(p.getHeight()).divide(new BigDecimal(1000000), 2, RoundingMode.HALF_UP);
+ }
+ itemDto.setArea(area);
+ itemDto.setProcessRequirement(p.getProcessRequirement());
+
+ BigDecimal qty = p.getQuantity() != null ? p.getQuantity() : BigDecimal.ZERO;
+ totalQuantity = totalQuantity.add(qty);
+ if (area != null) {
+ totalArea = totalArea.add(area.multiply(qty));
+ }
+
+ itemDtos.add(itemDto);
+ }
+ dto.setItems(itemDtos);
+ dto.setTotalQuantity(totalQuantity);
+ dto.setTotalArea(totalArea.setScale(2, RoundingMode.HALF_UP));
+
+ // 宸ヨ壓璺嚎
+ List<SalesLedgerProcessRoute> salesLedgerProcessRoutes = salesLedgerProcessRouteService.list(
+ new LambdaQueryWrapper<SalesLedgerProcessRoute>()
+ .eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedgerId)
+ .orderByAsc(SalesLedgerProcessRoute::getDragSort));
+
+ List<SalesProcessCardDto.ProcessNodeDto> nodeDtos = new ArrayList<>();
+
+ if (CollectionUtils.isEmpty(salesLedgerProcessRoutes)) {
+ // 鏃犺嚜瀹氫箟璺嚎锛屽彇榛樿璺嚎
+ ProcessRoute defaultRoute = processRouteMapper.selectOne(
+ new LambdaQueryWrapper<ProcessRoute>().eq(ProcessRoute::getIsDefault, 1).last("LIMIT 1"));
+ if (defaultRoute != null) {
+ List<ProcessRouteItem> routeItems = processRouteItemMapper.selectList(
+ new LambdaQueryWrapper<ProcessRouteItem>()
+ .eq(ProcessRouteItem::getRouteId, defaultRoute.getId())
+ .orderByAsc(ProcessRouteItem::getDragSort));
+ for (ProcessRouteItem i : routeItems) {
+ SalesProcessCardDto.ProcessNodeDto node = new SalesProcessCardDto.ProcessNodeDto();
+ node.setProcessRouteItemId(i.getId());
+ node.setProcessRouteItemName(i.getProcessName());
+ node.setDragSort(i.getDragSort());
+ nodeDtos.add(node);
+ }
+ }
+ } else {
+ // 浣跨敤鑷畾涔夎矾绾跨粦瀹氱殑鑺傜偣
+ List<Long> itemIds = salesLedgerProcessRoutes.stream()
+ .map(SalesLedgerProcessRoute::getProcessRouteItemId)
+ .collect(Collectors.toList());
+ List<ProcessRouteItem> rawItems = processRouteItemMapper.selectBatchIds(itemIds);
+ Map<Long, ProcessRouteItem> itemMap = rawItems.stream()
+ .collect(Collectors.toMap(ProcessRouteItem::getId, i -> i, (a, b) -> a));
+
+ for (SalesLedgerProcessRoute r : salesLedgerProcessRoutes) {
+ ProcessRouteItem pi = itemMap.get(r.getProcessRouteItemId());
+ if (pi != null) {
+ SalesProcessCardDto.ProcessNodeDto node = new SalesProcessCardDto.ProcessNodeDto();
+ node.setProcessRouteItemId(pi.getId());
+ node.setProcessRouteItemName(pi.getProcessName());
+ node.setDragSort(r.getDragSort() != null ? r.getDragSort() : pi.getDragSort());
+ node.setRemark(r.getRemark());
+ nodeDtos.add(node);
+ }
+ }
+ }
+
+ if (!nodeDtos.isEmpty()) {
+ // dragSort 杩涜鍗囧簭鎺掑簭
+ nodeDtos.sort(Comparator.comparing(
+ SalesProcessCardDto.ProcessNodeDto::getDragSort,
+ Comparator.nullsLast(Comparator.naturalOrder())
+ ));
+ // 閲嶆柊鐢熸垚鎺掑簭鍚庣殑璺緞鍚嶇О鍒楄〃
+ List<String> sortedPathNames = nodeDtos.stream()
+ .map(SalesProcessCardDto.ProcessNodeDto::getProcessRouteItemName)
+ .collect(Collectors.toList());
+ // 鎷兼帴瀛楃涓�
+ dto.setProcessPathDisplay(String.join(" -> ", sortedPathNames));
+ // 璁剧疆椤跺眰鑺傜偣鐨勫伐鑹鸿矾绾�
+ dto.setRouteNodes(nodeDtos);
+ }
+
+ return dto;
+ }
+
+ @Override
+ public SalesOrdersDto salesOrders(Long salesLedgerId) {
+ if (salesLedgerId == null) {
+ throw new ServiceException("鎵撳嵃閿�鍞鍗曞け璐�,閿�鍞鍗旾D涓嶈兘涓虹┖");
+ }
+ SalesLedger salesLedger = baseMapper.selectById(salesLedgerId);
+ if (salesLedger == null) {
+ throw new ServiceException("鎵撳嵃閿�鍞鍗曞け璐�,閿�鍞鍗曚笉瀛樺湪");
+ }
+
+ SalesOrdersDto dto = new SalesOrdersDto();
+ dto.setSalesContractNo(salesLedger.getSalesContractNo());
+ dto.setCustomerName(salesLedger.getCustomerName());
+ dto.setProjectName(salesLedger.getProjectName());
+ dto.setSalesman(salesLedger.getSalesman());
+ dto.setExecutionDate(salesLedger.getExecutionDate() != null ? salesLedger.getExecutionDate().atStartOfDay() : null);
+ dto.setDeliveryDate(salesLedger.getDeliveryDate());
+ dto.setRemakes(salesLedger.getRemarks());
+ dto.setCompanyName("楣ゅ澶╂矏閽㈠寲鐜荤拑鍘�");
+
+ // 閫佽揣鍦板潃
+ if (salesLedger.getCustomerId() != null) {
+ Customer customer = customerMapper.selectById(salesLedger.getCustomerId());
+ if (customer != null) {
+ StringBuilder address = new StringBuilder();
+ if (customer.getRegionsId() != null) {
+ CustomerRegions regions = customerRegionsService.getById(customer.getRegionsId());
+ if (regions != null) {
+ address.append(regions.getRegionsName());
+ }
+ }
+ if (StringUtils.isNotEmpty(customer.getCompanyAddress())) {
+ address.append(customer.getCompanyAddress());
+ }
+ dto.setCompanyAddress(address.toString());
+ }
+ }
+
+ // 鍒跺崟鍛�
+ if (StringUtils.isNotEmpty(salesLedger.getEntryPerson())) {
+ try {
+ SysUser user = sysUserMapper.selectUserById(Long.parseLong(salesLedger.getEntryPerson()));
+ if (user != null) {
+ dto.setOrderMaker(user.getNickName());
+ }
+ } catch (Exception e) {
+ log.error("鑾峰彇鍒跺崟鍛樹俊鎭け璐�: {}", e.getMessage());
+ }
+ }
+ // 鍒跺崟鏃ユ湡 (搴曢儴)
+ dto.setOrderMakerDate(salesLedger.getExecutionDate() != null ? salesLedger.getExecutionDate().atStartOfDay() : null);
+
+ // 鎵撳嵃淇℃伅
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (loginUser != null && loginUser.getUser() != null) {
+ dto.setPrintPeople(loginUser.getUser().getNickName());
+ }
+ dto.setPrintTime(LocalDateTime.now());
+
+ // 鏌ヨ浜у搧鍒楄〃
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
+ new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));
+
+ if (CollectionUtils.isNotEmpty(products)) {
+ SalesLedgerProduct firstProduct = products.get(0);
+ dto.setProductName(firstProduct.getProductCategory() != null ? firstProduct.getProductCategory() : "");
+ }
+
+ List<SalesOrdersDto.SalesOrderItemDto> itemDtos = new ArrayList<>();
+ BigDecimal subtotalQuantity = BigDecimal.ZERO;
+ BigDecimal subtotalArea = BigDecimal.ZERO;
+ BigDecimal subtotalAmount = BigDecimal.ZERO;
+
+ for (SalesLedgerProduct p : products) {
+ SalesOrdersDto.SalesOrderItemDto itemDto = new SalesOrdersDto.SalesOrderItemDto();
+ itemDto.setFloorCode(p.getFloorCode());
+ String desc = (p.getProductCategory() != null ? p.getProductCategory() : "") +
+ (StringUtils.isNotBlank(p.getSpecificationModel()) ? " " + p.getSpecificationModel() : "");
+ itemDto.setProductDescription(desc.trim());
+ itemDto.setWidth(p.getWidth());
+ itemDto.setHeight(p.getHeight());
+ itemDto.setQuantity(p.getQuantity());
+
+ // 闈㈢Н璁＄畻
+ BigDecimal area = p.getSettleTotalArea() != null ? p.getSettleTotalArea() : p.getActualTotalArea();
+ if (area == null && p.getWidth() != null && p.getHeight() != null && p.getQuantity() != null) {
+ area = p.getWidth().multiply(p.getHeight()).multiply(p.getQuantity()).divide(new BigDecimal(1000000), 2, RoundingMode.HALF_UP);
+ }
+ itemDto.setArea(area);
+ itemDto.setUnitPrice(p.getTaxInclusiveUnitPrice());
+ itemDto.setAmount(p.getTaxInclusiveTotalPrice());
+ itemDto.setRemark(p.getRemark());
+ itemDto.setProcessRequirement(p.getProcessRequirement());
+
+ subtotalQuantity = subtotalQuantity.add(p.getQuantity() != null ? p.getQuantity() : BigDecimal.ZERO);
+ subtotalArea = subtotalArea.add(area != null ? area : BigDecimal.ZERO);
+ subtotalAmount = subtotalAmount.add(p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO);
+
+ itemDtos.add(itemDto);
+ }
+ dto.setItems(itemDtos);
+ dto.setSubtotalQuantity(subtotalQuantity);
+ dto.setSubtotalArea(subtotalArea.setScale(2, RoundingMode.HALF_UP));
+ dto.setSubtotalAmount(subtotalAmount);
+
+ // 澶勭悊鍏朵粬璐圭敤
+ List<Long> productIds = products.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());
+ BigDecimal otherFeesTotal = BigDecimal.ZERO;
+ if (CollectionUtils.isNotEmpty(productIds)) {
+ List<SalesLedgerProductProcessBind> binds = salesLedgerProductProcessBindService.list(
+ new LambdaQueryWrapper<SalesLedgerProductProcessBind>().in(SalesLedgerProductProcessBind::getSalesLedgerProductId, productIds));
+
+ if (CollectionUtils.isNotEmpty(binds)) {
+ Map<Integer, Integer> processQuantityMap = binds.stream()
+ .collect(Collectors.groupingBy(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId,
+ Collectors.summingInt(b -> b.getQuantity() != null ? b.getQuantity() : 0)));
+
+ List<Integer> processIds = new ArrayList<>(processQuantityMap.keySet());
+ List<SalesLedgerProductProcess> processes = salesLedgerProductProcessService.listByIds(processIds);
+
+ List<SalesOrdersDto.OtherFeeDto> otherFeeDtos = new ArrayList<>();
+
+ for (SalesLedgerProductProcess proc : processes) {
+ SalesOrdersDto.OtherFeeDto feeDto = new SalesOrdersDto.OtherFeeDto();
+ feeDto.setFeeName(proc.getProcessName());
+ feeDto.setUnitPrice(proc.getUnitPrice());
+ Integer qty = processQuantityMap.get(proc.getId());
+ feeDto.setQuantity(new BigDecimal(qty != null ? qty : 0));
+ BigDecimal amount = proc.getUnitPrice() != null ? proc.getUnitPrice().multiply(feeDto.getQuantity()) : BigDecimal.ZERO;
+ feeDto.setAmount(amount);
+ otherFeeDtos.add(feeDto);
+ otherFeesTotal = otherFeesTotal.add(amount);
+ }
+ dto.setOtherFees(otherFeeDtos);
+ }
+ }
+
+ dto.setTotalQuantity(subtotalQuantity);
+ dto.setTotalArea(dto.getSubtotalArea());
+ dto.setTotalAmount(subtotalAmount.add(otherFeesTotal));
+ dto.setTotalAmountDisplay(dto.getTotalAmount().setScale(2, RoundingMode.HALF_UP).toString() + "鍏�");
+
+ return dto;
+ }
+
+ @Override
+ public SalesInvoicesDto salesInvoices(List<Long> salesLedgerIds) {
+ if (CollectionUtils.isEmpty(salesLedgerIds)) {
+ throw new ServiceException("閿�鍞彂璐у崟鎵撳嵃澶辫触,閿�鍞鍗曚笉鑳戒负绌�");
+ }
+
+ List<SalesLedger> ledgers = salesLedgerMapper.selectBatchIds(salesLedgerIds);
+ if (CollectionUtils.isEmpty(ledgers)) {
+ throw new ServiceException("閿�鍞彂璐у崟鎵撳嵃澶辫触,鏈壘鍒板搴斿彴璐﹁褰�");
+ }
+
+ Long customerId = ledgers.get(0).getCustomerId();
+ for (SalesLedger ledger : ledgers) {
+ if (!Objects.equals(customerId, ledger.getCustomerId())) {
+ throw new ServiceException("閿�鍞彂璐у崟鍚堝苟鎵撳嵃鍙兘鏄悓涓�涓鎴�");
+ }
+ }
+
+ SalesInvoicesDto dto = new SalesInvoicesDto();
+
+ Customer customer = customerMapper.selectById(customerId);
+ if (customer != null) {
+ dto.setCustomerName(customer.getCustomerName());
+ dto.setContactPerson(customer.getContactPerson());
+ dto.setContactPhone(customer.getContactPhone());
+
+ StringBuilder address = new StringBuilder();
+ if (customer.getRegionsId() != null) {
+ CustomerRegions regions = customerRegionsService.getById(customer.getRegionsId());
+ if (regions != null) {
+ address.append(regions.getRegionsName());
+ }
+ }
+ if (StringUtils.isNotEmpty(customer.getCompanyAddress())) {
+ address.append(customer.getCompanyAddress());
+ }
+ dto.setCompanyAddress(address.toString());
+ }
+
+ // 鍙戣揣鍗曞彿 (XF + 鏃ユ湡 + 搴忓垪)
+ String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
+ String redisKey = "sales:delivery:seq:" + dateStr;
+ Long seq = redisTemplate.opsForValue().increment(redisKey);
+ if (seq != null && seq == 1) {
+ redisTemplate.expire(redisKey, 48, TimeUnit.HOURS);
+ }
+ dto.setDeliveryNo("XF" + dateStr + String.format("%03d", seq != null ? seq : 1));
+
+ // 瀵规柟鍗曞彿
+// dto.setExternalOrderNo(ledgers.get(0).getCustomerContractNo());
+
+ // 鏌ヨ鎵�鏈変骇鍝�
+ List<SalesLedgerProduct> allProducts = salesLedgerProductMapper.selectList(
+ new LambdaQueryWrapper<SalesLedgerProduct>().in(SalesLedgerProduct::getSalesLedgerId, salesLedgerIds));
+
+ if (CollectionUtils.isNotEmpty(allProducts)) {
+ Map<Long, SalesLedger> ledgerMap = ledgers.stream()
+ .collect(Collectors.toMap(SalesLedger::getId, Function.identity()));
+
+ Map<Long, List<SalesLedgerProduct>> groupedData = new LinkedHashMap<>();
+ for (SalesLedgerProduct p : allProducts) {
+ groupedData.computeIfAbsent(p.getSalesLedgerId(), k -> new ArrayList<>()).add(p);
+ }
+
+ List<SalesInvoicesDto.InvoiceOrderGroupDto> groups = new ArrayList<>();
+ BigDecimal totalQty = BigDecimal.ZERO;
+ BigDecimal totalArea = BigDecimal.ZERO;
+
+ for (Map.Entry<Long, List<SalesLedgerProduct>> ledgerEntry : groupedData.entrySet()) {
+ SalesLedger ledger = ledgerMap.get(ledgerEntry.getKey());
+ String orderNo = ledger != null ? ledger.getSalesContractNo() : "";
+ List<SalesLedgerProduct> products = ledgerEntry.getValue();
+
+ SalesInvoicesDto.InvoiceOrderGroupDto group = new SalesInvoicesDto.InvoiceOrderGroupDto();
+ group.setSalesContractNo(orderNo);
+ if (CollectionUtils.isNotEmpty(products)) {
+ group.setProductName(products.get(0).getProductCategory());
+ }
+
+ List<SalesInvoicesDto.InvoiceItemDto> itemDtos = new ArrayList<>();
+ BigDecimal groupQty = BigDecimal.ZERO;
+ BigDecimal groupArea = BigDecimal.ZERO;
+
+ for (SalesLedgerProduct p : products) {
+ SalesInvoicesDto.InvoiceItemDto item = new SalesInvoicesDto.InvoiceItemDto();
+ item.setFloorCode(p.getFloorCode());
+ item.setWidthHeight((p.getWidth() != null ? p.getWidth().stripTrailingZeros().toPlainString() : "0") +
+ " * " + (p.getHeight() != null ? p.getHeight().stripTrailingZeros().toPlainString() : "0"));
+ item.setQuantity(p.getQuantity());
+
+ // 闈㈢Н
+ BigDecimal area = p.getSettleTotalArea() != null ? p.getSettleTotalArea() : p.getActualTotalArea();
+ if (area == null && p.getWidth() != null && p.getHeight() != null && p.getQuantity() != null) {
+ area = p.getWidth().multiply(p.getHeight()).multiply(p.getQuantity()).divide(new BigDecimal(1000000), 2, RoundingMode.HALF_UP);
+ }
+ item.setArea(area);
+ item.setRemark(p.getRemark());
+ item.setProcessRequirement(p.getProcessRequirement());
+
+ itemDtos.add(item);
+ groupQty = groupQty.add(p.getQuantity() != null ? p.getQuantity() : BigDecimal.ZERO);
+ groupArea = groupArea.add(area != null ? area : BigDecimal.ZERO);
+ }
+
+ group.setItems(itemDtos);
+ group.setGroupTotalQuantity(groupQty);
+ group.setGroupTotalArea(groupArea.setScale(2, RoundingMode.HALF_UP));
+ groups.add(group);
+
+ totalQty = totalQty.add(groupQty);
+ totalArea = totalArea.add(groupArea);
+ }
+ dto.setGroups(groups);
+ dto.setTotalQuantity(totalQty);
+ dto.setTotalArea(totalArea.setScale(2, RoundingMode.HALF_UP));
+ }
+
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (loginUser != null && loginUser.getUser() != null) {
+ dto.setOrderMaker(loginUser.getUser().getNickName());
+ }
+ dto.setExecutionDate(LocalDateTime.now());
+
+ return dto;
+ }
+
+ @Override
+ public List<SalesLabelDto> salesLabel(Long salesLedgerId) {
+ if (salesLedgerId == null) {
+ throw new ServiceException("鎵撳嵃鏍囩澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ }
+ SalesLedger salesLedger = baseMapper.selectById(salesLedgerId);
+ if (salesLedger == null) {
+ throw new ServiceException("鎵撳嵃澶辫触,閿�鍞鍗曚笉瀛樺湪");
+ }
+
+ // 鏌ヨ浜у搧鍒楄〃
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
+ new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));
+
+ // 鏌ヨ瀹㈡埛鍦板潃
+ String fullAddress = "";
+ if (salesLedger.getCustomerId() != null) {
+ Customer customer = customerMapper.selectById(salesLedger.getCustomerId());
+ if (customer != null) {
+ StringBuilder addressSb = new StringBuilder();
+ if (customer.getRegionsId() != null) {
+ CustomerRegions regions = customerRegionsService.getById(customer.getRegionsId());
+ if (regions != null) {
+ addressSb.append(regions.getRegionsName());
+ }
+ }
+ if (StringUtils.isNotEmpty(customer.getCompanyAddress())) {
+ addressSb.append(customer.getCompanyAddress());
+ }
+ fullAddress = addressSb.toString();
+ }
+ }
+
+ List<SalesLabelDto> list = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(products)) {
+ for (SalesLedgerProduct p : products) {
+ SalesLabelDto dto = new SalesLabelDto();
+ dto.setCustomerName(salesLedger.getCustomerName());
+ dto.setSalesContractNo(salesLedger.getSalesContractNo());
+ dto.setProductName(p.getProductCategory());
+
+ // 瀹�*楂�=鏁伴噺
+ String specification = (p.getWidth() != null ? p.getWidth().stripTrailingZeros().toPlainString() : "0") + "*" +
+ (p.getHeight() != null ? p.getHeight().stripTrailingZeros().toPlainString() : "0") + "=" +
+ (p.getQuantity() != null ? p.getQuantity().stripTrailingZeros().toPlainString() : "0");
+ dto.setSpecification(specification);
+
+ // 瀹㈡埛鍦板潃 + 妤煎眰缂栧彿
+ dto.setFloorCode(fullAddress + (StringUtils.isNotEmpty(p.getFloorCode()) ? " " + p.getFloorCode() : ""));
+ list.add(dto);
+ }
+ }
+
+ return list;
+ }
+
private int findFirstMissingSequence(List<Integer> sequences) {
if (sequences.isEmpty()) {
return 1;
--
Gitblit v1.9.3