From 0c8a2d35fdf8e402ad34355c545c69a1750d759c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 09 十二月 2025 17:26:04 +0800
Subject: [PATCH] yys 1.销售台账同步日期 2.销售台账返回车牌号 3.库存管理分组条件修改 4.排产增加产线字段 5.首页增加条幅提醒
---
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index 0594a58..776eaf7 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,38 +26,67 @@
// 鍏ュ簱鏃堕棿
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ュ簱鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date inboundDate;
+
+ @TableField(exist = false)
+ private String timeStr;
+
+ /**
+ * 寰呭嚭搴撴暟閲�
+ */
+ @Excel(name = "寰呭嚭搴撴暟閲�")
+ @TableField(exist = false)
+ private BigDecimal inboundNum0;
+ /**
+ * 鍑哄簱鏁伴噺
+ */
+ @Excel(name = "鍑哄簱鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal totalInboundNum;
// 鐗╁搧绫诲瀷
+ @Excel(name = "鐗╁搧绫诲瀷")
private String itemType;
// 鍏ュ簱鎵规
+ @Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
// 鍏ュ簱鏁伴噺
+ @Excel(name = "鍏ュ簱鏁伴噺")
private BigDecimal inboundNum;
// 渚涘簲鍟嗗悕绉�
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
// 浜у搧澶х被
+ @Excel(name = "浜у搧澶х被")
private String productCategory;
// 瑙勬牸鍨嬪彿
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
// 鍗曚綅
+ @Excel(name = "鍗曚綅")
private String unit;
// 鍚◣鍗曚环
+ @Excel(name = "鍚◣鍗曚环")
private BigDecimal taxInclusiveUnitPrice;
// 鍚◣鎬讳环
+ @Excel(name = "鍚◣鎬讳环")
private BigDecimal taxInclusiveTotalPrice;
// 绋庣巼(%)
+ @Excel(name = "绋庣巼(%)")
private BigDecimal taxRate;
// 涓嶅惈绋庢�讳环
+ @Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
/**
- * 鍑哄嚭搴撶敤鎴�
+ * 鍏ュ簱鐢ㄦ埛
*/
+ @Excel(name = "鍏ュ簱鐢ㄦ埛")
private String createBy;
/**
* 鍏ュ簱鐢ㄦ埛id
*/
@TableField(fill = FieldFill.INSERT)
- private Long createUser;
+ private Integer createUser;
/**
* 鍏ュ簱鏃堕棿
@@ -70,7 +100,7 @@
* 淇敼鑰�
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Long updateUser;
+ private Integer updateUser;
/**
* 淇敼鏃堕棿
--
Gitblit v1.9.3