11111

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -348,16 +348,25 @@ public class FbsWorkingStatisticsController {
 			 res.setMsg("合格数量不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
-		 if(StringUtils.isBlank(entity.getScrapNumber())){
+		 if(StringUtils.isBlank(entity.getBatchCode())){
 			 res.setCode("1");
-			 res.setMsg("报废数量不能为空");
-			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
-		 }
-		 if(StringUtils.isBlank(entity.getRefuseNumber())){
-			 res.setCode("1");
-			 res.setMsg("拒绝数量不能为空");
+			 res.setMsg("批次号不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
+		 String[] batchCode = entity.getBatchCode().split(",");
+		 if(batchCode.length > 0){
+			 entity.setQualifiedNumber(String.valueOf(batchCode.length));
+		 }
+//		 if(StringUtils.isBlank(entity.getScrapNumber())){
+//			 res.setCode("1");
+//			 res.setMsg("报废数量不能为空");
+//			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+//		 }
+//		 if(StringUtils.isBlank(entity.getRefuseNumber())){
+//			 res.setCode("1");
+//			 res.setMsg("拒绝数量不能为空");
+//			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+//		 }
 		 if(StringUtils.isBlank(entity.getState())){
 			 res.setCode("1");
 			 res.setMsg("状态不能为空0保存，1提交");