From cbfbbc6ab15b0eac96b47e7a6214bc436e58dce2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 20:35:01 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 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 d3fc19e..8b5b490 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)
@@ -37,11 +42,21 @@
@ApiModelProperty(value= "ASN涓诲崟鏍囪瘑")
private Long asnId;
+
/**
* 骞冲彴鏍囪瘑锛堣鍙凤級
*/
@ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
/**
* 鎵╁睍瀛楁
@@ -202,9 +217,11 @@
@ApiModelProperty("鍚堟牸鏁伴噺")
+ @TableField(exist = false)
private Double safeQty;
@ApiModelProperty("涓嶅悎鏍兼暟閲�")
+ @TableField(exist = false)
private Double disQty;
/**
@@ -376,21 +393,17 @@
}
public String getIsptResult$(){
- if (null == this.isptResult){ return null; }
- switch (this.isptResult){
- case 0:
- return "鏈";
- case 1:
- return "鍚堟牸";
- case 2:
- return "涓嶅悎鏍�";
- case 3:
- return "寰呭畾";
- case 4:
- return "閮ㄥ垎鍚堟牸";
- default:
- return "";
- }
+ 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