审理单回调接口修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/AiWebApiController.java

@@ -1,15 +1,12 @@
 package org.springblade.desk.produce.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.google.protobuf.ServiceException;
 import lombok.extern.slf4j.Slf4j;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
-import org.springblade.common.exception.BusinessException;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.desk.oldv1.constant.Constant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.desk.oldv1.pojo.ResultInfo;
 import org.springblade.desk.produce.pojo.vo.*;
 import org.springblade.desk.quality.service.IReviewSheetService;
@@ -31,8 +28,8 @@ public class AiWebApiController extends BladeController {
 
     @PostMapping("/reviewResult")
     @Operation(summary = "审理结束回调接口")
-    public ResultInfo reviewResult(HttpServletRequest request) throws Exception {
+    public ResultInfo reviewResult(@RequestBody JSONObject params) {
-        JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS);
+        log.info("审理结束回调接口 params = {}", params);
         if (params == null || params.isEmpty()) {
             throw new ServiceException("参数传递异常!");
         }
@@ -46,7 +43,6 @@ public class AiWebApiController extends BladeController {
             Integer concedeQty = params.getInteger("concedeQty");
             String memo = params.getString("memo");
             qcReviewSheetService.reviewResult(trialId, resultStatus, reviewMan, liabilityPart, scrapQty, reworkQty, concedeQty, memo);
-            log.error("审理结束回调接口{}", params.toJSONString());
         } catch (Exception e) {
             log.error("审理结束回调接口{}", params.toJSONString(), e);
         }
@@ -54,13 +50,11 @@ public class AiWebApiController extends BladeController {
     }
 
     @PostMapping(value = "/deleteReviewOrder")
-    @Operation(summary = "审理结束回调接口")
+    @Operation(summary = "审理单删除调用接口")
-    public ResultInfo deleteReviewOrder(HttpServletRequest request) throws Exception {
+    public ResultInfo deleteReviewOrder(@RequestBody JSONObject params) {
-        JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS);
-        // 添加 调试log
         log.info("审理单删除调用接口 params = {}", params);
-        if (params == null || params.size() == 0) {
+        if (params == null || params.isEmpty()) {
-            throw new BusinessException("参数传递异常!");
+            throw new ServiceException("参数传递异常!");
         }
         try {
             String trialId = params.getString("trialId");

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

@@ -300,10 +300,10 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     }
 
     @Override
-    public void reviewResult(String trialId, Short resultStatus, String reviewMan, String liabilityPart, Integer scrapQty, Integer reworkQty, Integer concedeQty, String memo) throws Exception {
+    public void reviewResult(String trialId, Short resultStatus, String reviewMan, String liabilityPart, Integer scrapQty, Integer reworkQty, Integer concedeQty, String memo) {
         ReviewSheet rs = getByTrialId(trialId);
         if (rs == null) {
-            throw new BusinessException("审理单信息不存在！");
+            throw new ServiceException("审理单信息不存在！");
         }
 
         InspectionTask wc = taskService.getById(rs.getTaskId());
@@ -420,7 +420,6 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
                     //检验完成修改车间订单
                     workOrderService.updateStatus(Collections.singletonList(wo.getId()), WorkOrder.RUN_STATUS_SCRAP, null, null);
                 }
-
             }
         }
 
@@ -467,7 +466,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
                     if (prWorkPlanItems != null && !prWorkPlanItems.isEmpty()) {
                         workOrder.setRunStatus(WorkOrder.RUN_STATUS_CHECK);
                         log.info("审理单删除调用接口修改订单状态为检验中1");
-                    } else if (prWorkPlanItems.isEmpty()) {
+                    } else {
                         // 判断是否有试验项目不合格
                         prWorkPlanItems = workPlanItemService.listByWpId(prWorkCheck.getWpId(), InspectionTask.CHECK_RESULT_NO);
                         if (prWorkPlanItems != null && !prWorkPlanItems.isEmpty()) {