From d25c8fa670a8fea0977c85f67b13917b3bdefa89 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 14 三月 2025 17:01:24 +0800
Subject: [PATCH] fix:增加datagrid
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 31a247a..f03fc60 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
@@ -3,18 +3,16 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
import com.vincent.rsf.server.manager.service.*;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -55,6 +53,10 @@
*/
@ApiModelProperty(value= "鐗╂枡缂栫爜")
private String code;
+
+
+ @ApiModelProperty(value = "閫氱煡鍗曟槑缁嗘爣璇�")
+ private Long asnItemId;
/**
* 鍚嶇О
@@ -138,24 +140,28 @@
* ASN鍗曟嵁,甯﹀嚭PO鍗�
*/
@ApiModelProperty(value= "ASN鍗曟嵁,甯﹀嚭PO鍗�")
+ @TableField(exist = false)
private String asnOrder;
/**
* ERP鍑瘉
*/
@ApiModelProperty(value= "ERP鍑瘉")
+ @TableField(exist = false)
private String erpToken;
/**
* ERP鍗曞彿
*/
@ApiModelProperty(value= "ERP鍗曞彿")
+ @TableField(exist = false)
private String erpOrder;
/**
* ERP搴撳瓨鍦板潃
*/
@ApiModelProperty(value= "ERP搴撳瓨鍦板潃")
+ @TableField(exist = false)
private String erpStkAdr;
/**
@@ -180,18 +186,21 @@
* 閿佸畾鍘熷洜
*/
@ApiModelProperty(value= "閿佸畾鍘熷洜")
+ @TableField(exist = false)
private String lockReason;
/**
* 閿佸畾鐘舵��
*/
@ApiModelProperty(value= "閿佸畾鐘舵��")
+ @TableField(exist = false)
private Short lockStatus;
/**
* 閿佸畾浜�
*/
@ApiModelProperty(value= "閿佸畾浜�")
+ @TableField(exist = false)
private String locker;
/**
@@ -199,6 +208,7 @@
*/
@ApiModelProperty(value= "閿佸畾鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
private Date lockedTime;
/**
@@ -254,9 +264,10 @@
public StockItem() {}
- public StockItem(String stockId,Long matnrId,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(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) {
this.stockId = stockId;
this.matnrId = matnrId;
+ this.asnItemId = asnItemId;
this.code = code;
this.matnrk = matnrk;
this.anfme = anfme;
@@ -349,8 +360,8 @@
}
public String getShipperId$(){
- ShipperService service = SpringUtils.getBean(ShipperService.class);
- Shipper shipper = service.getById(this.shipperId);
+ CompanysService service = SpringUtils.getBean(CompanysService.class);
+ Companys shipper = service.getById(this.shipperId);
if (!Cools.isEmpty(shipper)){
return String.valueOf(shipper.getName());
}
--
Gitblit v1.9.1