From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
index 94c834d..9b7ba65 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -22,6 +25,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_delivery_item")
public class DeliveryItem implements Serializable {
@@ -40,6 +44,9 @@
@ApiModelProperty(value= "涓诲崟鏍囪瘑")
private Long deliveryId;
+ @ApiModelProperty("涓诲崟缂栫爜")
+ private String deliveryCode;
+
/**
* erp鏄庣粏鏍囪瘑
*/
@@ -53,10 +60,16 @@
private String matnrCode;
/**
+ * 鐗╂枡ID
+ */
+ @ApiModelProperty("鐗╂枡ID")
+ private Long matnrId;
+
+ /**
* 鐗╂枡鍚嶇О
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
- private String matnrName;
+ private String maktx;
/**
* 鍔ㄦ�佸瓧娈电储寮�
@@ -112,6 +125,18 @@
@ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
private String splrBatch;
+ @ApiModelProperty("鎵规")
+ private String batch;
+
+ @ApiModelProperty("璺熻釜鐮�")
+ private String trackCode;
+
+ @ApiModelProperty("鐢熶骇鏃ユ湡")
+ private Date prodTime;
+
+ @ApiModelProperty("鍖呰")
+ private String packName;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@@ -122,7 +147,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -142,6 +166,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;
/**
@@ -155,6 +180,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;
/**
@@ -165,11 +191,12 @@
public DeliveryItem() {}
- public DeliveryItem(Long deliveryId,String platItemId,String matnrCode,String matnrName,String fieldsIndex,String unit,Double anfme,Double qty,Double nromQty,Double printQty,String splrName,String splrCode,String splrBatch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public DeliveryItem(Long deliveryId,String platItemId, Long matnrId,String matnrCode,String matnrName,String fieldsIndex,String unit,Double anfme,Double qty,Double nromQty,Double printQty,String splrName,String splrCode,String splrBatch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.deliveryId = deliveryId;
this.platItemId = platItemId;
+ this.matnrId = matnrId;
this.matnrCode = matnrCode;
- this.matnrName = matnrName;
+ this.maktx = matnrName;
this.fieldsIndex = fieldsIndex;
this.unit = unit;
this.anfme = anfme;
@@ -213,6 +240,8 @@
// null // 澶囨敞
// );
+
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1