From 7db64c0c4be5125c958e3218df4f6c140cdb2c1f Mon Sep 17 00:00:00 2001 From: fyf Date: Thu, 18 Jan 2024 15:36:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8A=95=E6=96=99=E6=80=8E?= =?UTF-8?q?=E4=B9=88=E8=9C=82=E9=B8=A3=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonait/bnframework/business/ExecuteTheRecipe.java | 2 ++ .../modules/home/activity/BottomNavigationNewActivity.java | 2 ++ .../bonait/bnframework/modules/home/fragment/Home1Fragment.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java index f1c6f7d2..4249cd37 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java +++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java @@ -536,6 +536,7 @@ public class ExecuteTheRecipe { if (ConfigName.getInstance().WhetherManualFeedingSuspended.contains("是")) { ExecuteTheRecipe.WritePLC("暂停开关", true, null); } + ModbusTcpServer.get().WriteBool("M52.1", (boolean) true, null); final boolean[] IsComplete = {false}; Activity activity = findActivity(context); @@ -567,6 +568,7 @@ public class ExecuteTheRecipe { if (ConfigName.getInstance().WhetherManualFeedingSuspended.contains("是")) { ExecuteTheRecipe.WritePLC("暂停开关", false, null); } + ModbusTcpServer.get().WriteBool("M52.1", (boolean) false, null); ExecuteTheRecipe.showlog("手动已确认投入主料:" + name + "-继续流程"); } else { diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java index 4be45f54..609e8a82 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java @@ -367,6 +367,7 @@ public class BottomNavigationNewActivity extends BaseActivity { ExecuteTheRecipe.showlog("--------------------------------------"); ExecuteTheRecipe.showlog("开始烹饪菜谱【"+goods.name+"】"); + ModbusTcpServer.get().WriteBool("M52.0", (boolean) true, null); try { //获取工艺 @@ -432,6 +433,7 @@ public class BottomNavigationNewActivity extends BaseActivity { } }); ExecuteTheRecipe.showlog("--------------------------------------"); + ModbusTcpServer.get().WriteBool("M52.0", (boolean) false, null); } } diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java index e30db2e0..00fc65f3 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java @@ -574,6 +574,7 @@ public class Home1Fragment extends BaseFragment { long startTime = System.currentTimeMillis(); //起始时间 ExecuteTheRecipe.showlog("--------------------------------------"); ExecuteTheRecipe.showlog("开始烹饪菜谱【"+good.name+"】"); + ModbusTcpServer.get().WriteBool("M52.0", (boolean) true, null); try { //获取工艺 @@ -633,6 +634,7 @@ public class Home1Fragment extends BaseFragment { }); } ExecuteTheRecipe.showlog("--------------------------------------"); + ModbusTcpServer.get().WriteBool("M52.0", (boolean) false, null); } }