11111

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

@@ -137,7 +137,7 @@ public class FbsWorkingStatisticsController {
 		 }
 		if(StringUtils.isBlank(entity.getRowNumber())){
 			 res.setCode("1");
-			 res.setMsg("行号能为空");
+			 res.setMsg("行号不能为空");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
 
@@ -152,9 +152,9 @@ public class FbsWorkingStatisticsController {
 		 FbsWorkshopDispatchList workshopDispatchList = list.get(0);
 		 //0初始，1接单,2暂停，3完成
 		 if(StringUtils.isNotBlank(workshopDispatchList.getState()) && !workshopDispatchList.getState().equals("0") &&
-                 !workshopDispatchList.getState().equals("2")){
+                 !workshopDispatchList.getState().equals("2") && !workshopDispatchList.getState().equals("3")){
              res.setCode("1");
-             res.setMsg("该订单已开工或已结束，请勿再次操作"+entity.getOrderNumber());
+             res.setMsg("该订单已开工，请勿再次操作"+entity.getOrderNumber());
              return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
          }
 		 entity.setStartDate(workshopDispatchList.getPlannedStartTime());//计划时间
@@ -257,7 +257,18 @@ public class FbsWorkingStatisticsController {
 		 fbsWorkingStatisticsService.updateById(entity);
          fbsWorkshopDispatchListService.updateState("2",entity.getPkWorkshopDispatchList());
 
-         res.setCode("0");
+		 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.eq("pk_Workshop_Dispatch_List", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);
+		 List<FbsWorkingStatistics> list1 = fbsWorkingStatisticsService.list(queryWrapper);
+		 BigDecimal allHors = new BigDecimal("0");
+		 BigDecimal allNum = new BigDecimal("0");
+		 for (FbsWorkingStatistics o:list1){
+			 allHors = allHors.add(o.getWorkingHours());
+			 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
+		 }
+		 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),allNum.toString(),entity.getPkWorkshopDispatchList());
+
+		 res.setCode("0");
 		 res.setMsg("成功");
 		 res.setData(entity);
 		 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
@@ -364,11 +375,11 @@ public class FbsWorkingStatisticsController {
 		 FbsWorkshopDispatchList workshopDispatchList = list.get(0);
 
          //状态（0初始，1接单,2暂停，3完成）
-         if(workshopDispatchList.getState().equals("0") || workshopDispatchList.getState().equals("2")){
-             res.setCode("1");
-             res.setMsg("该订单目前正在进行中，无法报工"+entity.getOrderNumber());
-             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
-         }
+		 if(workshopDispatchList.getState().equals("0") || workshopDispatchList.getState().equals("2")){
+			 res.setCode("1");
+			 res.setMsg("该订单目前正在进行中，无法报工"+entity.getOrderNumber());
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
 
 		 entity.setStartDate(workshopDispatchList.getPlannedStartTime());//计划时间
 		 entity.setEndDate(workshopDispatchList.getPlannedStartTime());//计划时间
@@ -378,17 +389,16 @@ public class FbsWorkingStatisticsController {
 		 fbsWorkingStatisticsService.updateById(entity);
          fbsWorkshopDispatchListService.updateState("3",entity.getPkWorkshopDispatchList());
 
-		 if(!par.getState().equals("1")){
-			 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
-			 queryWrapper.eq("pk_Workshop_Dispatch_List", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);
-			 List<FbsWorkingStatistics> list1 = fbsWorkingStatisticsService.list(queryWrapper);
-			 BigDecimal allHors = new BigDecimal("0");
-			 for (FbsWorkingStatistics o:list1){
-				 allHors = allHors.add(o.getWorkingHours());
-			 }
-			 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),entity.getPkWorkshopDispatchList());
-
-		 }
+		 QueryWrapper<FbsWorkingStatistics> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.eq("pk_Workshop_Dispatch_List", entity.getPkWorkshopDispatchList()).eq("del_flag", 0);
+		 List<FbsWorkingStatistics> list1 = fbsWorkingStatisticsService.list(queryWrapper);
+		 BigDecimal allHors = new BigDecimal("0");
+		 BigDecimal allNum = new BigDecimal("0");
+		 for (FbsWorkingStatistics o:list1){
+			 allHors = allHors.add(o.getWorkingHours());
+			 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
+		 }
+		 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),allNum.toString(), entity.getPkWorkshopDispatchList());
 
          if(entity.getState().equals("1")){
          	//把数据传入u8数据库