From 16f8d56d61ce93930f9f29e8fbd465de5af90370 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 29 四月 2025 09:12:25 +0800 Subject: [PATCH] #wms端生成任务优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java index 7cd2470..85bfad8 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java @@ -52,7 +52,10 @@ private String asnCode; @ApiModelProperty("璐ㄦ鐘舵��") - private String isptStatus; + private Short isptStatus; + + @ApiModelProperty("璐ㄦ缁撴灉") + private Short isptResult; /** * 涓氬姟绫诲瀷 @@ -171,12 +174,23 @@ // null // 澶囨敞 // ); + public String getwkType$() { + if (null == this.wkType) {return null;} + DictDataService dictDataService = SpringUtils.getBean(DictDataService.class); + DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>() + .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE) + .eq(DictData::getValue, this.wkType)); + if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) { + return null; + } + return dictDatas.getLabel(); + } 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_SYS_TASK_TYPE) + .eq(DictData::getDictTypeCode, DictTypeCode.DICT_QLY_INSPECT_STATUS) .eq(DictData::getValue, this.isptStatus)); if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) { return null; -- Gitblit v1.9.1