From 14ddde5c41d8d98fc9b67ebae72b6cdbca73330b Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 25 四月 2025 20:45:10 +0800
Subject: [PATCH] 添加动态字段拦截器
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 64 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index f1e98da..4672de4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -1,15 +1,13 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -17,6 +15,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)
@@ -24,7 +23,6 @@
public class AsnOrderItem implements Serializable {
private static final long serialVersionUID = 1L;
-
/**
* ID
*/
@@ -39,10 +37,27 @@
private Long asnId;
/**
+ * 骞冲彴鏍囪瘑锛堣鍙凤級
+ */
+ @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
+ private String platItemId;
+
+ /**
+ * 鎵╁睍瀛楁
+ */
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
+
+ /**
* 瀛楁绱㈠紩
*/
@ApiModelProperty("瀛楁绱㈠紩")
private String fieldsIndex;
+
+
+ @ApiModelProperty("鎵ц鏁伴噺")
+ private Double workQty;
/**
* ASN鍗曞彿
@@ -63,16 +78,28 @@
private String poCode;
/**
+ * 璺熻釜鐮�
+ */
+ @ApiModelProperty("璺熻釜鐮�")
+ private String trackCode;
+
+ /**
* 鐗╂枡鏍囪瘑
*/
@ApiModelProperty(value= "鐗╂枡鏍囪瘑")
- private String matnrId;
+ private Long matnrId;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ @ApiModelProperty(value = "鐗╂枡缂栫爜")
+ private String matnrCode;
/**
* 鐗╂枡鍚嶇О
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
- private String matnk;
+ private String maktx;
/**
* 閫佽揣鏁伴噺
@@ -93,6 +120,11 @@
private Double purQty;
/**
+ * 搴撳瓨鎵规
+ */
+ @ApiModelProperty("搴撳瓨鎵规")
+ private String batch;
+ /**
* 閲囪喘鍗曚綅
*/
@ApiModelProperty(value= "閲囪喘鍗曚綅")
@@ -103,6 +135,12 @@
*/
@ApiModelProperty(value= "宸叉敹鏁伴噺")
private Double qty;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty("鐢熶骇鏃ユ湡")
+ private String prodTime;
/**
* 渚涘簲鍟嗙紪鐮�
@@ -140,6 +178,9 @@
@ApiModelProperty(value= "鍖呰鍚嶇О")
private String packName;
+ @ApiModelProperty("涓婃姤鐘舵�� 0: 鏈笂鎶�, 1: 宸蹭笂鎶�")
+ private Integer ntyStatus;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@@ -150,7 +191,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -190,21 +230,23 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
-
+//
public AsnOrderItem() {}
- public AsnOrderItem(Long asnId,String asnCode,Long poDetlId,String poCode,String matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,Long matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.asnId = asnId;
this.asnCode = asnCode;
this.poDetlId = poDetlId;
+ this.matnrCode = matnrCode;
this.poCode = poCode;
this.matnrId = matnrId;
- this.matnk = matnk;
+ this.maktx = matnk;
this.anfme = anfme;
this.stockUnit = stockUnit;
this.purQty = purQty;
this.purUnit = purUnit;
this.qty = qty;
+ this.ntyStatus = ntyStatus;
this.splrCode = splrCode;
this.splrName = splrName;
this.qrcode = qrcode;
--
Gitblit v1.9.1