From 5829fb5f7252bb433b9b8f24d73d50afac1f224f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 13:21:12 +0800
Subject: [PATCH] #修改 1. 字段优化 2. 别名字段返回
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java | 12 +++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java | 1 -
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 17 +++++++++++++++++
6 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 4d4d0c4..2cd2283 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -442,7 +442,7 @@
.setMatnrId(matnr.getId())
.setStockUnit(matnr.getStockUnit());
QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
- .eq(QlyInspect::getAsnItemId, asnOrderItem.getId()));
+ .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
if (!Objects.isNull(inspect)) {
//set 璐ㄦ缁撴灉
detlsDto.setInspect(inspect.getStatus$());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
index f1a1117..5bd9c60 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -66,7 +66,7 @@
return R.ok(qlyInspectService.getUnInspect());
}
- @PostMapping("/qlyInspect/reports")
+ @PostMapping("/qlyInspect/selected")
@ApiOperation("閫夋嫨璐ㄦ鍗曟嵁")
@PreAuthorize("hasAuthority('manager:qlyInspect:update')")
public R selectedOrder(IsptOrderParam param) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java
index c3a6ea5..bcae18a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptOrderParam.java
@@ -3,7 +3,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import jdk.jpackage.internal.Log;
import lombok.Data;
import lombok.experimental.Accessors;
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..7d31fb2 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
@@ -176,7 +176,7 @@
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;
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 d677b37..29bb484 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
@@ -4,6 +4,10 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
+import java.util.Objects;
@Data
@Accessors(chain = true)
@@ -209,6 +214,18 @@
// null // 澶囨敞
// );
+ public String getIsptResult$() {
+ if (null == this.isptResult) {return null; }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
+ .eq(DictData::getValue, this.isptResult));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getLabel();
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
index e9992e7..f4881fe 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
@@ -25,7 +25,7 @@
public final static String DICT_SYS_DEVICE_TYPE = "sys_device_type";
/**
- * 鍗曟嵁涓氬姟绫诲瀷
+ * 鍗曟嵁涓氬姟绫诲瀷DICT_SYS_TASK_TYPE
*/
public final static String DICT_SYS_BUSINESS_TYPE = "sys_business_type";
@@ -34,4 +34,14 @@
*/
public final static String DICT_SYS_ORDER_TYPE = "sys_order_type";
+ /**
+ * 璐ㄦ鐘舵��
+ */
+ public final static String DICT_QLY_INSPECT_STATUS = "sys_qly_inspect_status";
+
+ /**
+ * 璐ㄦ缁撹
+ */
+ public final static String DICT_INSPECT_RESULT = "sys_inspect_result";
+
}
--
Gitblit v1.9.1