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/QlyIsptItem.java | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java index 29bb484..f2104be 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java @@ -36,46 +36,41 @@ @ApiModelProperty(value= "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - /** * 涓诲崟ID */ @ApiModelProperty(value= "涓诲崟ID") private Long ispectId; + @ApiModelProperty("璐ㄦ鍗曠姸鎬�") + private String isptStatus; @ApiModelProperty("鍗曟嵁鏄庣粏ID") private Long asnItemId; - /** * 缂栧彿 */ @ApiModelProperty(value= "缂栧彿") private String matnrCode; - /** * 鐗╂枡鍚嶇О */ @ApiModelProperty(value= "鐗╂枡鍚嶇О") private String maktx; - /** * 鏍囩 */ @ApiModelProperty(value= "鏍囩") private String label; - /**鈭� * 渚涘簲鍟嗗悕绉� */ @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�") private String splrName; - /** * 渚涘簲鍟嗘壒娆� */ @ApiModelProperty(value= "渚涘簲鍟嗘壒娆�") private String splrBatch; - /** * 搴撳瓨鎵规 */ @@ -214,6 +209,18 @@ // null // 澶囨敞 // ); + public String getIsptStatus$() { + if (null == this.isptStatus) {return null; } + DictDataService dictDataService = SpringUtils.getBean(DictDataService.class); + DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>() + .eq(DictData::getDictTypeCode, DictTypeCode.DICT_QLY_INSPECT_STATUS) + .eq(DictData::getValue, this.isptStatus)); + if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) { + return null; + } + return dictDatas.getLabel(); + } + public String getIsptResult$() { if (null == this.isptResult) {return null; } DictDataService dictDataService = SpringUtils.getBean(DictDataService.class); -- Gitblit v1.9.1