From 51e4f3663de8b0d2c9cc932ff886ff04b0de5f36 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Tue, 25 Mar 2025 10:15:12 +0800 Subject: [PATCH] =?UTF-8?q?45820=20=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80?= =?UTF-8?q?=E9=AA=8C-NC=E5=A4=84=E7=90=86=E7=95=8C=E9=9D=A2=EF=BC=88?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BA=BA=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java | 2 +- .../apiservice/controller/busi/MesNcProcessingController.java | 4 ++-- .../i3plus/ext/mes/pcn/apiservice/dao/IMesNcProcessingDao.java | 2 +- .../ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java | 9 ++------- .../pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java | 4 ++-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java index 405ed4a..137f32e 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesNcProcessingService.java @@ -35,6 +35,6 @@ public interface IMesNcProcessingService { @ApiOperation(value = "NC处理") void saveNc(MesNcProcessingInputModel model, String org, boolean isOrder); - List queryPartInspectionCreateUser(String organizeCode, String createUserName); + List queryPartInspectionCreateUser(String organizeCode); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java index 2934255..c0383ab 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java @@ -112,11 +112,11 @@ public class MesNcProcessingController { @GetMapping("/query-part-inspection-create-user") @ApiOperation(value = "查询检验人（NC-零件检测-单据 表的createUser）") - public ResultBean queryPartInspectionCreateUser(String organizeCode, String createUserName) { + public ResultBean queryPartInspectionCreateUser(String organizeCode) { try { ValidatorBean.checkNotNull(organizeCode, "工厂不能为空"); return ResultBean.success("查询成功").setResultList( - ncProcessingService.queryPartInspectionCreateUser(organizeCode, createUserName)); + ncProcessingService.queryPartInspectionCreateUser(organizeCode)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/dao/IMesNcProcessingDao.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/dao/IMesNcProcessingDao.java index 12669eb..7e92e08 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/dao/IMesNcProcessingDao.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/dao/IMesNcProcessingDao.java @@ -14,6 +14,6 @@ public interface IMesNcProcessingDao { @ApiOperation(value = "查询停工统计数据") List queryDefectRecordByPager(String partNo, String lotNo, String org, Pager pager); - List queryPartInspectionCreateUser(String organizeCode, String createUserName); + List queryPartInspectionCreateUser(String organizeCode); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java index d295f86..976a8c4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java @@ -93,21 +93,16 @@ public class MesNcProcessingDao implements IMesNcProcessingDao { } @Override - public List queryPartInspectionCreateUser(String organizeCode, String createUserName) { + public List queryPartInspectionCreateUser(String organizeCode) { String sql = "SELECT DISTINCT(create_user) " + "FROM mes_part_inspection " + "WHERE is_valid = :isValid AND is_deleted = :isDeleted AND organize_code = :organizeCode "; - if (!StringUtils.isEmpty(createUserName)) { - sql += " AND create_user like :createUserName "; - } Query query = entityManager.createNativeQuery(sql); query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); query.setParameter("organizeCode", organizeCode); - if (!StringUtils.isEmpty(createUserName)) { - query.setParameter("createUserName", createUserName + "%"); - } List resultList = query.getResultList(); + log.info("queryPartInspectionCreateUser-查询结果-" + resultList); if (CollectionUtils.isEmpty(resultList)) { return null; }else { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java index f49267c..44c3142 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java @@ -213,8 +213,8 @@ public class MesNcProcessingService implements IMesNcProcessingService { } @Override - public List queryPartInspectionCreateUser(String organizeCode, String createUserName) { - return ncProcessingDao.queryPartInspectionCreateUser(organizeCode, createUserName); + public List queryPartInspectionCreateUser(String organizeCode) { + return ncProcessingDao.queryPartInspectionCreateUser(organizeCode); } /**