diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java index e7ed4fe..e9b4fbb 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java @@ -236,8 +236,8 @@ public class QmsInspecJobController { @GetMapping("/selectAllNc") @SysLog("查询不合格代码") @ApiOperation(value = "查询不合格代码", notes = "查询不合格代码") - public Object selectAllNc(String inspecResultSid ) { - return qmsInspecResultNccodeService.selectAllNc(inspecResultSid); + public Object selectAllNc(QmsInspecResultNccodeDTO dto) { + return qmsInspecResultNccodeService.selectAllNc(dto); } /** diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecResultNccodeService.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecResultNccodeService.java index 407a0fe..053dfea 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecResultNccodeService.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecResultNccodeService.java @@ -38,5 +38,5 @@ public interface QmsInspecResultNccodeService extends ExpansionService selectAllNc(String inspecResultSid); + List selectAllNc(QmsInspecResultNccodeDTO dto); } \ No newline at end of file diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecDetailServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecDetailServiceImpl.java index 73d4560..13cccce 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecDetailServiceImpl.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecDetailServiceImpl.java @@ -456,7 +456,7 @@ public class QmsInspecDetailServiceImpl extends ExpansionServiceImpl selectAllNc(String inspecResultSid) { - return baseMapper.selectAllNc(inspecResultSid); + public List selectAllNc(QmsInspecResultNccodeDTO dto) { + return baseMapper.selectAllNc(dto); } } diff --git a/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecResultNccodeMapper.java b/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecResultNccodeMapper.java index fe6627b..bbe96a8 100644 --- a/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecResultNccodeMapper.java +++ b/qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecResultNccodeMapper.java @@ -5,6 +5,7 @@ import com.foreverwin.iep.qms.entity.QmsInspecResultNccode; import com.foreverwin.mom.common.data.mybatis.expand.mapper.ExpansionBaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.springframework.security.core.parameters.P; import java.util.List; @@ -21,5 +22,5 @@ public interface QmsInspecResultNccodeMapper extends ExpansionBaseMapper selectNcByOperation(@Param("operationBo") String operationBo); - List selectAllNc(@Param("inspecResultSid") String inspecResultSid); + List selectAllNc(@Param("dto") QmsInspecResultNccodeDTO dto); } diff --git a/qms-db/src/main/resources/qms/mapper/QmsInspecResultNccodeMapper.xml b/qms-db/src/main/resources/qms/mapper/QmsInspecResultNccodeMapper.xml index b72f7bb..20537c1 100644 --- a/qms-db/src/main/resources/qms/mapper/QmsInspecResultNccodeMapper.xml +++ b/qms-db/src/main/resources/qms/mapper/QmsInspecResultNccodeMapper.xml @@ -46,10 +46,10 @@ select a.*, b.NC_CODE, b.DESCRIPTION NC_CODE_DESC, b.type from qms_inspec_result_nccode a join nc_basis b on a.NC_BASIS_BO = b.HANDLE - - - a.INSPEC_RESULT_SID = #{inspecResultSid} + where a.LOT_NO = #{dto.lotNo} and a.OPERATION_BO = #{dto.operationBo} + and a.RESOURCE_BO = #{dto.resourceBo} and a.ITEM = #{dto.item} + + and a.INSPEC_RESULT_SID = #{dto.inspecResultSid} -