Merge remote-tracking branch 'origin/master'

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

@@ -191,32 +191,11 @@ public class ToolStorgeServiceImpl extends SuperCacheServiceImpl<ToolStorgeMappe
     public R saveStorge(ToolCheckDTO list) {
         Long planId = list.getPlanId();
         Long deviceId=list.getDeviceId();
-        List<ToolStorgePageDTO> toolStorgelist = list.getToolStorgelist();
-
 
-        for (ToolStorgePageDTO vo:toolStorgelist) {
-            CuttingTool cuttingTool = cuttingToolMapper.getToolId(vo.getToolCode());
-            if(Objects.isNull(cuttingTool)){
-                return R.fail(vo.getToolCode()+":无法识别");
-            }
-            ToolHandle toolHandle = toolHandleMapper.getByHandleCode(vo.getHandleCode());
-            if(Objects.isNull(toolHandle)){
-                return R.fail(vo.getHandleCode()+":无法识别");
-            }
-            //刀柄绑定库位
-            LambdaUpdateWrapper<ToolStorge> lambdaUpdateWrapper = new LambdaUpdateWrapper<ToolStorge>();
-            lambdaUpdateWrapper.set(ToolStorge::getToolHandleId, toolHandle.getId()).eq(ToolStorge::getId, vo.getId());
-            baseMapper.update(null,  lambdaUpdateWrapper);
-
-            //刀具绑定刀柄
-            LambdaUpdateWrapper<ToolHandle> lambdaUpdateWrapper1 = new LambdaUpdateWrapper<>();
-            lambdaUpdateWrapper1.set(ToolHandle::getToolId, cuttingTool.getId()).eq(ToolHandle::getId, toolHandle.getId());
-            toolHandleMapper.update(null,  lambdaUpdateWrapper1);
-
-            vo.setToolId(cuttingTool.getId());
-            vo.setCuttingToolCategory(cuttingTool.getCuttingToolCategory().getData());
+        //更新task_node_tool表数据
+        List<ToolStorgePageDTO> toolStorgelist = list.getToolStorgelist();
+        if(CollectionUtil.isEmpty(toolStorgelist)) return R.fail("扫描刀具为空");
 
-        }
         List<TaskNodeTool> taskNodeToolList = taskNodeToolMapper.selectList(new QueryWrap<TaskNodeTool>().lambda().eq(TaskNodeTool::getTaskId,list.getTaskId()).eq(TaskNodeTool::getScanResult,"0"));
 
         Map<String, ToolStorgePageDTO> toolStorgePageDTOMap = toolStorgelist.stream().collect(Collectors.toMap(ToolStorgePageDTO::getCuttingToolCategory, t ->t));
@@ -245,6 +224,31 @@ public class ToolStorgeServiceImpl extends SuperCacheServiceImpl<ToolStorgeMappe
         }
         toolTaskService.updateById(toolTask);
 
+
+        for (ToolStorgePageDTO vo:toolStorgelist) {
+            CuttingTool cuttingTool = cuttingToolMapper.getToolId(vo.getToolCode());
+            if(Objects.isNull(cuttingTool)){
+                return R.fail(vo.getToolCode()+":无法识别");
+            }
+            ToolHandle toolHandle = toolHandleMapper.getByHandleCode(vo.getHandleCode());
+            if(Objects.isNull(toolHandle)){
+                return R.fail(vo.getHandleCode()+":无法识别");
+            }
+            //刀柄绑定库位
+            LambdaUpdateWrapper<ToolStorge> lambdaUpdateWrapper = new LambdaUpdateWrapper<ToolStorge>();
+            lambdaUpdateWrapper.set(ToolStorge::getToolHandleId, toolHandle.getId()).eq(ToolStorge::getId, vo.getId());
+            baseMapper.update(null,  lambdaUpdateWrapper);
+
+            //刀具绑定刀柄
+            LambdaUpdateWrapper<ToolHandle> lambdaUpdateWrapper1 = new LambdaUpdateWrapper<>();
+            lambdaUpdateWrapper1.set(ToolHandle::getToolId, cuttingTool.getId()).eq(ToolHandle::getId, toolHandle.getId());
+            toolHandleMapper.update(null,  lambdaUpdateWrapper1);
+
+            vo.setToolId(cuttingTool.getId());
+            vo.setCuttingToolCategory(cuttingTool.getCuttingToolCategory().getData());
+
+        }
+
         return R.success();
     }