feat(wms): 新增会计科目和财务单据相关功能
- 添加了会计科目、财务单据、日记账凭证等领域的实体类、控制器、服务接口、Mapper接口和XML映射文件 - 实现了基本的CRUD操作，包括查询、新增、修改和删除 - 优化了数据校验和批量删除逻辑
This commit is contained in:
68
klp-wms/src/main/java/com/klp/domain/vo/WmsAccountVo.java
Normal file
68
klp-wms/src/main/java/com/klp/domain/vo/WmsAccountVo.java
Normal file
@@ -0,0 +1,68 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 会计科目视图对象 wms_account
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-13
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsAccountVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 科目ID（主键）
|
||||
*/
|
||||
@ExcelProperty(value = "科目ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "主=键")
|
||||
private Long accountId;
|
||||
|
||||
/**
|
||||
* 科目编码
|
||||
*/
|
||||
@ExcelProperty(value = "科目编码")
|
||||
private String accountCode;
|
||||
|
||||
/**
|
||||
* 科目名称
|
||||
*/
|
||||
@ExcelProperty(value = "科目名称")
|
||||
private String accountName;
|
||||
|
||||
/**
|
||||
* 科目类型
|
||||
*/
|
||||
@ExcelProperty(value = "科目类型")
|
||||
private String accountType;
|
||||
|
||||
/**
|
||||
* 上级科目ID
|
||||
*/
|
||||
@ExcelProperty(value = "上级科目ID")
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 当前余额（可容忍暂时不准确，过账汇总）
|
||||
*/
|
||||
@ExcelProperty(value = "当前余额", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "可=容忍暂时不准确，过账汇总")
|
||||
private BigDecimal balance;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 财务单据视图对象 wms_financial_document
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-13
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsFinancialDocumentVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 单据ID（主键）
|
||||
*/
|
||||
@ExcelProperty(value = "单据ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "主=键")
|
||||
private Long documentId;
|
||||
|
||||
/**
|
||||
* 单据编号
|
||||
*/
|
||||
@ExcelProperty(value = "单据编号")
|
||||
private String docNo;
|
||||
|
||||
/**
|
||||
* 单据类型
|
||||
*/
|
||||
@ExcelProperty(value = "单据类型")
|
||||
private String docType;
|
||||
|
||||
/**
|
||||
* 单据日期
|
||||
*/
|
||||
@ExcelProperty(value = "单据日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date docDate;
|
||||
|
||||
/**
|
||||
* 单据金额
|
||||
*/
|
||||
@ExcelProperty(value = "单据金额")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 关联订单ID
|
||||
*/
|
||||
@ExcelProperty(value = "关联订单ID")
|
||||
private Long relatedOrderId;
|
||||
|
||||
/**
|
||||
* 单据状态
|
||||
*/
|
||||
@ExcelProperty(value = "单据状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 日记账凭证（宽松版）视图对象 wms_journal_entry
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-13
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsJournalEntryVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 分录ID（主键）
|
||||
*/
|
||||
@ExcelProperty(value = "分录ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "主=键")
|
||||
private Long entryId;
|
||||
|
||||
/**
|
||||
* 凭证编号
|
||||
*/
|
||||
@ExcelProperty(value = "凭证编号")
|
||||
private String voucherNo;
|
||||
|
||||
/**
|
||||
* 分录行号（同一凭证内序号）
|
||||
*/
|
||||
@ExcelProperty(value = "分录行号", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "同=一凭证内序号")
|
||||
private Long lineNo;
|
||||
|
||||
/**
|
||||
* 记账日期
|
||||
*/
|
||||
@ExcelProperty(value = "记账日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date entryDate;
|
||||
|
||||
/**
|
||||
* 科目ID
|
||||
*/
|
||||
@ExcelProperty(value = "科目ID")
|
||||
private Long accountId;
|
||||
|
||||
/**
|
||||
* 借方金额（可为0或负数用于调账/红冲）
|
||||
*/
|
||||
@ExcelProperty(value = "借方金额", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "可=为0或负数用于调账/红冲")
|
||||
private BigDecimal debitAmount;
|
||||
|
||||
/**
|
||||
* 贷方金额（可为0或负数用于调账/红冲）
|
||||
*/
|
||||
@ExcelProperty(value = "贷方金额", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "可=为0或负数用于调账/红冲")
|
||||
private BigDecimal creditAmount;
|
||||
|
||||
/**
|
||||
* 参考单据号
|
||||
*/
|
||||
@ExcelProperty(value = "参考单据号")
|
||||
private String referenceNo;
|
||||
|
||||
/**
|
||||
* 关联订单ID
|
||||
*/
|
||||
@ExcelProperty(value = "关联订单ID")
|
||||
private Long relatedOrderId;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 订单盈亏视图对象 wms_order_profit
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-13
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsOrderProfitVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 盈亏ID（主键）
|
||||
*/
|
||||
@ExcelProperty(value = "盈亏ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "主=键")
|
||||
private Long profitId;
|
||||
|
||||
/**
|
||||
* 订单ID
|
||||
*/
|
||||
@ExcelProperty(value = "订单ID")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 成本金额
|
||||
*/
|
||||
@ExcelProperty(value = "成本金额")
|
||||
private BigDecimal costAmount;
|
||||
|
||||
/**
|
||||
* 收入金额
|
||||
*/
|
||||
@ExcelProperty(value = "收入金额")
|
||||
private BigDecimal revenueAmount;
|
||||
|
||||
/**
|
||||
* 利润金额
|
||||
*/
|
||||
@ExcelProperty(value = "利润金额")
|
||||
private BigDecimal profitAmount;
|
||||
|
||||
/**
|
||||
* 利润率(%)
|
||||
*/
|
||||
@ExcelProperty(value = "利润率(%)")
|
||||
private BigDecimal profitRate;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
84
klp-wms/src/main/java/com/klp/domain/vo/WmsPayableVo.java
Normal file
84
klp-wms/src/main/java/com/klp/domain/vo/WmsPayableVo.java
Normal file
@@ -0,0 +1,84 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 应付款管理（宽松版）视图对象 wms_payable
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-13
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsPayableVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 应付ID（主键）
|
||||
*/
|
||||
@ExcelProperty(value = "应付ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "主=键")
|
||||
private Long payableId;
|
||||
|
||||
/**
|
||||
* 供应商ID
|
||||
*/
|
||||
@ExcelProperty(value = "供应商ID")
|
||||
private Long supplierId;
|
||||
|
||||
/**
|
||||
* 订单ID
|
||||
*/
|
||||
@ExcelProperty(value = "订单ID")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 到期日
|
||||
*/
|
||||
@ExcelProperty(value = "到期日")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date dueDate;
|
||||
|
||||
/**
|
||||
* 应付金额（可为负数用于调整）
|
||||
*/
|
||||
@ExcelProperty(value = "应付金额", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "可=为负数用于调整")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 已付金额（可为负数用于冲销）
|
||||
*/
|
||||
@ExcelProperty(value = "已付金额", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "可=为负数用于冲销")
|
||||
private BigDecimal paidAmount;
|
||||
|
||||
/**
|
||||
* 未付金额
|
||||
*/
|
||||
@ExcelProperty(value = "未付金额")
|
||||
private BigDecimal balanceAmount;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
84
klp-wms/src/main/java/com/klp/domain/vo/WmsReceivableVo.java
Normal file
84
klp-wms/src/main/java/com/klp/domain/vo/WmsReceivableVo.java
Normal file
@@ -0,0 +1,84 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 应收款管理（宽松版）视图对象 wms_receivable
|
||||
*
|
||||
* @author klp
|
||||
* @date 2025-08-13
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsReceivableVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 应收ID（主键）
|
||||
*/
|
||||
@ExcelProperty(value = "应收ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "主=键")
|
||||
private Long receivableId;
|
||||
|
||||
/**
|
||||
* 客户ID
|
||||
*/
|
||||
@ExcelProperty(value = "客户ID")
|
||||
private Long customerId;
|
||||
|
||||
/**
|
||||
* 订单ID
|
||||
*/
|
||||
@ExcelProperty(value = "订单ID")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 到期日
|
||||
*/
|
||||
@ExcelProperty(value = "到期日")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date dueDate;
|
||||
|
||||
/**
|
||||
* 应收金额（可为负数用于调整）
|
||||
*/
|
||||
@ExcelProperty(value = "应收金额", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "可=为负数用于调整")
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 已收金额（可为负数用于冲销）
|
||||
*/
|
||||
@ExcelProperty(value = "已收金额", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "可=为负数用于冲销")
|
||||
private BigDecimal paidAmount;
|
||||
|
||||
/**
|
||||
* 未收金额
|
||||
*/
|
||||
@ExcelProperty(value = "未收金额")
|
||||
private BigDecimal balanceAmount;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@ExcelProperty(value = "状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user