新增凭证管理

2026-08-12 12:42:07 +08:00
parent 7f31952bff
commit 4ad3108c4d
28 changed files with 732 additions and 2 deletions
@@ -59,4 +59,10 @@ public class FileTaskCreateDTO implements Serializable {
     */
    @Schema(description = "是否强制创建新任务，默认 false，如果存在相同md5的任务，会创建失败，true则新创建一个任务")
    private boolean force;
+
+	@Schema(description = "业务类型")
+	private String businessType;
+
+	@Schema(description = "业务标识")
+	private String businessId;
 }
@@ -91,6 +91,12 @@ public class FileTask implements Serializable {
    @Schema(description = "状态 uploading:正在上传  completed：上传完成 failed：上传失败 paused：已暂停")
    private String status;

+	@Schema(description = "业务类型")
+	private String businessType;
+
+	@Schema(description = "业务标识")
+	private String businessId;
+
    /**
     * 创建人-用户名称
     */
@@ -87,6 +87,12 @@ public class FileTaskVO implements Serializable {
    @Schema(description = "状态 uploading:正在上传  completed：上传完成 failed：上传失败 paused：已暂停")
    private String status;

+	@Schema(description = "业务类型")
+	private String businessType;
+
+	@Schema(description = "业务标识")
+	private String businessId;
+
    /**
     * 创建人-用户名称
     */
@@ -0,0 +1,17 @@
+package org.springblade.transport.pojo.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VoucherManageSubmitRequest {
+	private Long id;
+	private String voucherBatchNo;
+	private Long projectId;
+	private String projectName;
+	private String fileName;
+	private String fileUrl;
+	private Long fileTaskId;
+	private List<Long> waybillImportBatchIds;
+}
@@ -0,0 +1,10 @@
+package org.springblade.transport.pojo.dto;
+
+import lombok.Data;
+
+/** 创建执行凭证上传草稿。 */
+@Data
+public class VoucherUploadDraftRequest {
+	private Long projectId;
+	private String fileName;
+}
@@ -53,6 +53,9 @@ public class CustomerInvoiceInfo extends TenantEntity {
 	@Schema(description = "受票方名称")
 	private String invoiceTitle;

+	@Schema(description = "发票类型")
+	private String invoiceType;
+
 	@Schema(description = "纳税人识别号")
 	private String taxNo;

@@ -0,0 +1,34 @@
+package org.springblade.transport.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+
+/** 凭证批次。 */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_voucher_manage")
+@Schema(description = "凭证管理")
+public class VoucherManage extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+	private Long projectId;
+	private String projectName;
+	private String voucherBatchNo;
+	private String waybillBatchNo;
+	private String fileName;
+	private String fileUrl;
+	private Long fileTaskId;
+	private String uploadSource;
+	private String carrierName;
+	private String processStatus;
+	private Integer voucherCount;
+	private Integer relatedWaybillCount;
+	private Integer unRelatedWaybillCount;
+	private String auditStatus;
+}
@@ -0,0 +1,21 @@
+package org.springblade.transport.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+
+/** 凭证与运单批次关联。 */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_voucher_waybill_batch")
+public class VoucherWaybillBatch extends TenantEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+	private Long voucherId;
+	private Long waybillImportBatchId;
+	private String waybillBatchNo;
+	private Integer waybillCount;
+}
@@ -0,0 +1,19 @@
+package org.springblade.transport.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.transport.pojo.entity.VoucherManage;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class VoucherManageVO extends VoucherManage {
+	@Serial private static final long serialVersionUID = 1L;
+	@TableField(exist = false) private String createUserName;
+	@TableField(exist = false) private String updateUserName;
+	@TableField(exist = false) private LocalDateTime createTimeStart;
+	@TableField(exist = false) private LocalDateTime createTimeEnd;
+}