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/resources/mapper/sales/SalesLedgerMapper.xml | 42 ++++-
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 17 ++
src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java | 4
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 183 ++++++++++++++++++++++++-
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java | 3
src/main/java/com/ruoyi/sales/dto/SalesProcessCardDto.java | 106 +++++++++++++++
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 8
src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java | 32 ++++
8 files changed, 367 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 1cf2d74..a7888e4 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -13,6 +13,8 @@
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.dto.SalesLedgerProcessRouteDto;
+import com.ruoyi.sales.dto.SalesProcessCardDto;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.pojo.ReceiptPayment;
@@ -360,4 +362,19 @@
public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
}
+
+ @ApiOperation("鑾峰彇閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎")
+ @GetMapping("/salesProcess/{salesLedgerId}")
+ public AjaxResult salesProcess(@PathVariable Long salesLedgerId) {
+ SalesLedgerProcessRouteDto dto = salesLedgerService.salesProcess(salesLedgerId);
+ return AjaxResult.success(dto);
+ }
+
+ @GetMapping("/processCard/{salesLedgerId}")
+ @ApiOperation("鎵撳嵃鐢熶骇娴佺▼鍗�")
+ public AjaxResult processCard(@PathVariable Long salesLedgerId) {
+ SalesProcessCardDto dto = salesLedgerService.processCard(salesLedgerId);
+ return AjaxResult.success(dto);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java
new file mode 100644
index 0000000..4032ebd
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java
@@ -0,0 +1,32 @@
+package com.ruoyi.sales.dto;
+
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * <br>
+ * 閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎Dto
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/27 9:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SalesLedgerProcessRouteDto extends SalesLedgerProcessRoute {
+
+ @ApiModelProperty("宸ヨ壓璺嚎ID")
+ private Long routeId;
+
+ @ApiModelProperty(value = "璺嚎鍚嶇О")
+ private String routeName;
+
+ @ApiModelProperty("閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎")
+ List<SalesLedgerProcessRoute> list;
+
+}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesProcessCardDto.java b/src/main/java/com/ruoyi/sales/dto/SalesProcessCardDto.java
new file mode 100644
index 0000000..4ee641d
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/dto/SalesProcessCardDto.java
@@ -0,0 +1,106 @@
+package com.ruoyi.sales.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 閿�鍞鍗曟祦绋嬪崱 DTO
+ * 鏁村悎浜嗗彴璐︿俊鎭�佷骇鍝佸垪琛ㄤ互鍙婄粦瀹氱殑宸ヨ壓璺嚎
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/26
+ */
+@Data
+public class SalesProcessCardDto {
+
+ @ApiModelProperty("璁㈠崟缂栧彿")
+ private String salesContractNo;
+
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty("浜よ揣鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate deliveryDate;
+
+ @ApiModelProperty("宸ヨ壓璺嚎鎬昏")
+ private String processPathDisplay;
+
+ @ApiModelProperty("璁㈠崟鍔犲伐瑕佹眰")
+ private String orderProcessRequirement;
+
+ @ApiModelProperty("璇ョ粦瀹氱殑宸ヨ壓璺嚎鑺傜偣")
+ private List<ProcessNodeDto> routeNodes;
+
+ @ApiModelProperty("娴佺▼鍗¤鏄庣粏")
+ private List<ProcessCardItemDto> items;
+
+ // 搴曢儴淇℃伅
+ @ApiModelProperty("鎬诲悎璁℃暟閲�")
+ private BigDecimal totalQuantity;
+
+ @ApiModelProperty("鎬诲悎璁￠潰绉�")
+ private BigDecimal totalArea;
+
+ @ApiModelProperty("鍒跺崟鍛�")
+ private String register;
+
+ @ApiModelProperty("鍒跺崟鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime registerDate;
+
+ /**
+ * 鍐呴儴绫伙細瀵瑰簲浜у搧琛ㄦ牸琛�
+ */
+ @Data
+ public static class ProcessCardItemDto {
+ @ApiModelProperty("妤煎眰缂栧彿")
+ private String floorCode;
+
+ @ApiModelProperty("浜у搧鎻忚堪")
+ private String productDescription;
+
+ @ApiModelProperty("瀹�(寮ч暱)")
+ private BigDecimal width;
+
+ @ApiModelProperty("楂�")
+ private BigDecimal height;
+
+ @ApiModelProperty("鏁伴噺")
+ private BigDecimal quantity;
+
+ @ApiModelProperty("闈㈢Н(銕�)")
+ private BigDecimal area;
+
+ @ApiModelProperty("鏄庣粏鍔犲伐瑕佹眰")
+ private String processRequirement;
+
+ @ApiModelProperty("棰濆鍔犲伐鏄庣粏")
+ private List<String> extraProcesses;
+ }
+
+ /**
+ * 鍐呴儴绫伙細瀵瑰簲 SalesLedgerProcessRoute 鐨勮妭鐐逛俊鎭�
+ */
+ @Data
+ public static class ProcessNodeDto {
+ @ApiModelProperty("宸ヨ壓鑺傜偣ID")
+ private Long processRouteItemId;
+
+ @ApiModelProperty("宸ヨ壓鑺傜偣鍚嶇О")
+ private String processRouteItemName;
+
+ @ApiModelProperty("鎺掑簭鍙�")
+ private Integer dragSort;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
index 69140f3..f1edcc2 100644
--- a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
@@ -10,6 +10,7 @@
import com.ruoyi.sales.dto.SalesTrendDto;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -85,4 +86,7 @@
List<SalesTrendDto> statisticsTable(@Param("statisticsTableDto")StatisticsTableDto statisticsTableDto);
IPage<SalesLedgerDto> listSalesLedgerAndShipped(Page page, @Param("ew") SalesLedgerDto salesLedgerDto);
+
+ List<SalesLedgerProcessRoute> selectSalesProcess(Long salesLedgerId);
+
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java
index 02197cf..9bdd439 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java
@@ -55,5 +55,8 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О")
+ private String processName;
}
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index dbacb6c..d8610b4 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -6,9 +6,7 @@
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.common.enums.SaleEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.sales.dto.LossProductModelDto;
-import com.ruoyi.sales.dto.MonthlyAmountDto;
-import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -57,4 +55,8 @@
IPage<SalesLedgerDto> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page);
void saleProcessBind(SalesLedgerProcessRoute salesLedgerProcessRoute);
+
+ SalesProcessCardDto processCard(Long salesLedgerId);
+
+ SalesLedgerProcessRouteDto salesProcess(Long salesLedgerId);
}
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;
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 71ad49f..01e269c 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -5,12 +5,12 @@
<mapper namespace="com.ruoyi.sales.mapper.SalesLedgerMapper">
<select id="selectSequencesByDate" resultType="java.lang.Integer">
- SELECT CAST(SUBSTR(sales_contract_no,LENGTH(#{datePart})+1 , 3) AS SIGNED)
+ SELECT CAST(SUBSTR(sales_contract_no, LENGTH(#{datePart}) + 1, 3) AS SIGNED)
FROM sales_ledger
- WHERE sales_contract_no LIKE CONCAT('%',#{datePart},'%')
+ WHERE sales_contract_no LIKE CONCAT('%', #{datePart}, '%')
</select>
<select id="getSalesNo" resultType="com.ruoyi.sales.pojo.SalesLedger">
-
+
</select>
<select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger">
@@ -56,9 +56,9 @@
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
- T1.contract_amount as noInvoiceAmountTotal,
+ T1.contract_amount as noInvoiceAmountTotal,
T1.execution_date,
- T2.nick_name AS entry_person_name,
+ T2.nick_name AS entry_person_name,
T1.payment_method,
T1.delivery_date,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
@@ -78,25 +78,25 @@
) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
<where>
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+ AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
<if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
+ AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
</if>
<if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
+ AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
</if>
<if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
</if>
<if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
+ AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
</if>
<if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
+ AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
</where>
- order by T1.entry_date desc
+ order by T1.entry_date desc
</select>
<select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
@@ -117,10 +117,26 @@
left join sales_ledger_product slp on sl.id = slp.sales_ledger_id
left join shipping_info si on slp.id = si.sales_ledger_product_id
where si.status = '宸插彂璐�'
- <if test="ew.customerName != null and ew.customerName != '' ">
+ <if test="ew.customerName != null and ew.customerName != '' ">
and sl.customer_name like concat('%',#{ew.customerName},'%')
- </if>
+ </if>
order by sl.execution_date desc
</select>
+ <select id="selectSalesProcess" resultType="com.ruoyi.sales.pojo.SalesLedgerProcessRoute"
+ parameterType="java.lang.Long">
+ select slpr.*,
+ pri.process_name as processName
+ from sales_ledger_process_route slpr
+ left join process_route_item pri on pri.id = slpr.process_route_item_id
+ <where>
+ <if test="salesLedgerId != null">
+ AND slpr.sales_ledger_id = #{salesLedgerId}
+ </if>
+ <if test="salesLedgerId == null">
+ AND 1 = 2
+ </if>
+ </where>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3