From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +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/StockItem.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 f9860c8..d256b0c 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.vincent.rsf.server.manager.service.*;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -22,6 +23,7 @@
import java.io.Serializable;
@Data
+@Accessors(chain = true)
@TableName("man_stock_item")
public class StockItem implements Serializable {
@@ -44,7 +46,7 @@
* 搴撳瓨澶栭敭鏍囪瘑
*/
@ApiModelProperty(value= "搴撳瓨澶栭敭鏍囪瘑")
- private String stockId;
+ private Long stockId;
/**
* 鐗╂枡鏍囪瘑
@@ -56,7 +58,7 @@
* 鐗╂枡缂栫爜
*/
@ApiModelProperty(value= "鐗╂枡缂栫爜")
- private String code;
+ private String matnrCode;
@ApiModelProperty(value = "閫氱煡鍗曟槑缁嗘爣璇�")
@@ -66,7 +68,7 @@
* 鍚嶇О
*/
@ApiModelProperty(value= "鍚嶇О")
- private String matnrk;
+ private String maktx;
/**
* 鏁伴噺
@@ -190,29 +192,24 @@
* 閿佸畾鍘熷洜
*/
@ApiModelProperty(value= "閿佸畾鍘熷洜")
- @TableField(exist = false)
private String lockReason;
/**
* 閿佸畾鐘舵��
*/
@ApiModelProperty(value= "閿佸畾鐘舵��")
- @TableField(exist = false)
private Short lockStatus;
/**
* 閿佸畾浜�
*/
@ApiModelProperty(value= "閿佸畾浜�")
- @TableField(exist = false)
private String locker;
/**
* 閿佸畾鏃堕棿
*/
@ApiModelProperty(value= "閿佸畾鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField(exist = false)
private Date lockedTime;
/**
@@ -268,12 +265,12 @@
public StockItem() {}
- public StockItem(String stockId,Long matnrId,Long asnItemId, String code,String matnrk,Double anfme,Double workQty,Double qty,Double weight,String unit,Long shipperId,String splrId,String brand,String batch,String prodTime,Long inspectId,String splrBtch,String asnOrder,String erpToken,String erpOrder,String erpStkAdr,Long locId,String barcode,Double purPrice,String lockReason,Short lockStatus,String locker,Date lockedTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public StockItem(Long stockId,Long matnrId,Long asnItemId, String code,String matnrk,Double anfme,Double workQty,Double qty,Double weight,String unit,Long shipperId,String splrId,String brand,String batch,String prodTime,Long inspectId,String splrBtch,String asnOrder,String erpToken,String erpOrder,String erpStkAdr,Long locId,String barcode,Double purPrice,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.stockId = stockId;
this.matnrId = matnrId;
this.asnItemId = asnItemId;
- this.code = code;
- this.matnrk = matnrk;
+ this.matnrCode = code;
+ this.maktx = matnrk;
this.anfme = anfme;
this.workQty = workQty;
this.qty = qty;
--
Gitblit v1.9.1