From d107c1cca034fb6cdde077656fa1776d09a4442f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 四月 2025 14:24:52 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 ad054a0..f9860c8 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,19 +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;
import com.vincent.rsf.framework.common.Cools;
@@ -23,7 +20,6 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("man_stock_item")
@@ -37,6 +33,12 @@
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ * 浠诲姟鏄庣粏ID
+ */
+ @ApiModelProperty("浠诲姟鏄庣粏ID")
+ private Long taskItemId;
/**
* 搴撳瓨澶栭敭鏍囪瘑
@@ -142,24 +144,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;
/**
@@ -184,18 +190,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;
/**
@@ -203,6 +212,7 @@
*/
@ApiModelProperty(value= "閿佸畾鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
private Date lockedTime;
/**
@@ -354,8 +364,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());
}
@@ -375,7 +385,7 @@
QlyInspectService service = SpringUtils.getBean(QlyInspectService.class);
QlyInspect qlyInspect = service.getById(this.inspectId);
if (!Cools.isEmpty(qlyInspect)){
- return String.valueOf(qlyInspect.getName());
+ return String.valueOf(qlyInspect.getCode());
}
return null;
}
@@ -384,7 +394,7 @@
LocService service = SpringUtils.getBean(LocService.class);
Loc loc = service.getById(this.locId);
if (!Cools.isEmpty(loc)){
- return String.valueOf(loc.getName());
+ return String.valueOf(loc.getCode());
}
return null;
}
--
Gitblit v1.9.1