From 455950c1d7ca4406c9b7ff60eb30f5d4cc4ece8e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 20:37:58 +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/AsnOrderItem.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index 49b50fa..70a6250 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -5,7 +5,11 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@@ -17,6 +21,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Map;
+import java.util.Objects;
@Data
@Accessors(chain = true)
@@ -202,9 +207,11 @@
@ApiModelProperty("鍚堟牸鏁伴噺")
+ @TableField(exist = false)
private Double safeQty;
@ApiModelProperty("涓嶅悎鏍兼暟閲�")
+ @TableField(exist = false)
private Double disQty;
/**
@@ -375,4 +382,18 @@
}
}
+ public String getIsptResult$(){
+ if (Cools.isEmpty(this.isptResult)){
+ return null;
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
+ .eq(DictData::getValue, this.isptResult));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
}
--
Gitblit v1.9.1