异常bug修改

production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java

@@ -139,7 +139,12 @@ public class SfcScrapController {
      */
     @GetMapping("/getScrapDtoBysfc")
     public R getScrapDtoBysfc(String site,String sfc){
-        return R.ok(anomalyService.getScrapDtoBysfc(site,sfc));
+        try{
+            return R.ok(anomalyService.getScrapDtoBysfc(site,sfc));
+        }catch (Exception e){
+            return R.failed("产品报废检索报错"+e.getMessage());
+        }
+
     }
 
     /**

quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java

@@ -116,7 +116,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
             }
 
             List<InspectionTaskManageDetail> inspectionItemDetailList = this.getInspectionTaskDetail(HandleEnum.INSPECTION_TASK.getHandle(taskNo));
-            if (inspectionItemDetailList != null || inspectionItemDetailList.size() > 0) {
+            if (inspectionItemDetailList != null && inspectionItemDetailList.size() > 0) {
                     throw BusinessException.build("检验任务："+taskNo+"有检验项目，不允许执行合格操作");
             }