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 a74dafe4..825915de 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 @@ -1642,6 +1642,12 @@ public class QcController { return R.ok().put("rows", list); } + @PostMapping("/getSpecialOperationList2") + public R getSpecialOperationList2(@RequestBody QcFAIRecordData data){ + List list = qcService.getSpecialOperationList2(data); + return R.ok().put("rows", list); + } + /** * @description: 获取处置措施列表 * @author: fengyuan_yang 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 b6b12f37..2e827d8f 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 @@ -412,6 +412,8 @@ public interface QcMapper { List getSpecialOperationList(QcFAIRecordData data); + List getSpecialOperationList2(QcFAIRecordData data); + List disposalMeasuresSearch(QcFAIRecordData data); void qcPartAttributeEdit(QcPartAttributeData data); 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 a83b5037..da284053 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 @@ -3685,6 +3685,22 @@ public class QcServiceImpl implements QcService { return list; } + @Override + public List getSpecialOperationList2(QcFAIRecordData data) { + // 获得 site 和 bu + if (data.getBu().split("_").length >= 2 ) { + if (!data.getBu().split("_")[0].equals("***")){ + data.setSite(data.getBu().split("_")[0]); + } + + data.setBuNo(data.getBu().split("_")[1]); + } else { + throw new RuntimeException("工厂和部门有误!"); + } + List list = qcMapper.getSpecialOperationList2(data); + 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 83ea1620..62236cc2 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 @@ -244,6 +244,8 @@ public interface QcService { List getSpecialOperationList(QcFAIRecordData data); + List getSpecialOperationList2(QcFAIRecordData data); + List disposalMeasuresSearch(QcFAIRecordData data); void qcPartAttributeEdit(QcPartAttributeData data); diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index dc1e6dbb..386493d0 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -3187,6 +3187,15 @@ where site = #{site} + +