From 60a665f3c576f8fe368ddfaabc9117a9c5dd47bf Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 09:56:30 +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/TransferItem.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TransferItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TransferItem.java
index e9127c3..25985bd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TransferItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TransferItem.java
@@ -1,16 +1,18 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.vincent.rsf.server.manager.service.CompanysService;
+import lombok.experimental.Accessors;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.format.annotation.DateTimeFormat;
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;
@@ -20,8 +22,10 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
+@Accessors(chain = true)
@TableName("man_transfer_item")
public class TransferItem implements Serializable {
@@ -99,6 +103,15 @@
*/
@ApiModelProperty(value= "渚涘簲鍟咺D")
private Long splrId;
+
+ @TableField(exist = false)
+ @ApiModelProperty("渚涘簲鍟嗙紪鐮�")
+ private String splrCode;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("渚涘簲鍟嗗悕绉�")
+ private String splrName;
/**
* 瑙勬牸
@@ -253,6 +266,28 @@
// null // 澶囨敞
// );
+ public String getSplrName() {
+ if (null == this.splrId) { return null; }
+ CompanysService companysService = SpringUtils.getBean(CompanysService.class);
+ Companys companys = companysService.getById(this.splrId);
+ if (Objects.isNull(companys)) {
+ return null;
+ } else {
+ return companys.getName();
+ }
+ }
+
+ public String getSplrCode() {
+ if (null == this.splrId) { return null; }
+ CompanysService companysService = SpringUtils.getBean(CompanysService.class);
+ Companys companys = companysService.getById(this.splrId);
+ if (Objects.isNull(companys)) {
+ return null;
+ } else {
+ return companys.getCode();
+ }
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1