From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能
---
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 9462b98..fb2004a 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -1,19 +1,97 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.ReceiptPayment;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
@Data
public class ReceiptPaymentDto extends ReceiptPayment {
- @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Schema(description = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "鐘舵��")
+ @Excel(name = "鐘舵��")
+ private String statusName;
+
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty(value = "鏌ヨ鏂囨湰")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�绁ㄦ棩鏈�",width = 30,dateFormat = "yyyy-MM-dd")
+ @Schema(description = "寮�绁ㄦ棩鏈�")
+ private Date invoiceDate;
+
+ @TableField(exist = false)
+ private String invoiceDateStart;
+ @TableField(exist = false)
+ private String invoiceDateEnd;
+
+ @Schema(description = "鏌ヨ鏂囨湰")
private String searchText;
+ @Schema(description = "閿�鍞彴璐ales_ledger")
+ @Excel(isExport = false)
+ private Long salesLedgerId;
+
+ @Schema(description = "閿�鍞悎鍚屽彿")
+ @Excel(name = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @Schema(description = "瀹㈡埛鍚嶇ОID")
+ @Excel(isExport = false)
+ private Integer customerId;
+
+ @Schema(description = "鍙戠エ鍙�")
+ @Excel(name = "鍙戠エ鍙�")
+ private String invoiceNo;
+
+ @Schema(description = "鍙戠エ閲戦")
+ @Excel(name = "鍙戠エ閲戦")
+ private BigDecimal invoiceTotal;
+
+ @Schema(description = "绋庣巼锛�%锛�")
+ @Excel(name = "绋庣巼锛�%锛�")
+ private BigDecimal taxRate;
+
+ @Schema(description = "浜у搧澶х被")
+ @Excel(name = "浜у搧澶х被")
+ private String productCategory;
+
+ @Schema(description = "鍥炴閲戦")
+ @Excel(name = "鍥炴閲戦")
+ private BigDecimal receiptPaymentAmountTotal;
+
+ @Schema(description = "寰呭洖娆鹃噾棰�")
+ @Excel(name = "寰呭洖娆鹃噾棰�")
+ private BigDecimal noReceiptAmount;
+
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private Boolean status;
+
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private String receiptPaymentDateStart;
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private String receiptPaymentDateEnd;
+
+ @Schema(description = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
+
+
}
--
Gitblit v1.9.3