From 3e36f73770677e756826df1b5824c8e89769659c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 23 七月 2025 15:27:10 +0800
Subject: [PATCH] 盘点功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
index 3da396a..6474f6e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
@@ -231,11 +231,15 @@
}
public String getWkType$(){
+ String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
+ if (type.equals(OrderType.ORDER_CHECK.type)) {
+ typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
+ }
if (Cools.isEmpty(this.wkType)){
return "";
}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, this.wkType));
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, typeCode).eq(DictData::getValue, this.wkType));
if (Objects.isNull(dictData)) {
return null;
}
@@ -243,11 +247,11 @@
}
public String getCheckType$(){
- if (Cools.isEmpty(this.wkType)){
+ if (Cools.isEmpty(this.checkType)){
return "";
}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_ORDER_TYPE).eq(DictData::getValue, this.wkType));
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE).eq(DictData::getValue, this.checkType));
if (Objects.isNull(dictData)) {
return null;
}
--
Gitblit v1.9.1