From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +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/PurchaseItem.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java
index 5d54e83..f1a9904 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/PurchaseItem.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_purchase_item")
public class PurchaseItem implements Serializable {
@@ -44,7 +48,13 @@
* erp琛屽彿
*/
@ApiModelProperty(value= "erp琛屽彿")
- private String erpId;
+ private String platItemId;
+
+ /**
+ * 鍔ㄦ�佸瓧娈电储寮�
+ */
+ @ApiModelProperty("鍔ㄦ�佸瓧娈电储寮�")
+ private String fieldsIndex;
/**
* 鐗╂枡缂栫爜
@@ -80,7 +90,7 @@
* 鏍囧噯鍖呰
*/
@ApiModelProperty(value= "鏍囧噯鍖呰")
- private Double nomQty;
+ private Integer nromQty;
/**
* ASN鍗曟嵁鏁伴噺
@@ -98,19 +108,19 @@
* 渚涘簲鍟嗗悕绉�
*/
@ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
- private String pulrName;
+ private String splrName;
/**
* 渚涘簲鍟嗙紪鐮�
*/
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String pulrCode;
+ private String splrCode;
/**
* 渚涘簲鍟嗘壒娆�
*/
@ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
- private String pulrBatch;
+ private String splrBatch;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -142,6 +152,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 +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 updateTime;
/**
@@ -165,20 +177,20 @@
public PurchaseItem() {}
- public PurchaseItem(Long purchaseId,String erpId,String matnrCode,String matnrName,String unit,Double anfme,Double qty,Double nomQty,Double asnQty,Double printQty,String pulrName,String pulrCode,String pulrBatch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public PurchaseItem(Long purchaseId,String erpItemId,String matnrCode,String matnrName,String unit,Double anfme,Double qty,Integer nromQty,Double asnQty,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.purchaseId = purchaseId;
- this.erpId = erpId;
+ this.platItemId = erpItemId;
this.matnrCode = matnrCode;
this.matnrName = matnrName;
this.unit = unit;
this.anfme = anfme;
this.qty = qty;
- this.nomQty = nomQty;
+ this.nromQty = nromQty;
this.asnQty = asnQty;
this.printQty = printQty;
- this.pulrName = pulrName;
- this.pulrCode = pulrCode;
- this.pulrBatch = pulrBatch;
+ this.splrName = splrName;
+ this.splrCode = splrCode;
+ this.splrBatch = splrBatch;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
--
Gitblit v1.9.1