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 4c017ed6..aed32dba 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 @@ -1735,6 +1735,7 @@ public class QcController { public R upload(@RequestParam("file") MultipartFile[] list, @ModelAttribute GetParamInData inData){ List ossEntity = qcService.upload(list, inData); return R.ok().put("ossEntity", ossEntity); + } /** 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 07548d6b..e4bae01a 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 @@ -5104,6 +5104,7 @@ public class QcServiceImpl implements QcService { if (noList.isEmpty()) { throw new RuntimeException("数据采集失败(未获取到检验单信息)!"); } + List subDetailList = new LinkedList<>(); List fileList = new ArrayList<>(); for (EquipmentDataAcquisitionData acquisitionData : noList) { 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 76d3be80..ffef1a1c 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 @@ -271,6 +271,7 @@ public interface QcService { List upload(MultipartFile[] list, GetParamInData inData); + List searchSeqInfo(QcFAIRecordData data); List searchPartInfo(QcFAIRecordData data);