From c58ab6cb04b41b92eea6bed139859dc61a179e0e Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 1 Apr 2024 11:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=84=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/controller/QcMaterialGroupController.java | 2 +- .../com/op/quality/service/impl/QcMaterialGroupServiceImpl.java | 2 ++ .../src/main/resources/mapper/quality/QcMaterialGroupMapper.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java index ba18a20d..1506d925 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java @@ -44,7 +44,7 @@ public class QcMaterialGroupController extends BaseController { List list = qcMaterialGroupService.selectQcMaterialGroupList(qcMaterialGroup); return getDataTable(list); } - + @GetMapping("/getOriginalGroupList") public TableDataInfo getOriginalGroupList(QcMaterialGroup qcMaterialGroup) { List list = qcMaterialGroupService.getOriginalGroupList(qcMaterialGroup); return getDataTable(list); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java index dba193e8..b4ac41c6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java @@ -48,6 +48,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { * @return 物料组 */ @Override + @DS("#header.poolName") public QcMaterialGroup selectQcMaterialGroupById(String id) { return qcMaterialGroupMapper.selectQcMaterialGroupById(id); } @@ -58,6 +59,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { * @return */ @Override + @DS("#header.poolName") public List getOriginalGroupList(QcMaterialGroup qcMaterialGroup) { return qcMaterialGroupMapper.getOriginalGroupList(qcMaterialGroup); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml index 62728cee..71eaf5ac 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml @@ -38,7 +38,7 @@ WHERE mg.del_flag = '0'*/ - SELECT DISTINCT product_group groupCode, product_group_name groupName