Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2023-12-21 3cbdeaa5e8983ea5071ea446813ef5215b9822a0

 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java

@@ -187,19 +187,27 @@
                                            }
                                        }
                                    }

//完成出片
                                    boolean containsOne = data.stream().anyMatch(number -> number == 1);
                                    for (int i = 1; i <= 5; i++) {
                                        boolean value = sValue.get(i);
                                        if (value) {
                                        String id=paramlist.get(i);
                                        //判断是否自动状态
                                       if(!containsOne) {
                                     //判断id是否包含数字
                                      if(id.matches(".*\\d.*")){
                                          //判断清楚id是否true
                                          if (value) {
                                           System.out.println(id);
                                            switch (i) {
                                                case 1:
                                                    StorageCageService.UpdateTask(0, 0, paramlist.get(i));
                                                    StorageCageService.UpdateTask(2, 0, paramlist.get(i));
                                                    break;
                                                case 2:
                                                case 3:
                                                case 4:
                                                case 5:
                                                    StorageCageService.UpdateTask(1, 0, paramlist.get(i));
                                                    StorageCageService.UpdateTask(3, 0, paramlist.get(i));
                                                    break;
                                                default:
                                                    // 处理索引值不在范围内的情况
@@ -207,7 +215,8 @@
                                            }
                                        }
                                    }

                                 }
                                    }
                                    // 检查布尔值列表是否为空
                                    if (!sValue.isEmpty()) {

@@ -256,7 +265,7 @@
                                            }
                                        }
                                    }

// 终止进片任务
                                    boolean Value1 = sValue.get(0);
                                    boolean Value2 = sValue.get(1);

@@ -265,7 +274,7 @@

                                    }
                                    if (Value2) {
                                        StorageCageService.EndTask(0);
                                        StorageCageService.EndTask(1);

                                    }
                                    // 检查布尔值列表是否为空