From 5ea5d085cc7c9a1aea3d4ee7e3a9c93ea05a2eb1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:16 +0800
Subject: [PATCH] 盘点功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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 48363f4..06544b1 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
@@ -4,6 +4,7 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.*;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,6 +22,7 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
+import java.util.Map;
@Data
@Accessors(chain = true)
@@ -114,6 +116,23 @@
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
private String splrCode;
+ @ApiModelProperty("渚涘簲鍟咺D")
+ private Long splrId;
+
+ /**
+ * 骞冲彴鏍囪瘑锛堣鍙凤級
+ */
+ @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
/**
* 搴撳瓨鎵规
*/
@@ -138,6 +157,8 @@
@ApiModelProperty(value= "璺熻釜鐮�")
private String trackCode;
+ @ApiModelProperty("瀛楁绱㈠紩")
+ private String fieldsIndex;
/**
* 鏉″舰鐮�
*/
@@ -155,6 +176,10 @@
*/
@ApiModelProperty(value= "鍖呰鍚嶇О")
private String packName;
+
+ @ApiModelProperty("姹囨�荤被鍨�")
+ @TableField(exist = false)
+ private String aggType;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -186,6 +211,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -199,6 +225,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -207,6 +234,11 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
+
public StockItem() {}
public StockItem(Long orderId,String orderCode,Long sourceItemId,Long matnrId,String matnrCode,String maktx,Double anfme,String stockUnit,Double workQty,Double purQty,String purUnit,Double qty,String splrCode,String batch,String splrBatch,String splrName,String trackCode,String barcode,String prodTime,String packName,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
--
Gitblit v1.9.1