From cba29f2b769ae2010dd91ec5ed4e4199ead90ce6 Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期三, 02 四月 2025 18:49:03 +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/Stock.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
index 670c7d5..4c92d50 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
@@ -2,6 +2,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
@@ -24,6 +26,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_stock")
public class Stock implements Serializable {
@@ -40,25 +43,27 @@
* ASN鍗曟嵁锛� 甯﹀嚭PO鍗�
*/
@ApiModelProperty(value= "ASN鍗曟嵁锛� 甯﹀嚭PO鍗�")
- private String asnOrder;
+ private Long asnId;
+ @ApiModelProperty("璁㈠崟缂栫爜")
+ private String asnCode;
/**
* ERP鍑瘉
*/
- @ApiModelProperty(value= "ERP鍑瘉")
- private String erpToken;
+ @ApiModelProperty(value= "plat鍑瘉")
+ private String platToken;
/**
- * ERP鍗曞彿
+ * plat鍗曞彿
*/
- @ApiModelProperty(value= "ERP鍗曞彿")
- private String erpOrder;
+ @ApiModelProperty(value= "plat鍗曞彿")
+ private String platOrderNo;
/**
- * ERP搴撳瓨鍦板潃
+ * plat搴撳瓨鍦板潃
*/
- @ApiModelProperty(value= "ERP搴撳瓨鍦板潃")
- private String erpStkAdr;
+ @ApiModelProperty(value= "plat搴撳瓨鍦板潃")
+ private String platStkAdr;
/**
* 鍚堝悓鏍囪瘑
@@ -144,11 +149,11 @@
public Stock() {}
- public Stock(String asnOrder,String erpToken,String erpOrder,String erpStkAdr,String contractId,String lockReason,Short lockStatus,String locker,Date lockedTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.asnOrder = asnOrder;
- this.erpToken = erpToken;
- this.erpOrder = erpOrder;
- this.erpStkAdr = erpStkAdr;
+ public Stock(String asnOrder,String platToken,String platOrder,String platStkAdr,String contractId,String lockReason,Short lockStatus,String locker,Date lockedTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.platOrderNo = asnOrder;
+ this.platToken = platToken;
+ this.platOrderNo = platOrder;
+ this.platStkAdr = platStkAdr;
this.contractId = contractId;
this.lockReason = lockReason;
this.lockStatus = lockStatus;
--
Gitblit v1.9.1