From 0345d3175861c5612e937487770a5ba4e8468b14 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 10 五月 2025 09:49:52 +0800
Subject: [PATCH] 收货单打印功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 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 f4ea03f..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)
@@ -200,6 +205,15 @@
@ApiModelProperty("璐ㄦ鐘舵��")
private Short isptStatus;
+
+ @ApiModelProperty("鍚堟牸鏁伴噺")
+ @TableField(exist = false)
+ private Double safeQty;
+
+ @ApiModelProperty("涓嶅悎鏍兼暟閲�")
+ @TableField(exist = false)
+ private Double disQty;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@@ -369,21 +383,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