From 8edc8701512d6a02492c8f8d38c05a4253650117 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 08:19:22 +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 | 4 +---
1 files changed, 1 insertions(+), 3 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 8a34244..7abbf6c 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
@@ -13,7 +13,6 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -21,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")
@@ -390,7 +388,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