From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位，审核
---
src/main/java/com/ruoyi/warehouse/pojo/Documentation.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
index f6c58ec..0c1a612 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
@@ -6,6 +6,7 @@
import java.time.LocalDateTime;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -27,11 +28,11 @@
private Long id;
/**
- * 绫诲埆鍚嶇О
+ * 绫诲埆鍚嶇Оid
*/
- @Excel(name = "绫诲埆鍚嶇О")
- @ApiModelProperty(value = "绫诲埆鍚嶇О")
- private String categoryName;
+ @Excel(name = "绫诲埆鍚嶇Оid")
+ @ApiModelProperty(value = "绫诲埆鍚嶇Оid")
+ private Long documentClassificationId;
/**
* 鏂囨。鍚嶇О
@@ -45,7 +46,7 @@
*/
@Excel(name = "鏂囨。缂栧彿")
@ApiModelProperty(value = "鏂囨。缂栧彿")
- private Long docNumber;
+ private String docNumber;
/**
* 骞翠唤
@@ -71,8 +72,10 @@
/**
* 鏂囨。鏃ユ湡
*/
- @Excel(name = "鏂囨。鏃ユ湡")
+
+ @Excel(name = "鏂囨。鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
@ApiModelProperty(value = "鏂囨。鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime docDate;
/**
@@ -148,19 +151,19 @@
* 鍒涘缓鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT)
- private Long createUser;
+ private Integer createUser;
/**
* 淇敼鏃堕棿
*/
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
- @TableField(fill = FieldFill.UPDATE)
- private Long updateUser;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
/**
* 绉熸埛ID
--
Gitblit v1.9.3