4

app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java

@@ -1060,6 +1060,13 @@ public class ExecuteTheRecipe {
             }
             WriteMainPLC("机器人放辅料完成", false, null);
             WriteMainPLC("炒锅请求投辅料", true, null);
+
+
+            boolean isJre=false;
+            Object K= ReadPLC("加热");
+            isJre=K==null?false:(boolean) K;
+            if(isJre) {ExecuteTheRecipe.WritePLC("加热", false, null);}//提前关闭加热
+
             final boolean[] IsComplete = {false};
             long a = System.currentTimeMillis();
             while (!IsComplete[0]) {
@@ -1074,6 +1081,7 @@ public class ExecuteTheRecipe {
                 Thread.sleep(100);//10 *6
             }
             WriteMainPLC("机器人放辅料完成", false, null);
+            if(isJre) {ExecuteTheRecipe.WritePLC("加热", true, null);}//再次释放加热
 
             if (val > 0) {
                 Thread.sleep(val * 1000);
@@ -1103,7 +1111,7 @@ public class ExecuteTheRecipe {
                     }
                 }
             }
-            ExecuteTheRecipe.WritePLC("搅拌", false, null);
+            //ExecuteTheRecipe.WritePLC("搅拌", false, null);
             ExecuteTheRecipe.WritePLC("加热", false, null);
 
             WriteMainPLC("炒锅出餐完成", false, null);
@@ -1294,7 +1302,7 @@ public class ExecuteTheRecipe {
                     if (ConfigName.getInstance().PlcIsConnect) {
                         TempControl();
                         ReadPLCStatus();
-                        ReadPLCMainStatus();
+
                     }
 
                 } catch (Exception ex) {
@@ -1318,6 +1326,7 @@ public class ExecuteTheRecipe {
                         WritePLC("心跳位", 0, null);
                         Log.e("心跳", "心跳: ");
                         //Log.e("心跳", "心跳: "+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+
                     }
 
                 } catch (Exception ex) {
@@ -1354,12 +1363,12 @@ public class ExecuteTheRecipe {
                 try {
                     if (ConfigName.getInstance().PlcMainIsConnect) {
                         //心跳
+                        ReadPLCMainStatus();
                         WriteMainPLC("心跳", false, null);
                         WriteMainPLC("炒锅空闲状态", ConfigName.getInstance().WokStatus, null);
                         WriteMainPLC("投料机构状态", ConfigName.getInstance().TouLiaoStatus, null);
                         Log.e("炒锅状态", "炒锅状态: "+ ConfigName.getInstance().WokStatus);
                         Log.e("投料机构状态", "投料机构状态: "+ ConfigName.getInstance().TouLiaoStatus);
-
                         //读取主控下发的商品
                         ReadMasterDeliveryGoods();
                     }