Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

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

@@ -719,7 +719,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
                 rs.setRsCode(responseBody.getString("trialNo"));
                 this.updateById(rs);
             } catch (Exception e) {
-                return R.fail(e.getMessage());
+                throw new ServiceException("审理单调用erp异常,原因:" + e.getMessage());
             }
         }
         return R.success("成功");
@@ -728,23 +728,23 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     private JSONObject saveReviewData(ReviewSheet rs, List<ReviewDuty> rdList, List<ReviewFault> rfList, BladeUser bladeUser) throws Exception {
         InspectionTask wc = inspectionTaskService.getById(rs.getTaskId());
         if (wc == null) {
-            throw new BusinessException("检验任务信息不存在！");
+            throw new ServiceException("检验任务信息不存在！");
         }
         WorkPlan wp = workPlanService.getById(wc.getWpId());
         if (wp == null) {
-            throw new BusinessException("车间作业计划信息不存在！");
+            throw new ServiceException("车间作业计划信息不存在！");
         }
         WorkOrder wo = workOrderService.getById(wp.getWoId());
         if (wo == null) {
-            throw new BusinessException("车间订单信息不存在！");
+            throw new ServiceException("车间订单信息不存在！");
         }
         YieldOrder yo = yieldOrderMapper.selectById(wo.getYoId());
         if (yo == null) {
-            throw new BusinessException("生产订单信息不存在！");
+            throw new ServiceException("生产订单信息不存在！");
         }
         BsProcessSetEntity processSet = bsProcessSetService.getById(wp.getPpsId());
         if (processSet == null) {
-            throw new BusinessException("工序信息不存在！");
+            throw new ServiceException("工序信息不存在！");
         }
         String findUserCode = null;
         String checkUserCode = bladeUser.getAccount();
@@ -806,6 +806,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
         } catch (Exception e) {
             throw new ServiceException("审理单调用异常,原因:" + e.getMessage());
         }
+        log.info("审理单调用erp成功,返回结果:{}", responseBody);
         return responseBody;
     }