From cbb0dfaec496d441bbf4287ca8ae85c2776e50ed Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 三月 2025 13:12:39 +0800
Subject: [PATCH] #修改 1. 收货通知单明细模板修改 2. 收货通知单添加动态扩展字段
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
index 2889ab5..f03fc60 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
@@ -3,18 +3,16 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
import com.vincent.rsf.server.manager.service.*;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -142,24 +140,28 @@
* ASN鍗曟嵁,甯﹀嚭PO鍗�
*/
@ApiModelProperty(value= "ASN鍗曟嵁,甯﹀嚭PO鍗�")
+ @TableField(exist = false)
private String asnOrder;
/**
* ERP鍑瘉
*/
@ApiModelProperty(value= "ERP鍑瘉")
+ @TableField(exist = false)
private String erpToken;
/**
* ERP鍗曞彿
*/
@ApiModelProperty(value= "ERP鍗曞彿")
+ @TableField(exist = false)
private String erpOrder;
/**
* ERP搴撳瓨鍦板潃
*/
@ApiModelProperty(value= "ERP搴撳瓨鍦板潃")
+ @TableField(exist = false)
private String erpStkAdr;
/**
@@ -184,18 +186,21 @@
* 閿佸畾鍘熷洜
*/
@ApiModelProperty(value= "閿佸畾鍘熷洜")
+ @TableField(exist = false)
private String lockReason;
/**
* 閿佸畾鐘舵��
*/
@ApiModelProperty(value= "閿佸畾鐘舵��")
+ @TableField(exist = false)
private Short lockStatus;
/**
* 閿佸畾浜�
*/
@ApiModelProperty(value= "閿佸畾浜�")
+ @TableField(exist = false)
private String locker;
/**
@@ -203,6 +208,7 @@
*/
@ApiModelProperty(value= "閿佸畾鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
private Date lockedTime;
/**
--
Gitblit v1.9.1