From a1f5c7974cb66943c2d0edd285902bc34c4294c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 17:29:06 +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 | 87 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 56 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 4c92d50..42f6657 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
@@ -29,7 +29,6 @@
@Accessors(chain = true)
@TableName("man_stock")
public class Stock implements Serializable {
-
private static final long serialVersionUID = 1L;
/**
@@ -40,61 +39,40 @@
private Long id;
/**
- * ASN鍗曟嵁锛� 甯﹀嚭PO鍗�
+ * 缂栧彿
*/
- @ApiModelProperty(value= "ASN鍗曟嵁锛� 甯﹀嚭PO鍗�")
- private Long asnId;
- @ApiModelProperty("璁㈠崟缂栫爜")
- private String asnCode;
+ @ApiModelProperty(value= "缂栧彿")
+ private String code;
/**
- * ERP鍑瘉
+ * 婧愬崟鎹紪鐮�
*/
- @ApiModelProperty(value= "plat鍑瘉")
- private String platToken;
+ @ApiModelProperty(value= "婧愬崟鎹紪鐮�")
+ private String sourceCode;
/**
- * plat鍗曞彿
+ * 婧愬崟鎹甀D
*/
- @ApiModelProperty(value= "plat鍗曞彿")
- private String platOrderNo;
+ @ApiModelProperty(value= "婧愬崟鎹甀D")
+ private Long sourceId;
/**
- * plat搴撳瓨鍦板潃
+ * 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "plat搴撳瓨鍦板潃")
- private String platStkAdr;
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ private String type;
/**
- * 鍚堝悓鏍囪瘑
+ * 涓氬姟绫诲瀷
*/
- @ApiModelProperty(value= "鍚堝悓鏍囪瘑")
- private String contractId;
+ @ApiModelProperty(value= "涓氬姟绫诲瀷")
+ private Short wkType;
/**
- * 閿佸畾鍘熷洜
+ * 搴撳瓨鏁伴噺
*/
- @ApiModelProperty(value= "閿佸畾鍘熷洜")
- private String lockReason;
-
- /**
- * 閿佸畾鐘舵��
- */
- @ApiModelProperty(value= "閿佸畾鐘舵��")
- private Short lockStatus;
-
- /**
- * 閿佸畾浜�
- */
- @ApiModelProperty(value= "閿佸畾浜�")
- private String locker;
-
- /**
- * 閿佸畾鏃堕棿
- */
- @ApiModelProperty(value= "閿佸畾鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date lockedTime;
+ @ApiModelProperty(value= "搴撳瓨鏁伴噺")
+ private Double anfme;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -149,16 +127,13 @@
public Stock() {}
- 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;
- this.locker = locker;
- this.lockedTime = lockedTime;
+ public Stock(String code,String sourceCode,Long sourceId,String type,Short wkType,Double anfme,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.code = code;
+ this.sourceCode = sourceCode;
+ this.sourceId = sourceId;
+ this.type = type;
+ this.wkType = wkType;
+ this.anfme = anfme;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -189,12 +164,12 @@
// null // 澶囨敞
// );
- public String getLockedTime$(){
- if (Cools.isEmpty(this.lockedTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.lockedTime);
- }
+// public String getLockedTime$(){
+// if (Cools.isEmpty(this.lockedTime)){
+// return "";
+// }
+// return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.lockedTime);
+// }
public String getStatus$(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1