Merge remote-tracking branch 'origin/master'

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/ToolTaskService.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.business.operationManagementCenter.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.R;
 import com.github.zuihou.base.service.SuperCacheService;
 import com.github.zuihou.business.centralToolMagazine.dto.ToolCheckDTO;
 import com.github.zuihou.business.centralToolMagazine.entity.ToolTask;
@@ -10,9 +11,9 @@ import java.util.List;
 
 public interface ToolTaskService extends SuperCacheService<ToolTask> {
 
-    void taskSave(List<ToolCheckDTO> list);
+    R taskSave(List<ToolCheckDTO> list);
 
-    void saveDetailToolTask(ToolCheckDTO toolCheckDTO);
+    R saveDetailToolTask(ToolCheckDTO toolCheckDTO);
 
     IPage<ToolTask> pageList(IPage<ToolTask> page, LbqWrapper<ToolTask> wrapper,String orderName);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/ToolTaskNodeServiceImpl.java

@@ -135,7 +135,7 @@ public class ToolTaskNodeServiceImpl extends SuperServiceImpl<ToolTaskNodeMapper
         List<ApplyChangeToolDetailDto> applyChangeToolDetailDtoList = applyChangeToolDto.getApplyChangeToolDetailDtoList();
         String model = applyChangeToolDto.getModel();
         if(CollectionUtil.isEmpty(applyChangeToolDetailDtoList)){
-            R.fail("不存在换刀信息");
+            return R.fail("不存在换刀信息");
         }
 
         for(ApplyChangeToolDetailDto applyChangeToolDetailDto:applyChangeToolDetailDtoList){

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/ToolTaskServiceImpl.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.business.operationManagementCenter.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.R;
 import com.github.zuihou.base.service.SuperCacheServiceImpl;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.centralToolMagazine.dao.ToolStorgeMapper;
@@ -43,7 +44,7 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
 
 
     @Override
-    public void taskSave(List<ToolCheckDTO> list) {
+    public R taskSave(List<ToolCheckDTO> list) {
         ApplyChangeToolDto applyChangeToolDto=new ApplyChangeToolDto();
         applyChangeToolDto.setModel("1");
         List<ApplyChangeToolDetailDto> applyChangeToolDetailDtoList=new ArrayList<>();
@@ -61,12 +62,12 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
             applyChangeToolDetailDtoList.add(applyChangeToolDetailDto);
         });
         applyChangeToolDto.setApplyChangeToolDetailDtoList(applyChangeToolDetailDtoList);
-        toolTaskNodeService.applyChangeTool(applyChangeToolDto);
+        return toolTaskNodeService.applyChangeTool(applyChangeToolDto);
 
     }
 
     @Override
-    public void saveDetailToolTask(ToolCheckDTO toolCheckDTO) {
+    public R saveDetailToolTask(ToolCheckDTO toolCheckDTO) {
         ApplyChangeToolDto applyChangeToolDto=new ApplyChangeToolDto();
         ApplyChangeToolDetailDto applyChangeToolDetailDto=new ApplyChangeToolDetailDto();
 
@@ -87,7 +88,7 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
 
         applyChangeToolDto.setModel("1");
         applyChangeToolDto.setApplyChangeToolDetailDtoList(applyChangeToolDetailDtoList);
-        //toolTaskNodeService.applyChangeTool(applyChangeToolDto);
+        return toolTaskNodeService.applyChangeTool(applyChangeToolDto);
 
     }
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/ToolTaskController.java

@@ -45,14 +45,12 @@ public class ToolTaskController extends SuperCacheController<ToolTaskService, Lo
 
     @RequestMapping("/saveToolTask")
     public R taskSave(@RequestBody List<ToolCheckDTO> list){
-        toolTaskService.taskSave(list);
-        return R.success();
+        return toolTaskService.taskSave(list);
     }
 
     @RequestMapping("/saveDetailToolTask")
     public R saveDetailToolTask(@RequestBody ToolCheckDTO toolCheckDTO){
-        toolTaskService.saveDetailToolTask(toolCheckDTO);
-        return R.success();
+        return toolTaskService.saveDetailToolTask(toolCheckDTO);
     }
 
 }