From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Transfer.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Transfer.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Transfer.java
index 1d64745..0f39b16 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Transfer.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Transfer.java
@@ -56,13 +56,13 @@
private Integer type;
/**
- * 鏉ユ簮: 1: ERP绯荤粺 2: WMS绯荤粺鐢熸垚 3: EXCEL瀵煎叆 4: QMS绯荤粺
+ * 鏉ユ簮: 1: ERP绯荤粺 2: WMS绯荤粺鐢熸垚 3: EXCEL瀵煎叆 4: QMS绯荤粺
*/
@ApiModelProperty(value= "鏉ユ簮: 1: ERP绯荤粺 2: WMS绯荤粺鐢熸垚 3: EXCEL瀵煎叆 4: QMS绯荤粺 ")
private Integer source;
/**
- * 鎵ц鐘舵��: 0: 鏈墽琛� 1: 鎵ц涓� 2: 鎵ц瀹屾垚
+ * 鎵ц鐘舵��: 0: 鏈墽琛� 1: 鎵ц涓� 2: 鎵ц瀹屾垚
*/
@ApiModelProperty(value= "鎵ц鐘舵��: 0: 鏈墽琛� 1: 鎵ц涓� 2: 鎵ц瀹屾垚 ")
private Short exceStatus;
@@ -116,13 +116,13 @@
private String tarAreaName;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
@@ -230,13 +230,25 @@
}
}
+ public String getType$() {
+ if (null == this.type){ return null; }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.SYS_TRANSFER_TYPE)
+ .eq(DictData::getValue, this.type));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
public String getExceStatus$() {
if (Cools.isEmpty(this.exceStatus)){
- return "";
+ return null;
}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.SYS_ORDER_SOURCE)
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_EXCE_STATUS)
.eq(DictData::getValue, this.exceStatus));
if (Objects.isNull(dictData)) {
return null;
--
Gitblit v1.9.1