三坐标测量程序动态查询修改

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

@@ -311,12 +311,19 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     //map.put("zkIp", ZK_ip_zlzx);
                     //map.put(DemoLineConstant.DEMOLINE_BIZ_TYPE, "testwork");
                     //查出工序三坐标相关
-                    //BomProcedure procedure = bomProcedureService.getById(task.getProcedureId());
-                    //String unionCode = workpieceService.getUnionCode(task.getCompleteBatchNo());
+                    BomProcedure procedure = bomProcedureService.getById(task.getProcedureId());
                     JSONObject data = new JSONObject();
-                    //三坐标生成编号 动态可变
-                    data.put("workId", "measuring_123");
-                    data.put("workType", "1111");
+                    // 判断是工件坐标系还是质量测量
+                    if("1".equals(procedure.getThreeDimensionalConf())){
+                        data.put("workId", task.getCompleteBatchNo() + "-" + task.getProcedureNo());
+                        data.put("workType", procedure.getThreeDimensionalPrograme());
+                    }
+                    if("1".equals(procedure.getThreeDimensionalDeviationConf())){
+                        data.put("workId", task.getCompleteBatchNo() + "-" + task.getProcedureNo());
+                        data.put("workType", procedure.getThreeDimensionalDeviationPrograme());
+                    }
+//                    String unionCode = workpieceService.getUnionCode(task.getCompleteBatchNo());
+
                     //map.put("data", JSONObject.toJSONString(queryMap));
                     map.put("method", moduleInstructions.get(0).getCode());
                     map.put("url",plcInfo.get("url"));