首件-接口-调整

application-facade/src/main/java/com/factory/controller/web/FirstArticleController.java

@@ -73,7 +73,7 @@ public class FirstArticleController {
 	@PostMapping("/addFaPlan")
 	@ApiOperationSupport(order = 1)
 	public ResponseBean addFaPlan(@RequestBody AddFaPlanReq req) {
-		return ResponseBeanBuilder.ok(firstArticleService.addFaPlan(req));
+		return firstArticleService.addFaPlan(req);
 	}
 
 	@ApiOperation(value = "取得首件计划信息")
@@ -88,7 +88,7 @@ public class FirstArticleController {
 	@PostMapping("/editFaPlan")
 	@ApiOperationSupport(order = 3)
 	public ResponseBean editFaPlan(@RequestBody EditFaPlanReq req) {
-		return ResponseBeanBuilder.ok(firstArticleService.editFaPlan(req));
+		return firstArticleService.editFaPlan(req);
 	}
 	
 	@ApiOperation(value = "禁用解禁首件计划")
@@ -130,14 +130,14 @@ public class FirstArticleController {
 	@PostMapping("/addFaItemResult")
 	@ApiOperationSupport(order = 9)
 	public ResponseBean addFaItemResult(@RequestBody AddFaItemResultListReq req) {
-		return ResponseBeanBuilder.ok(firstArticleService.addFaItemResult(req));
+		return firstArticleService.addFaItemResult(req);
 	}
 	
 	@ApiOperation(value = "任务检查完后提交")
 	@PostMapping("/submitFaTask")
 	@ApiOperationSupport(order = 10)
 	public ResponseBean submitFaTask(@RequestBody SubmitFaTaskReq req) {
-		return ResponseBeanBuilder.ok(firstArticleService.submitFaTask(req));
+		return firstArticleService.submitFaTask(req);
 	}
 	
 	@ApiOperation(value = "取得不放行任务对应的工作站")
@@ -158,7 +158,7 @@ public class FirstArticleController {
 	@PostMapping("/editFaItemResult")
 	@ApiOperationSupport(order = 13)
 	public ResponseBean editFaItemResult(@RequestBody EditFaItemResultListReq req) {
-		return ResponseBeanBuilder.ok(firstArticleService.editFaItemResult(req));
+		return firstArticleService.editFaItemResult(req);
 	}
 	
 	@ApiOperation(value = "通过计划ID取得表头")

application-facade/src/main/java/com/factory/controller/web/PreventMistakeController.java

@@ -35,7 +35,6 @@ import com.factory.web.entity.pm.req.SearchPmWorkshopNoGoListReq;
 import com.factory.web.entity.pm.req.SearchTaskReq;
 import com.factory.web.entity.pm.req.SearchWorkshopReq;
 import com.factory.web.entity.pm.res.AbnormalTaskInfoRes;
-import com.factory.web.entity.pm.res.PmAllCheckFlagRes;
 import com.factory.web.entity.pm.res.PmAllWorkshopListRes;
 import com.factory.web.entity.pm.res.PmCheckListRes;
 import com.factory.web.entity.pm.res.PmCheckRecordListRes;
@@ -71,7 +70,7 @@ public class PreventMistakeController {
 	@PostMapping("/addPmPlan")
 	@ApiOperationSupport(order = 1)
 	public ResponseBean addPmPlan(@RequestBody AddPmPlanReq req) {
-		return ResponseBeanBuilder.ok(preventMistakeService.addPmPlan(req));
+		return preventMistakeService.addPmPlan(req);
 	}
 
 	@ApiOperation(value = "取得Web端防错计划点检列表")
@@ -114,7 +113,7 @@ public class PreventMistakeController {
 	@PostMapping("/editPmPlan")
 	@ApiOperationSupport(order = 7)
 	public ResponseBean editPmPlan(@RequestBody EditPmPlanReq req) {
-		return ResponseBeanBuilder.ok(preventMistakeService.editPmPlan(req));
+		return preventMistakeService.editPmPlan(req);
 	}
 
 	@ApiOperation(value = "取得计划审批信息")
@@ -178,14 +177,14 @@ public class PreventMistakeController {
 	@PostMapping("/addItemResult")
 	@ApiOperationSupport(order = 16)
 	public ResponseBean addItemResult(@RequestBody AddItemResultListReq req) {
-		return ResponseBeanBuilder.ok(preventMistakeService.addItemResult(req));
+		return preventMistakeService.addItemResult(req);
 	}
 
 	@ApiOperation(value = "任务检查完后提交")
 	@PostMapping("/submitTask")
 	@ApiOperationSupport(order = 17)
 	public ResponseBean submitTask(@RequestBody SearchTaskReq req) {
-		return ResponseBeanBuilder.ok(preventMistakeService.submitTask(req));
+		return preventMistakeService.submitTask(req);
 	}
 
 	@ApiOperation(value = "取得不放行任务对应的工作站")
@@ -213,7 +212,7 @@ public class PreventMistakeController {
 	@PostMapping("/editItemResult")
 	@ApiOperationSupport(order = 21)
 	public ResponseBean editItemResult(@RequestBody EditItemResultListReq req) {
-		return ResponseBeanBuilder.ok(preventMistakeService.editItemResult(req));
+		return preventMistakeService.editItemResult(req);
 	}
 	
 	@ApiOperation(value = "取得所有工作站")

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -190,9 +190,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 		/* 添加工作站信息 */
 		List<FirstArticleWorkshopReq> firstArticleWorkshopList = req.getFirstArticleWorkshopList();
 		for (FirstArticleWorkshopReq firstArticleWorkshopReq : firstArticleWorkshopList) {
-			if (this.checkWsNameExist(firstArticleWorkshopReq.getWsName())) {
-				return ResponseBeanBuilder.fail("工作站名称" + firstArticleWorkshopReq.getWsName() + "已存在");
-			}
+//			if (this.checkWsNameExist(firstArticleWorkshopReq.getWsName())) {
+//				return ResponseBeanBuilder.fail("工作站名称" + firstArticleWorkshopReq.getWsName() + "已存在");
+//			}
 
 			FirstArticleWorkshop firstArticleWorkshop = FirstArticleWorkshop.builder()
 					.bentelerPlanId(plan.getId())
@@ -397,9 +397,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         /* 添加工作站信息 */
 		List<FirstArticleWorkshopReq> firstArticleWorkshopList = req.getFirstArticleWorkshopList();
 		for (FirstArticleWorkshopReq firstArticleWorkshopReq : firstArticleWorkshopList) {
-			if (this.checkWsNameExist(firstArticleWorkshopReq.getWsName())) {
-				return ResponseBeanBuilder.fail("工作站名称" + firstArticleWorkshopReq.getWsName() + "已存在");
-			}
+//			if (this.checkWsNameExist(firstArticleWorkshopReq.getWsName())) {
+//				return ResponseBeanBuilder.fail("工作站名称" + firstArticleWorkshopReq.getWsName() + "已存在");
+//			}
 
 			FirstArticleWorkshop firstArticleWorkshop = FirstArticleWorkshop.builder()
 					.bentelerPlanId(plan.getId())

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -203,9 +203,9 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		/* 添加工作站信息 */
 		List<OnsiteWorkshopReq> onsiteWorkshopList = req.getOnsiteWorkshopList();
 		for (OnsiteWorkshopReq onsiteWorkshopReq : onsiteWorkshopList) {
-			if (this.checkWsNameExist(onsiteWorkshopReq.getWsName())) {
-				return ResponseBeanBuilder.fail("工作站名称" + onsiteWorkshopReq.getWsName() + "已存在");
-			}
+//			if (this.checkWsNameExist(onsiteWorkshopReq.getWsName())) {
+//				return ResponseBeanBuilder.fail("工作站名称" + onsiteWorkshopReq.getWsName() + "已存在");
+//			}
 
 			OnsiteWorkshop onsiteWorkshop = OnsiteWorkshop.builder()
 					.bentelerPlanId(plan.getId())
@@ -524,9 +524,9 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
         /* 添加工作站信息 */
 		List<OnsiteWorkshopReq> onsiteWorkshopList = req.getOnsiteWorkshopList();
 		for (OnsiteWorkshopReq onsiteWorkshopReq : onsiteWorkshopList) {
-			if (this.checkWsNameExist(onsiteWorkshopReq.getWsName())) {
-				return ResponseBeanBuilder.fail("工作站名称" + onsiteWorkshopReq.getWsName() + "已存在");
-			}
+//			if (this.checkWsNameExist(onsiteWorkshopReq.getWsName())) {
+//				return ResponseBeanBuilder.fail("工作站名称" + onsiteWorkshopReq.getWsName() + "已存在");
+//			}
 
 			OnsiteWorkshop onsiteWorkshop = OnsiteWorkshop.builder()
 					.bentelerPlanId(plan.getId())