From 141f60bd32ea2027665a0495b6d9f538e8b7dad0 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 10 四月 2025 14:19:04 +0800 Subject: [PATCH] #修改 1. 修改收货单历史档显示 2. 修改采购PO单显示问题 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java index 0d1c981..9ea862d 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java @@ -110,11 +110,9 @@ @ApiModelProperty(value= "閲婃斁鐘舵�� 0: 姝e父 1: 宸查噴鏀� ") private Short rleStatus; - /** - * 鍚嶇О - */ -// @ApiModelProperty(value= "鍚嶇О") -// private String name; + + @ApiModelProperty("鎵ц鐘舵��") + private Short exceStatus; /** * 鐘舵�� 1: 姝e父 0: 鍐荤粨 @@ -212,6 +210,18 @@ // null // 澶囨敞 // ); + public String getExceStatus$() { + if (Cools.isEmpty(this.exceStatus)){ + return ""; + } + DictDataService dictDataService = SpringUtils.getBean(DictDataService.class); + DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_EXCE_STATUS).eq(DictData::getValue, this.exceStatus)); + if (Objects.isNull(dictData)) { + return null; + } + return dictData.getLabel(); + } + public String getType$(){ if (Cools.isEmpty(this.type)){ return ""; -- Gitblit v1.9.1