diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java index 0c29adf..1441fd1 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java @@ -177,6 +177,20 @@ public class QcPDAController { } } + /** + * 从PDA提交检测结果 + * 测试接口 + */ + @PostMapping("/webSubmitInspection") + public R webSubmitInspection(@RequestBody @Valid QcInspectionMainBo bo) { + Boolean result = qcPDAService.submitInspection(bo); + if (result != null && result) { + return R.ok(true); + } else { + return R.fail("Submission failed"); + } + } + /** * PDA分页查询质检任务 * diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java index 9a56800..b8f329d 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcPDAServiceImpl.java @@ -149,17 +149,16 @@ public class QcPDAServiceImpl implements IQcPDAService { @Override @Transactional(rollbackFor = Exception.class) public Boolean submitInspection(QcInspectionMainBo bo) { - // 保存文件 - List ossIds = bo.getOssIds(); - for (Long ossId : ossIds){ - QcInspectionMainFileRelationBo relation = new QcInspectionMainFileRelationBo(); - relation.setInspectionId(bo.getInspectionId()); - relation.setOssId(ossId); - qcInspectionMainFileRelationService.insertByBo(relation); + if (StringUtils.isNotNull(bo.getOssIds())){ + List ossIds = bo.getOssIds(); + for (Long ossId : ossIds){ + QcInspectionMainFileRelationBo relation = new QcInspectionMainFileRelationBo(); + relation.setInspectionId(bo.getInspectionId()); + relation.setOssId(ossId); + qcInspectionMainFileRelationService.insertByBo(relation); + } } - - // 根据传入的检验ID查询主记录信息 Long inspectionId = bo.getInspectionId(); Date nowDate = DateUtils.getNowDate();