diff --git a/src/main/java/com/gaotao/modules/pms/controller/QcController.java b/src/main/java/com/gaotao/modules/pms/controller/QcController.java index a3c13a1..bd9e932 100644 --- a/src/main/java/com/gaotao/modules/pms/controller/QcController.java +++ b/src/main/java/com/gaotao/modules/pms/controller/QcController.java @@ -1987,6 +1987,15 @@ public class QcController { return R.ok(); } + /** + * 查询所有工序列表 + **/ + @PostMapping("/getAllOperationDescList") + public R getAllOperationDescList(@RequestBody Map params){ + List list = qcBaseInfoService.getAllOperationDescList(params); + return R.ok().put("rows", list); + } + } diff --git a/src/main/java/com/gaotao/modules/pms/data/QcTemplateData.java b/src/main/java/com/gaotao/modules/pms/data/QcTemplateData.java index f8344ca..6254ff0 100644 --- a/src/main/java/com/gaotao/modules/pms/data/QcTemplateData.java +++ b/src/main/java/com/gaotao/modules/pms/data/QcTemplateData.java @@ -2,11 +2,9 @@ package com.gaotao.modules.pms.data; import com.fasterxml.jackson.annotation.JsonFormat; import com.gaotao.common.utils.QueryPage; -import io.swagger.models.auth.In; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.Date; import java.util.List; @@ -82,6 +80,8 @@ public class QcTemplateData extends QueryPage { private String itemType; // 检验类型名称 private String inspectionTypeName; + // IPQC检验方式 + private String ipqcInspectionMethod; // 设备编码 private String objectID; // 设备名称 @@ -349,6 +349,14 @@ public class QcTemplateData extends QueryPage { this.inspectionTypeName = inspectionTypeName; } + public String getIpqcInspectionMethod() { + return ipqcInspectionMethod; + } + + public void setIpqcInspectionMethod(String ipqcInspectionMethod) { + this.ipqcInspectionMethod = ipqcInspectionMethod; + } + public String getInspectionTypeNo() { return inspectionTypeNo; } diff --git a/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java b/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java index f0d758d..8f12c03 100644 --- a/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java +++ b/src/main/java/com/gaotao/modules/pms/mapper/QcBaseInfoMapper.java @@ -255,4 +255,7 @@ public interface QcBaseInfoMapper { void deletePatrolConfig(Map data); void clearPatrolConfigDefaultFlag(Map data); + + // 查询所有工序列表 + List getAllOperationDescList(Map params); } diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java index 1bf51eb..df2099d 100644 --- a/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pms/service/Impl/QcBaseInfoServiceImpl.java @@ -1450,4 +1450,12 @@ public class QcBaseInfoServiceImpl implements QcBaseInfoService { } } + /** + * 查询所有工序列表 + **/ + @Override + public List getAllOperationDescList(Map params) { + return qcBaseInfoMapper.getAllOperationDescList(params); + } + } diff --git a/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java b/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java index adee8fe..d89bb03 100644 --- a/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java +++ b/src/main/java/com/gaotao/modules/pms/service/QcBaseInfoService.java @@ -161,4 +161,7 @@ public interface QcBaseInfoService { void updatePatrolConfig(Map data); void deletePatrolConfig(Map params); + + // 查询所有工序列表 + List getAllOperationDescList(Map params); } diff --git a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml index c68e138..27e95d1 100644 --- a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml +++ b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml @@ -1292,6 +1292,7 @@ qat.RE, qt.inspection_type_no, qit.inspection_type_name, + qat.ipqc_inspection_method, qt.default_sampling_quantity, qt.default_sampling_proportion, qat.sampling_level_no, @@ -1373,7 +1374,8 @@ sampling_programme_no = #{samplingProgrammeNo}, AQL = #{aql,jdbcType=DECIMAL}, AC = #{ac,jdbcType=DECIMAL}, - RE = #{re,jdbcType=DECIMAL} + RE = #{re,jdbcType=DECIMAL}, + ipqc_inspection_method = #{ipqcInspectionMethod} site = #{site} and attribute_no = #{attributeNo} AND template_id = #{templateId} AND attribute_type = #{attributeType} and bu_no = #{buNo} @@ -1793,4 +1795,12 @@ AND operation_desc != #{operationDesc} + + +