刀具校验

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

@@ -231,8 +231,8 @@ public class ToolManagementServiceImpl extends SuperCacheServiceImpl<ToolManagem
 
                 //机床现有刀具集合
                 List<Long> realToolId = toolManagementMapper.getToolManagementToolId(vo.getResourceId());
-                Integer freeCount = toolManagementMapper.getFreeStorge(vo.getResourceId());
-                //Integer freeCount=0;
+                //Integer freeCount = toolManagementMapper.getFreeStorge(vo.getResourceId());
+                Integer freeCount=0;
                 //if(!realToolId.containsAll(toolId)){
                 //需要的类别
                 List<String> toolCategory = cuttingToolMapper.getToolCategory(toolId);

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

@@ -11,4 +11,6 @@ import java.util.List;
 public interface ToolTaskService extends SuperService<ToolTask> {
 
     void taskSave(List<ToolCheckDTO> list);
+
+    void saveDetailToolTask(ToolCheckDTO toolCheckDTO);
 }

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

@@ -1,9 +1,11 @@
 package com.github.zuihou.business.operationManagementCenter.service.impl;
 
 import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.centralToolMagazine.dao.ToolStorgeMapper;
 import com.github.zuihou.business.centralToolMagazine.dto.ApplyChangeToolDetailDto;
 import com.github.zuihou.business.centralToolMagazine.dto.ApplyChangeToolDto;
 import com.github.zuihou.business.centralToolMagazine.dto.ToolCheckDTO;
+import com.github.zuihou.business.centralToolMagazine.entity.ToolStorge;
 import com.github.zuihou.business.centralToolMagazine.entity.ToolTask;
 import com.github.zuihou.business.operationManagementCenter.dao.ToolTaskMapper;
 import com.github.zuihou.business.operationManagementCenter.service.ToolTaskNodeService;
@@ -15,9 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -29,8 +29,10 @@ public class ToolTaskServiceImpl extends SuperServiceImpl<ToolTaskMapper, ToolTa
     @Autowired
     private ToolTaskNodeService toolTaskNodeService;
 
+    @Autowired
+    private ToolStorgeMapper toolStorgeMapper;
+
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void taskSave(List<ToolCheckDTO> list) {
         ApplyChangeToolDto applyChangeToolDto=new ApplyChangeToolDto();
@@ -44,6 +46,7 @@ public class ToolTaskServiceImpl extends SuperServiceImpl<ToolTaskMapper, ToolTa
             }
             ApplyChangeToolDetailDto applyChangeToolDetailDto=new ApplyChangeToolDetailDto();
             applyChangeToolDetailDto.setResourceId(vo.getId());
+            applyChangeToolDetailDto.setPlanId(vo.getPlanId());
             //缺刀集合
             applyChangeToolDetailDto.setCentralToolTypeList(vo.getList());
             applyChangeToolDetailDtoList.add(applyChangeToolDetailDto);
@@ -52,4 +55,30 @@ public class ToolTaskServiceImpl extends SuperServiceImpl<ToolTaskMapper, ToolTa
         toolTaskNodeService.applyChangeTool(applyChangeToolDto);
 
     }
+
+    @Override
+    public void saveDetailToolTask(ToolCheckDTO toolCheckDTO) {
+        ApplyChangeToolDto applyChangeToolDto=new ApplyChangeToolDto();
+        ApplyChangeToolDetailDto applyChangeToolDetailDto=new ApplyChangeToolDetailDto();
+
+        List<ApplyChangeToolDetailDto> applyChangeToolDetailDtoList=new ArrayList<>();
+        applyChangeToolDetailDtoList.add(applyChangeToolDetailDto);
+
+        applyChangeToolDetailDto.setPlanId(toolCheckDTO.getPlanId());
+        applyChangeToolDetailDto.setResourceId(toolCheckDTO.getId());
+        applyChangeToolDetailDto.setCentralToolTypeList(toolCheckDTO.getList());
+        List<ToolStorge> storgeId=new ArrayList<>();
+        toolCheckDTO.getStorgeId().stream().forEach(vo->{
+            Map<String,Object> params=new HashMap<>();
+            params.put("storgeId",vo);
+            List<ToolStorge> toolStorge=toolStorgeMapper.getStorge(params);
+            storgeId.addAll(toolStorge);
+        });
+        applyChangeToolDetailDto.setStorgeId(storgeId);
+
+        applyChangeToolDto.setModel("1");
+        applyChangeToolDto.setApplyChangeToolDetailDtoList(applyChangeToolDetailDtoList);
+        toolTaskNodeService.applyChangeTool(applyChangeToolDto);
+
+    }
 }

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/centralToolMagezine/ToolStorgeMapper.xml

@@ -165,6 +165,10 @@
             <if test="toolId !=null">
                 AND ith.tool_id = #{toolId}
             </if>
+            <if test="storgeId !=null">
+                AND its.id = #{storgeId}
+            </if>
         </where>
     </select>
+    
 </mapper>

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

@@ -34,4 +34,10 @@ public class ToolTaskController{
         return R.success();
     }
 
+    @RequestMapping("/saveDetailToolTask")
+    public R saveDetailToolTask(@RequestBody ToolCheckDTO toolCheckDTO){
+        toolTaskService.saveDetailToolTask(toolCheckDTO);
+        return R.success();
+    }
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/centralToolMagazine/dto/ApplyChangeToolDetailDto.java

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.centralToolMagazine.dto;
 
+import com.github.zuihou.business.centralToolMagazine.entity.ToolStorge;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -20,6 +21,8 @@ public class ApplyChangeToolDetailDto {
     @ApiModelProperty("机床设备")
     private Long resourceId;
 
+    private Long planId;
+
     @ApiModelProperty("需要往机床送的刀具ID集合")
     private List<Long> centralToolIdList;
 
@@ -28,4 +31,7 @@ public class ApplyChangeToolDetailDto {
 
     @ApiModelProperty("需要往机床送的刀具类型集合")
     private List<String> centralToolTypeList;
+
+    @ApiModelProperty("换出来的刀库信息集合")
+    private List<ToolStorge> storgeId;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/centralToolMagazine/dto/ToolCheckDTO.java

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.centralToolMagazine.dto;
 
+import com.github.zuihou.business.centralToolMagazine.entity.ToolStorge;
 import lombok.Data;
 
 import java.util.List;
@@ -12,10 +13,14 @@ public class ToolCheckDTO {
     private Long planId;
     private String deviceName;
     private String name;
+    //需要的刀具类别集合
     private List<String> list;
     private String hasCuttingToolsFlag;
     private String isTask;
     private String msg;
     //机床刀库空闲个数是否大于缺刀个数
     private Boolean isFree;
+
+    //换出来的刀库库位ID
+    private List<Long> storgeId;
 }