From 706703df2c073386556b49d31bcdbc81b3b865f0 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 22 五月 2025 15:18:24 +0800 Subject: [PATCH] #出库作业 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 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..b2f34f3 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; /** * 鏉″舰鐮� */ @@ -156,6 +177,10 @@ @ApiModelProperty(value= "鍖呰鍚嶇О") private String packName; + @ApiModelProperty("姹囨�荤被鍨�") + @TableField(exist = false) + private String aggType; + /** * 鐘舵�� 1: 姝e父 0: 鍐荤粨 */ @@ -166,7 +191,6 @@ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") - @TableLogic private Integer deleted; /** @@ -186,6 +210,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 +224,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 +233,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