From a78422827afcedefd5a0ca1d893198d48ea8062f Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期四, 09 五月 2024 09:16:56 +0800 Subject: [PATCH] 修改翻译 界面按钮顺序 布局等 --- springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java index 87b0feb..d007afd 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java +++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java @@ -38,6 +38,7 @@ String A02glassid1 = spianService.queGlassid("DB103.156", 14).toString(); String B01glassid = spianService.queGlassid("DB103.184", 14).toString(); String B02glassid = spianService.queGlassid("DB103.212", 14).toString(); + String D02glassid = spianService.queGlassid("DB103.58", 14).toString(); List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10); if (types == 0) {// 缁堟杩涚墖浠诲姟 List<StorageTask> cageList = homeMapper.SelectTaskByState(types); @@ -56,6 +57,10 @@ ClearGlassId("DB101.10.3"); outSliceServive.StopTask(storageTask.getGlassId(), types); } + if (storageTask.getGlassId().equals(D02glassid) && DeviceList.get(1) == 0) { + ClearGlassId("DB101.9.3"); + outSliceServive.StopTask(storageTask.getGlassId(), types); + } } // 鍙戦�佺粓姝㈣繘鐗囦换鍔′俊鍙� } else {// 缁堟鍑虹墖浠诲姟 -- Gitblit v1.8.0