From 56553b4e8c8c6cf974ebb69ca6f06c30d7797b48 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Tue, 21 May 2024 11:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=80=BC=E4=BF=AE=E5=99=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../QcCheckTaskIncomeController.java | 4 ++++
.../service/IQcCheckTaskIncomeService.java | 2 ++
.../impl/QcCheckReportIncomeServiceImpl.java | 2 --
.../impl/QcCheckTaskIncomeServiceImpl.java | 20 +++++++++++++++++++
4 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
index ca699691..9e318ff9 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
@@ -471,5 +471,9 @@ public class QcCheckTaskIncomeController extends BaseController {
dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName());
return R.ok();
}
+ @GetMapping("/getWeightValue/{id}")
+ public AjaxResult getWeightValue(@PathVariable String id) {
+ return success(qcCheckTaskIncomeService.getWeightValue(id));
+ }
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java
index 1ef4918f..b0c97b03 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java
@@ -100,4 +100,6 @@ public interface IQcCheckTaskIncomeService {
List<QcDefectType> getCheckLocList(QcDefectType qcDefectType);
List<String> getTodayIncomeLists();
+
+ public String getWeightValue(String id);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java
index 6f6b40bf..9cd273c5 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java
@@ -1,8 +1,6 @@
package com.op.quality.service.impl;
-import com.alibaba.fastjson2.JSONArray;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.uuid.IdUtils;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index e66489a3..2dfb4189 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -86,6 +86,8 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
@Autowired
private IQcCheckUnqualifiedService qcCheckUnqualifiedService;
+ @Autowired
+ private QcProCheckService qcProCheckService;
/**
* 查询来料检验
@@ -879,4 +881,22 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
}
+ @Override
+ public String getWeightValue(String id) {
+ if (StringUtils.isEmpty(id)) {
+ return "";
+ }
+ QcCheckTaskDetail qcCheckTaskDetail = new QcCheckTaskDetail();
+ qcCheckTaskDetail.setRecordId(id);
+
+ ///获取当前所选工厂
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String key = "#header.poolName";
+ String factoryCode = request.getHeader(key.substring(8));
+ qcCheckTaskDetail.setFactoryCode(factoryCode);
+
+ return qcProCheckService.getWeightInfo(qcCheckTaskDetail);
+ }
+
+
}