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 ff2dfe3..cb5885b 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 @@ -1,6 +1,7 @@ package org.dromara.qms.controller; +import com.alibaba.fastjson2.JSONObject; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -19,6 +20,7 @@ import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo; import org.dromara.qms.service.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -65,14 +67,15 @@ public class QcPDAController { } // 评审结果的有效值:0报废/1返工/2退货/3让步接收/4流转 return "0".equals(reviewResult) || // 报废 - "1".equals(reviewResult) || // 返工 - "2".equals(reviewResult) || // 退货 - "4".equals(reviewResult) || // 让步接收 - "3".equals(reviewResult); // 流转 + "1".equals(reviewResult) || // 返工 + "2".equals(reviewResult) || // 退货 + "4".equals(reviewResult) || // 让步接收 + "3".equals(reviewResult); // 流转 } /** * 通过planDetailId和processId生成质检任务 + * * @param bo * @return */ @@ -91,17 +94,22 @@ public class QcPDAController { * 如果不合格,生成不合格评审 */ @PostMapping("/submitInspection") - public R submitInspection(@RequestBody @Valid QcInspectionMainBo bo) { + public R submitInspection(String json, List checkItemFiles) { + + QcInspectionMainBo bo= JSONObject.parseObject(json, QcInspectionMainBo.class); Boolean result = qcPDAService.submitInspection(bo); if (result != null && result) { return R.ok(true); } else { - return R.fail("Submission failed"); + // System.out.println(bo.toString()); + // System.out.println(checkItemFiles.size()); + return R.fail("Submission failed"); } } /** * PDA分页查询质检任务 + * * @param bo * @param pageQuery * @return @@ -113,6 +121,7 @@ public class QcPDAController { /** * PDA查询质检任务详情 + * * @param bo * @return */ @@ -123,6 +132,7 @@ public class QcPDAController { /** * PDA分页查询不合格品待评审任务 + * * @param bo * @param pageQuery * @return @@ -134,6 +144,7 @@ public class QcPDAController { /** * PDA查询不合格品评审任务详情 + * * @param bo * @return */ @@ -144,12 +155,13 @@ public class QcPDAController { /** * 不合格评审处理-开始评审 + * * @param dispositionType * @param reviewIds * @return */ @GetMapping("/handleUnqualified/{dispositionType}/{reviewIds}") - public R handleUnqualified(@PathVariable("dispositionType") String dispositionType , @PathVariable("reviewIds") Long[] reviewIds) { + public R handleUnqualified(@PathVariable("dispositionType") String dispositionType, @PathVariable("reviewIds") Long[] reviewIds) { Boolean result = qcPDAService.handleUnqualified(dispositionType, reviewIds); if (result != null && result) { return R.ok(true);