diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java index e0d5e03b..242776c3 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java @@ -1571,6 +1571,19 @@ public class QcController { List list = qcService.getSpecialOperationList(data); return R.ok().put("rows", list); } + + /** + * @description: 获取处置措施列表 + * @author: fengyuan_yang + * @date: 2023/10/23 13:14 + * @param: [] + * @return: com.xujie.sys.common.utils.R + **/ + @PostMapping(value="/disposalMeasuresSearch") + public R disposalMeasuresSearch(){ + List list = qcService.disposalMeasuresSearch(); + return R.ok().put("rows", list); + } } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java index 08513c2a..3375dae5 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java @@ -9,6 +9,8 @@ import java.util.Date; import java.util.List; public class QcFAIRecordData extends QueryPage { + // id + private Integer id; // 检验单号 private String inspectionNo; // 工厂号 @@ -156,6 +158,14 @@ public class QcFAIRecordData extends QueryPage { // 子明细数据数量 private Integer subDetailRecordNum; + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + public Integer getSubDetailRecordNum() { return subDetailRecordNum; } diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index ddb09af8..f9b4104f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java @@ -415,4 +415,6 @@ public interface QcMapper { List getPartInformation(QcFAIRecordData data); List getSpecialOperationList(QcFAIRecordData data); + + List disposalMeasuresSearch(); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 80fc50bd..d7ff297f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -3126,6 +3126,19 @@ public class QcServiceImpl implements QcService { return list; } + /** + * @description: 获取处置措施列表 + * @author: fengyuan_yang + * @date: 2023/10/23 13:15 + * @param: [] + * @return: java.util.List + **/ + @Override + public List disposalMeasuresSearch() { + List list = qcMapper.disposalMeasuresSearch(); + return list; + } + } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java index 0a5a790d..38fb925a 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java @@ -243,4 +243,6 @@ public interface QcService { List getPartInformation(QcFAIRecordData data); List getSpecialOperationList(QcFAIRecordData data); + + List disposalMeasuresSearch(); } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 6f2c8bac..5aae1253 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2587,6 +2587,14 @@ where site = #{site} + + +