Merge remote-tracking branch 'origin/master'

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java

@@ -1,29 +1,28 @@
 package org.dromara.qms.controller;
 
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.pda.api.model.bo.GenerateInspectionTaskBo;
-import org.dromara.qms.domain.bo.QcInspectionResultBo;
-import org.dromara.qms.domain.vo.QcInspectionResultVo;
-import org.dromara.qms.service.*;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import jakarta.validation.Valid;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pda.api.model.bo.GenerateInspectionTaskBo;
 import org.dromara.qms.domain.bo.QcInspectionMainBo;
+import org.dromara.qms.domain.bo.QcInspectionResultBo;
+import org.dromara.qms.domain.bo.QcUnqualifiedRecordBo;
 import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo;
 import org.dromara.qms.domain.vo.QcInspectionMainVo;
-import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo;
-import org.dromara.qms.domain.bo.QcUnqualifiedRecordBo;
+import org.dromara.qms.domain.vo.QcInspectionResultVo;
 import org.dromara.qms.domain.vo.QcUnqualifiedRecordVo;
+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;
-import java.util.Map;
 
 
 @Validated
@@ -68,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
      */
@@ -94,17 +94,22 @@ public class QcPDAController {
      * 如果不合格，生成不合格评审
      */
     @PostMapping("/submitInspection")
-    public R<Boolean> submitInspection(@RequestBody @Valid QcInspectionMainBo bo) {
+    public R<Boolean> submitInspection(String json, List<MultipartFile> 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
@@ -116,16 +121,18 @@ public class QcPDAController {
 
     /**
      * PDA查询质检任务详情
+     *
      * @param bo
      * @return
      */
     @GetMapping("/getResultList")
-    public List<QcInspectionResultVo> getResultList(QcInspectionResultBo bo) {
-        return qcInspectionResultService.queryList(bo);
+    public R<List<QcInspectionResultVo>> getResultList(QcInspectionResultBo bo) {
+        return R.ok(qcInspectionResultService.queryList(bo));
     }
 
     /**
      * PDA分页查询不合格品待评审任务
+     *
      * @param bo
      * @param pageQuery
      * @return
@@ -137,6 +144,7 @@ public class QcPDAController {
 
     /**
      * PDA查询不合格品评审任务详情
+     *
      * @param bo
      * @return
      */
@@ -147,12 +155,13 @@ public class QcPDAController {
 
     /**
      * 不合格评审处理-开始评审
+     *
      * @param dispositionType
      * @param reviewIds
      * @return
      */
     @GetMapping("/handleUnqualified/{dispositionType}/{reviewIds}")
-    public R<Boolean> handleUnqualified(@PathVariable("dispositionType") String dispositionType , @PathVariable("reviewIds") Long[] reviewIds) {
+    public R<Boolean> handleUnqualified(@PathVariable("dispositionType") String dispositionType, @PathVariable("reviewIds") Long[] reviewIds) {
         Boolean result = qcPDAService.handleUnqualified(dispositionType, reviewIds);
         if (result != null && result) {
             return R.ok(true);