From d187cdd28ad3222b6271d1f14a2da4571d13b40c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 27 三月 2026 15:28:02 +0800
Subject: [PATCH] feat: 销售订单打印
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 11 +
src/main/java/com/ruoyi/sales/dto/SalesOrdersDto.java | 158 ++++++++++++++++++++++++++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 149 ++++++++++++++++++++++++
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 2
4 files changed, 316 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index a7888e4..c149b52 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -11,10 +11,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
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.dto.*;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.pojo.ReceiptPayment;
@@ -377,4 +374,10 @@
return AjaxResult.success(dto);
}
+ @GetMapping("/salesOrders/{salesLedgerId}")
+ @ApiOperation("鎵撳嵃閿�鍞鍗�")
+ public AjaxResult salesOrders(@PathVariable Long salesLedgerId) {
+ SalesOrdersDto salesOrdersDto = salesLedgerService.salesOrders(salesLedgerId);
+ return AjaxResult.success(salesOrdersDto);
+ }
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesOrdersDto.java b/src/main/java/com/ruoyi/sales/dto/SalesOrdersDto.java
new file mode 100644
index 0000000..bab109f
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/dto/SalesOrdersDto.java
@@ -0,0 +1,158 @@
+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;
+
+/**
+ * <br>
+ * 閿�鍞鍗曟墦鍗癉to
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/27 14:36
+ */
+@Data
+public class SalesOrdersDto {
+
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty("椤圭洰鍚嶇О")
+ private String projectName;
+
+ @ApiModelProperty("浜у搧鍚嶇О")
+ private String productName;
+
+ @ApiModelProperty("涓氬姟鍛�")
+ private String salesman;
+
+ @ApiModelProperty("鍒跺崟鏃ユ湡")
+ @JsonFormat(pattern = "yyyy/MM/dd")
+ private LocalDateTime executionDate;
+
+ @ApiModelProperty("浜よ揣鏃ユ湡")
+ @JsonFormat(pattern = "yyyy/MM/dd")
+ private LocalDate deliveryDate;
+
+ @ApiModelProperty("閫佽揣鍦板潃")
+ private String companyAddress;
+
+ @ApiModelProperty("璁㈠崟缂栧彿")
+ private String salesContractNo;
+
+ @ApiModelProperty("浜у搧鏄庣粏")
+ private List<SalesOrderItemDto> items;
+
+ @ApiModelProperty("灏忚鏁伴噺")
+ private BigDecimal subtotalQuantity;
+
+ @ApiModelProperty("灏忚闈㈢Н")
+ private BigDecimal subtotalArea;
+
+ @ApiModelProperty("灏忚閲戦")
+ private BigDecimal subtotalAmount;
+
+ @ApiModelProperty("鍚堣鏁伴噺")
+ private BigDecimal totalQuantity;
+
+ @ApiModelProperty("鍚堣闈㈢Н")
+ private BigDecimal totalArea;
+
+ @ApiModelProperty("鍚堣閲戦")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty("鎬婚噾棰�")
+ private String totalAmountDisplay;
+
+ @ApiModelProperty("鍔犲伐瑕佹眰鍜屽娉�")
+ private String remakes;
+
+ @ApiModelProperty("鍒跺崟鍛�")
+ private String orderMaker;
+
+ @ApiModelProperty("瀹℃牳鍛�")
+ private String auditor;
+
+ @ApiModelProperty("鎵撳嵃浜�")
+ private String printPeople;
+
+ @ApiModelProperty("瀹℃牳鏃ユ湡")
+ @JsonFormat(pattern = "yyyy/MM/dd")
+ private LocalDateTime auditDate;
+
+ @ApiModelProperty("鍒跺崟鏃ユ湡(搴曢儴)")
+ @JsonFormat(pattern = "yyyy/MM/dd")
+ private LocalDateTime orderMakerDate;
+
+ @ApiModelProperty("鎵撳嵃鏃堕棿")
+ @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss")
+ private LocalDateTime printTime;
+
+ @ApiModelProperty("鍏徃鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty("鍏朵粬璐圭敤鏄庣粏")
+ private List<OtherFeeDto> otherFees;
+
+ /**
+ * 閿�鍞鍗曟槑缁� DTO
+ */
+ @Data
+ public static class SalesOrderItemDto {
+ @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 BigDecimal unitPrice;
+
+ @ApiModelProperty("閲戦")
+ private BigDecimal amount;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("鍔犲伐瑕佹眰")
+ private String processRequirement;
+ }
+
+ /**
+ * 鍏朵粬璐圭敤 DTO
+ */
+ @Data
+ public static class OtherFeeDto {
+ @ApiModelProperty("璐圭敤鍚嶇О")
+ private String feeName;
+
+ @ApiModelProperty("鍗曚环")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty("鏁伴噺")
+ private BigDecimal quantity;
+
+ @ApiModelProperty("閲戦")
+ private BigDecimal amount;
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index d8610b4..f96512a 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -59,4 +59,6 @@
SalesProcessCardDto processCard(Long salesLedgerId);
SalesLedgerProcessRouteDto salesProcess(Long salesLedgerId);
+
+ SalesOrdersDto salesOrders(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 320c362..e5dd539 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -13,6 +13,8 @@
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;
@@ -141,6 +143,8 @@
;
@Autowired
private SysUserMapper sysUserMapper;
+
+ private final ICustomerRegionsService customerRegionsService;
@Override
public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
@@ -1031,6 +1035,151 @@
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;
+ }
+
private int findFirstMissingSequence(List<Integer> sequences) {
if (sequences.isEmpty()) {
return 1;
--
Gitblit v1.9.3