From 4277ab30de3fedfd5bea68bfa0e111e21df73839 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 27 三月 2026 11:19:44 +0800
Subject: [PATCH] feat: 打印流程卡与获取销售订单绑定的工艺路线
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 183 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 171 insertions(+), 12 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 991d011..320c362 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;
@@ -30,7 +30,7 @@
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;
@@ -543,7 +543,7 @@
throw new ServiceException("缁戝畾澶辫触,宸ヨ壓璺嚎涓嶅瓨鍦�");
}
// 娓呴櫎宸茬粦瀹氱殑鏁版嵁
- salesLedgerProcessRouteService.remove(new LambdaQueryWrapper<SalesLedgerProcessRoute>().eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedger.getId()).eq(SalesLedgerProcessRoute::getProcessRouteId, processRoute.getId()));
+ 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()));
@@ -554,6 +554,7 @@
ledgerProcessRoute.setProcessRouteId(processRoute.getId());
ledgerProcessRoute.setSalesLedgerId(salesLedger.getId());
ledgerProcessRoute.setProcessRouteItemId(routeItem.getId());
+ ledgerProcessRoute.setDragSort(routeItem.getDragSort());
salesLedgerProcessRouteList.add(ledgerProcessRoute);
}
salesLedgerProcessRouteService.saveBatch(salesLedgerProcessRouteList);
@@ -844,19 +845,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);
@@ -872,6 +874,163 @@
}
}
+ @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;
+ }
+
private int findFirstMissingSequence(List<Integer> sequences) {
if (sequences.isEmpty()) {
return 1;
--
Gitblit v1.9.3