From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index b74d863..e79796a 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -1,11 +1,14 @@
package com.ruoyi.purchase.pojo;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
/**
* 鏉ョエ鐧昏瀵硅薄 ticket_registration
@@ -23,6 +26,13 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ * 鐘舵��
+ */
+ @Excel(name = "鐘舵��")
+ @TableField(exist = false)
+ private String statusName;
/**
* 閲囪喘鍙拌处id
@@ -52,16 +62,47 @@
*/
private String customerName;
- /**
- * 涓氬姟鍛�
- */
- @Excel(name = "涓氬姟鍛�")
- private String businessPerson;
+// /**
+// * 涓氬姟鍛�
+// */
+// @Excel(name = "涓氬姟鍛�")
+// private String businessPerson;
+//
+// /**
+// * 涓氬姟鍛榠d
+// */
+// private Long businessPersonId;
/**
- * 涓氬姟鍛榠d
+ * 鍙戠エ鍙�
*/
- private Long businessPersonId;
+ @Excel(name = "鍙戠エ鍙�")
+ private String invoiceNumber;
+
+ /**
+ * 鍙戠エ閲戦锛堝厓锛�
+ */
+ @Excel(name = "鍙戠エ閲戦(鍏�)")
+ private BigDecimal invoiceAmount;
+
+ /**
+ * 寮�绁ㄤ汉ID
+ */
+ @Excel(name = "寮�绁ㄤ汉")
+ private String issUerId;
+
+ /**
+ * 寮�绁ㄤ汉
+ */
+ @Excel(name = "寮�绁ㄤ汉")
+ private String issUer;
+
+ /**
+ * 寮�绁ㄦ棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+ @Excel(name = "寮�绁ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate issueDate;
/**
* 椤圭洰鍚嶇О
@@ -91,7 +132,35 @@
*/
private Long salesLedgerId;
+ /**
+ * 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
+ */
+ private BigDecimal contractAmount;
+
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "宸蹭粯娆炬�婚噾棰�")
+ @TableField(exist = false)
+ @Excel(name = "宸蹭粯娆炬�婚噾棰�")
+ private BigDecimal paymentAmountTotal;
+
+ @ApiModelProperty(value = "鏈粯娆炬�婚噾棰�")
+ @TableField(exist = false)
+ @Excel(name = "鏈粯娆炬�婚噾棰�")
+ private BigDecimal unPaymentAmountTotal;
+
+ @TableField(exist = false)
+ private Boolean status;
+
+ @TableField(exist = false)
+ private String issueDateStart;
+ @TableField(exist = false)
+ private String issueDateEnd;
+
+ @TableField(exist = false)
+ private String supplierNameOrContractNo;
+
+ @ApiModelProperty(value = "褰曞叆鏃堕棿")
+ private LocalDate enterDate;
}
--
Gitblit v1.9.3