333

app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java

@@ -407,8 +407,8 @@ public class DataBus {
                 wdszMode mode=new wdszMode();
                 mode.name=item;
                 mode.temp=0;
-                //Object sx=ExecuteTheRecipe.ReadPLC(item+"设置");
-                mode.tempup=0;//sx==null?0:(int)sx;
+                Object sx=ExecuteTheRecipe.ReadPLC(item+"设置");
+                mode.tempup=sx==null?0:(int)sx;
                 mode.autoheat=false;
                 if(item.equals("水池温度"))
                 {

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java

@@ -584,6 +584,8 @@ public class silos_jiaoyan extends LinearLayout {
                 try {
                     ExecuteTheRecipe.WritePLC("配料完成", false, null);
                     ExecuteTheRecipe.WritePLC("手自切换", true, null);
+                    int otherG=lcMode.silosmargin-(kkk/10);
+                    QueryDB.UpdateYL(lcMode.id,otherG>=0?otherG:0);
                     ExecuteTheRecipe.WritePLC("需求值" + lcMode.num, kkk, new IWriteCallBack() {
                         @Override
                         public void onSuccess() {

app/src/main/res/layout/item/layout/dialog_add_good.xml

@@ -3,7 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/dialogbj">
+    android:background="@color/dialogbj"
+    android:focusable="true"
+    android:clickable="true">
 
     <RelativeLayout
         android:layout_marginLeft="50dp"

app/src/main/res/layout/item/layout/dialog_add_pf.xml

@@ -3,7 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/dialogbj">
+    android:background="@color/dialogbj"
+    android:focusable="true"
+    android:clickable="true">
 
     <RelativeLayout
         android:layout_centerInParent="true"

app/src/main/res/layout/item/layout/dialog_add_pf_home.xml

@@ -3,7 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/dialogbj">
+    android:background="@color/dialogbj"
+    android:focusable="true"
+    android:clickable="true">
 
     <RelativeLayout
         android:layout_centerInParent="true"