fix：更新三坐标参数字段

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

@@ -287,6 +287,9 @@ public class CutterTestDataServiceImpl extends SuperServiceImpl<CutterTestDataMa
 
     @Override
     public boolean pushPushToMachine(String destLocationNo, CuttingTool cuttingTool, TaskNode taskNode, TTask task) {
+
+        String ischuliDele = "1";
+
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.in("status", 2, 3, 4);
         queryWrapper.in("cutter_t", cuttingTool.getCuttingToolNo());
@@ -327,6 +330,7 @@ public class CutterTestDataServiceImpl extends SuperServiceImpl<CutterTestDataMa
             build.setCutterP(cuttingTool.getCutterNo().toString());
             build.setCutterTypSubDnc(cutterTestDataEntity.getCutterTypSubDnc());
             build.setWriteOrDel("2");
+            ischuliDele = "2";
 
             rfidObj.put("data", JSONObject.toJSON(build));
         }
@@ -348,18 +352,30 @@ public class CutterTestDataServiceImpl extends SuperServiceImpl<CutterTestDataMa
                 }
 
             } else {
-                s = "{\"taskID\":\"1\",\"taskNodeID\":\"1\",\"result\":\"true\",\"resultMsg\":\"消费成功\",\"concurrency\":\"false\",\"data\":null}\n";
+                s = "{\"taskID\":\"1937434090479288320\",\"taskNodeID\":\"19374340904792883201\",\"result\":\"true\",\"resultMsg\":\"数据设置成功\",\"concurrency\":\"false\",\"data\":null,\"returnData\":\"{\\\"doc\\\":\\\"\\\",\\\"cutterName\\\":\\\"\\\",\\\"cutterTypDnc\\\":0,\\\"cutterZl\\\":1.0,\\\"cutterXl\\\":1.0,\\\"cutterTime1\\\":1.0,\\\"cutterTime2\\\":1.0,\\\"cutterPlcBit\\\":1,\\\"cutterOverTime\\\":1,\\\"lcuts\\\":1.0,\\\"rcuts\\\":1.0,\\\"lu\\\":1.0,\\\"rn\\\":1.0,\\\"angle\\\":1.0,\\\"tangle\\\":1.0,\\\"pitch\\\":1.0,\\\"cutterYl\\\":1.0,\\\"cutterRs\\\":1.0,\\\"cutterTypSubDnc\\\":11,\\\"cutterTo\\\":1,\\\"dzl\\\":1.0,\\\"dxl\\\":1.0,\\\"dyl\\\":1.0,\\\"drs\\\":1.0,\\\"dcw\\\":1.0,\\\"cutterOri\\\":1.0,\\\"pangle\\\":1.0,\\\"cutlength\\\":1.0,\\\"cutwidth\\\":1.0}\"}\n";
             }
         } catch (Exception e) {
             throw new RuntimeException("调用接口报错:" + e.getMessage());
         }
         JSONObject retJson = JSONObject.parseObject(s);
         Boolean result = retJson.getBoolean("result");
+        CutterTestDataEntity cutterTestData = JSONObject.parseObject(retJson.getString("returnData"), CutterTestDataEntity.class);
 
         log.info("============接收到对刀仪数据下发机床的结果数据========={}", s);
         QueryWrapper queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("cutter_t", cutterTestDataEntity.getCutterT());
 
