From cb81c6165aa001392b8fe854217308be8dc36d0f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 13 Mar 2024 10:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F+=E5=A2=9E=E5=8A=A0=E7=BA=BF?= =?UTF-8?q?=E4=BD=93=EF=BC=88=E6=A3=80=E6=9F=A5=E5=9C=B0=E7=82=B9=EF=BC=89?= =?UTF-8?q?=EF=BC=9B=E8=B4=A8=E9=87=8F=E7=9C=8B=E6=9D=BF-=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=BC=82=E5=B8=B8=E8=B6=8B=E5=8A=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/controller/QuaController.java | 7 +++++ .../mapper/QcCheckTaskIncomeMapper.java | 2 ++ .../service/IQcCheckTaskIncomeService.java | 2 ++ .../impl/QcCheckTaskIncomeServiceImpl.java | 7 +++++ .../quality/QcCheckReportIncomeMapper.xml | 1 + .../quality/QcCheckTaskIncomeMapper.xml | 10 ++++++ .../mapper/quality/QcInterfaceMapper.xml | 31 +++++++++---------- .../mapper/quality/QcProCheckMapper.xml | 1 + 8 files changed, 45 insertions(+), 16 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index 38a2a79f..7e033ffd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -252,6 +252,13 @@ public class QuaController extends BaseController { return qcCheckTaskIncomeService.getDefectListPDA(qcDefectType); } + /**检测地点编码名称**/ + @PostMapping("/getCheckLocList") + public List getCheckLocList(@RequestBody QcDefectType qcDefectType) { + DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode()); + return qcCheckTaskIncomeService.getCheckLocList(qcDefectType); + } + /**获取生产工单列表**/ @GetMapping("/getWorkOrder") public TableDataInfo getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index 29eaf5fb..be2987fd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -108,4 +108,6 @@ public interface QcCheckTaskIncomeMapper { List getIncomeBatchList(); int updateIncomeBatchList(@Param("list") List batchRecordIds, @Param("time") Date taskTime); + + List getCheckLocList(QcDefectType qcDefectType); } 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 afea8afd..77c2e48d 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 @@ -96,4 +96,6 @@ public interface IQcCheckTaskIncomeService { List getIncomeBatchList(String poolName); int updateIncomeBatchList(List batchRecordIds , Date taskTime); + + List getCheckLocList(QcDefectType qcDefectType); } 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 abbacf45..859c39d3 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 @@ -721,4 +721,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { public int updateIncomeBatchList(List batchRecordIds , Date taskTime){ return qcCheckTaskIncomeMapper.updateIncomeBatchList(batchRecordIds ,taskTime); } + + @Override + public List getCheckLocList(QcDefectType qcDefectType) { + return qcCheckTaskIncomeMapper.getCheckLocList(qcDefectType); + } + + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 5af53236..f7f997ba 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -160,6 +160,7 @@ left join qc_check_project qcp on qcp.id = qctp.project_id left join qc_project_type qpt on qpt.project_type_code = qcp.project_type where td.belong_to = #{recordId} + order by qctp.sort + + @@ -451,4 +459,6 @@ record_id = #{item} + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml index 2b70f44a..5cba2bec 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml @@ -203,22 +203,21 @@ and CONVERT(varchar(7),feedback_time, 120) = SUBSTRING(#{ymd},0,8)