fix：物料rfid校验

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

@@ -2714,7 +2714,8 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 
             //从机床刀库取
             if(StringUtil.isNotEmpty(locationNo) && stockInfo != null){
-               CuttingTool cuttingTool = cuttingToolService.getOne(new LbqWrapper<CuttingTool>().eq(CuttingTool::getDeviceId, task.getResourceId()).eq(CuttingTool::getCutterNo, locationNo).last("LIMIT 1"));
+                // 根据goods id 获取刀具数据，进行数据删除
+               CuttingTool cuttingTool = cuttingToolService.getById(stockInfo.getGoodsId());
                if(cuttingTool == null){
                    throw  new RuntimeException("从机床取刀，没有查询到刀具信息");
                }

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

@@ -1487,12 +1487,19 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     public R checkMaterialsRfid(Map<String, Object> map) {
         R<Boolean> retuMsg = R.success().setMsg("200");
 
-        R rfid = this.findRfid(map, false);
-        if(!rfid.getIsSuccess()){
-            return retuMsg.setMsg(rfid.getMsg());
+        // 比对rfid与数据子盘号是否一致==开始
+        Long decimal = 0l;
+        try{
+            R rfid = this.findRfid(map, false);
+            if(!rfid.getIsSuccess()){
+                return retuMsg.setMsg(rfid.getMsg());
+            }
+            decimal = Long.parseLong(rfid.getData().toString());
+        }catch (Exception ex){
+            ex.printStackTrace();
+            log.error("rfid比对失败 ；异常信息"+ ex);
         }
-        // 比对rfid与数据子盘号是否一致
-        Long decimal = Long.parseLong(rfid.getData().toString());
+
         Tray tray = trayService.getOne(Wraps.<Tray>lbQ().eq(Tray::getId, Long.parseLong(map.get("trayId").toString())).last("limit 1"));
         if(Objects.isNull(tray)){
             return retuMsg.setMsg("没有查询到工装信息");
@@ -1551,7 +1558,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         if(imcsTOccsEnable){
             s = restTemplate.postForObject(url, formEntity, String.class);
         }else {
-            s="{\"taskID\":\"1872123464509292544\",\"taskNodeID\":\"1872123575505080322\",\"result\":\"true\",\"resultMsg\":\"执行成功\",\"concurrency\":\"false\",\"data\":null,\"returnData\":{\"par1\":\"001A000000\"}}\n";
+            s="{\"taskID\":\"1872123464509292544\",\"taskNodeID\":\"1872123575505080322\",\"result\":\"true\",\"resultMsg\":\"执行成功\",\"concurrency\":\"false\",\"data\":null,\"returnData\":{\"par1\":\"00A00000\"}}\n";
         }
 
         JSONObject jsonObject = JSONObject.parseObject(s);
@@ -1567,8 +1574,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         if(par1.length()<6){
             return R.fail("RFID读取错误请检查");
         }
-        String s1 = StringUtil.isNotEmpty(par1) ? par1.substring(2, 6):par1 ;
         if(reversal){// 是否反转
+            String s1 = StringUtil.isNotEmpty(par1) ? par1.substring(2, 6):par1 ;
             // 反转
             String hexStr = CutterFile.reverseByTwoCharsGroup(s1);
 
@@ -1576,7 +1583,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             Long decimal = Long.parseLong(hexStr, 16);
             return R.success(decimal);
         }else {
-            return R.success(s1);
+            return R.success(par1);
         }
 
     }