+        if(ischuliDele.equals("2")){
+            // 抹除机床数据，需要把机床原来数据写入到数据库中
+            cutterTestData.setCutterP(cutterTestDataEntity.getCutterP());
+            cutterTestData.setCutterT(cutterTestDataEntity.getCutterT());
+            cutterTestData.setCutterName(cutterTestDataEntity.getCutterName());
+            cutterTestData.setCutterTypSubDnc(cutterTestDataEntity.getCutterTypSubDnc());
+
+            BeanUtils.copyProperties(cutterTestData, cutterTestDataEntity);
+        }
+
+
         if (result) {
             cutterTestDataEntity.setStatus(3);
             //新增或修改刀具数据

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

@@ -448,8 +448,15 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     List<Long> getGoodsIds = list.stream().map(StockInfo::getGoodsId).collect(Collectors.toList());
 
                     List<MToolClamp> mToolClamps = mToolClampService.listByIds(getGoodsIds);
-                    // 拼接上传给plc的参数， 图号-零件号-源工序号-是否毛坯件-使用的检测程序
-                    String toPlcPar = bBom.getDrawingNo()+"&"+tWorkpiece.getUniqueCode()+"&"+bBom.getNo()+"&"+"1"+"&"+mToolClamps.get(0).getDetectionProgram();
+                    // 拼接上传给plc的参数， 图号+零件号+工序+是否成毛坯+程序名+任务号+人员编号+订单号+批次
+                    String toPlcPar = bBom.getDrawingNo()+"&"
+                            +tWorkpiece.getUniqueCode()+"&"
+                            +bBom.getNo()+"&1&"
+                            +mToolClamps.get(0).getDetectionProgram()+"&"
+                            +task.getTaskNo()+"&"
+                            +task.getExecutorId()+"&"
+                            +task.getOrderNo()+"&"
+                            +task.getBomBatchNo();
 
                     OrderQuality orderQuality = orderQualityMapper.selectOne(Wraps.<OrderQuality>lbQ().eq(OrderQuality::getDetectionCommand,toPlcPar));
 
@@ -518,7 +525,14 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     if("1".equals(procedure.getThreeDimensionalConf())){
                         /*data.put("workId", task.getCompleteBatchNo() + "-" + task.getProcedureNo());*/
                         //data.put("workId", task.getCompleteBatchNo() + "_" + taskNode.getId());
-                        String toPlcPar = bBom.getDrawingNo()+"&"+tWorkpiece.getUniqueCode()+"&"+bBom.getNo()+"&"+"2"+"&0";
+                        // 拼接上传给plc的参数， 图号-零件号-源工序号-是否毛坯件-使用的检测程序
+                        String toPlcPar = bBom.getDrawingNo()+"&"
+                                +tWorkpiece.getUniqueCode()+"&"
+                                +bBom.getNo()+"&2&0&"
+                                +task.getTaskNo()+"&"
+                                +task.getExecutorId()+"&"
+                                +task.getOrderNo()+"&"
+                                +task.getBomBatchNo();
 
                         data.put("workType", toPlcPar);
                         data.put("workId", taskNode.getCompleteBatchNo());
@@ -540,7 +554,14 @@ public class MachineNodeServiceImpl implements NodeOperationService {
 
                         List<MToolClamp> mToolClamps = mToolClampService.listByIds(getGoodsIds);
                         // 拼接上传给plc的参数， 图号-零件号-源工序号-是否毛坯件-使用的检测程序
-                        String toPlcPar = bBom.getDrawingNo()+"&"+tWorkpiece.getUniqueCode()+"&"+bBom.getNo()+"&"+"1"+"&"+mToolClamps.get(0).getDetectionProgram();
+                        String toPlcPar = bBom.getDrawingNo()+"&"
+                                +tWorkpiece.getUniqueCode()+"&"
+                                +bBom.getNo()+"&1&"
+                                +mToolClamps.get(0).getDetectionProgram()+"&"
+                                +task.getTaskNo()+"&"
+                                +task.getExecutorId()+"&"
+                                +task.getOrderNo()+"&"
+                                +task.getBomBatchNo();
 
                         data.put("workType", toPlcPar);
                         data.put("workId", task.getCompleteBatchNo() + "-" + task.getProcedureNo());

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/util/MsgUtil.java

@@ -421,7 +421,14 @@ public class MsgUtil implements ApplicationContextAware {
 
                     List<MToolClamp> mToolClamps = mToolClampService.listByIds(getGoodsIds);
                     // 拼接上传给plc的参数， 图号-零件号-源工序号-是否毛坯件-使用的检测程序
-                    String toPlcPar = bBom.getDrawingNo()+"&"+tWorkpiece.getUniqueCode()+"&"+bBom.getNo()+"&"+"1"+"&"+mToolClamps.get(0).getDetectionProgram();
+                    String toPlcPar = bBom.getDrawingNo()+"&"
+                            +tWorkpiece.getUniqueCode()+"&"
+                            +bBom.getNo()+"&1&"
+                            +mToolClamps.get(0).getDetectionProgram()+"&"
+                            +task.getTaskNo()+"&"
+                            +task.getExecutorId()+"&"
+                            +task.getOrderNo()+"&"
+                            +task.getBomBatchNo();
 
                     //获取偏差值数据
                     Map<String, List<String>> stringListMap = SmbShareFileUtil.processExcelFiles(threeDimensionalResultAddress, toPlcPar,"xlsx");

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/CuttingToolApplyController.java

@@ -133,10 +133,12 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
     @ApiOperation(value = "自动换刀", notes = "自动换刀")
     @PostMapping("/cuttingToolTask")
     public R<Boolean> cuttingToolTask() {
-        log.info("===============查询刀具安装申请表进行自动上刀====================");
+        long l = System.currentTimeMillis();
+        log.info("===============查询刀具安装申请表进行自动上刀====================,{}",l);
         BaseContextHandler.setTenant("0000");
         IPage<CuttingToolApply> page = new Page<CuttingToolApply>(1L, 100L);
         List<CuttingToolApply> dataList = baseService.findPageByQueryWrapper(page, new LbqWrapper<CuttingToolApply>().eq(CuttingToolApply::getProcessStatus, "0").orderByAsc(CuttingToolApply::getCreateTime).orderByAsc(CuttingToolApply::getPlanId).orderByAsc(CuttingToolApply::getResourceId).orderByAsc(CuttingToolApply::getProcessStatus)).getRecords();
+
         Map<String, CuttingToolApply> currentMap = Maps.newHashMap();
         dataList.stream().forEach(item -> {
             String goalDeviceId = item.getResourceId();

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/StationUserController.java

@@ -455,7 +455,7 @@ public class StationUserController extends SuperController<StationUserService, L
                 s = restTemplate.postForObject(url, formEntity, String.class);
 
             } else {
-                s = "{\"taskId\":\"1915689002237689856\",\"taskNodeID\":\"1915689002237689856\",\"result\":\"false\",\"resultMsg\":\"{\\\"code\\\":0,\\\"result\\\":false,\\\"msg\\\":\\\"数据设置失败，主轴正在使用此刀\\\",\\\"returnData\\\":null,\\\"statusCode\\\":200,\\\"toolsInfo\\\":\\\"\\\",\\\"errorsInfo\\\":\\\"\\\",\\\"runDatasInfo\\\":\\\"\\\",\\\"deviceData\\\":null}\",\"concurrency\":\"false\",\"data\":null,\"returnData\":null}\n";
+                s = "{\"taskId\":\"1915689002237689856\",\"taskNodeID\":\"1915689002237689856\",\"result\":\"true\",\"resultMsg\":\"{\\\"code\\\":0,\\\"result\\\":true,\\\"msg\\\":\\\"数据设置失败，主轴正在使用此刀\\\",\\\"returnData\\\":null,\\\"statusCode\\\":200,\\\"toolsInfo\\\":\\\"\\\",\\\"errorsInfo\\\":\\\"\\\",\\\"runDatasInfo\\\":\\\"\\\",\\\"deviceData\\\":null}\",\"concurrency\":\"false\",\"data\":null,\"returnData\":null}\n";
             }
 
             JSONObject retJson = JSONObject.parseObject(s);

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/ToolController.java

@@ -146,7 +146,8 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
     @ApiOperation(value = "同步刀具", notes = "同步刀具")
     @PostMapping("/synchronousTool")
     public R<Boolean> synchronousTool() throws Exception {
-        log.info("===============同步机床刀具=============");
+        long l = System.currentTimeMillis();
+        log.info("===============同步机床刀具=============时间组{}",l);
         BaseContextHandler.setTenant("0000");
         List<Productionresource> dataList = productionresourceBizService.list(new LbqWrapper<Productionresource>().eq(Productionresource::getStatus, "1").ne(Productionresource::getOnlineStatus,"0").isNotNull(Productionresource::getModeSpecification));
         List<Long> ids = dataList.stream().map(Productionresource::getId).collect(Collectors.toList());