diff --git a/app/src/main/java/com/bonait/bnframework/business/MainInit.java b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
index d7f8af17..e17d262c 100644
--- a/app/src/main/java/com/bonait/bnframework/business/MainInit.java
+++ b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
@@ -82,7 +82,7 @@ public class MainInit {
         MainNotification.initNotificationChannel(app);
 
         // 内存泄漏检测
-        initLeakCanary(true,app);
+        initLeakCanary(BuildConfig.DEBUG,app);
 
         // Log日志打印框架
         initLogCat();
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java
index 85f3c696..016a070e 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java
@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -43,8 +44,8 @@ public class goodpf_apapter extends ArrayAdapter<BPA_GOODSRECIPENAME> {
         View view = LayoutInflater.from(getContext()).inflate(resource1, parent, false);
         //分别获取 image view 和 textview 的实例
         TextView name = view.findViewById(R.id.name);
-        ImageView button = view.findViewById(R.id.button_item);
-        ImageView button_update = view.findViewById(R.id.button_update);
+        RelativeLayout button = view.findViewById(R.id.button_item);
+        RelativeLayout button_update = view.findViewById(R.id.button_update);
 
         // 设置要显示的图片和文字
         name.setText(bpa_goodsrecipename.name);
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
index 7cbf1e9a..7ed5bb5b 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
@@ -666,7 +666,11 @@ public class MakeGoodFragment extends BaseFragment {
                 activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        String msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | ";
+                        String msg = msg2;
+
+                        if(ConfigName.TEST){
+                            msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | ";
+                        }
                         if ((msg != null) && (((String) msg).length() > 2) && ((String) msg).contains("|")) {
                             //拿到扫码数据
                             //例如 ORD001|P0003|A001,M002,T001|2
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java
index 3345122c..5ccb8a2b 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java
@@ -469,7 +469,7 @@ public class GoodInformation extends LinearLayout implements MyClickListener {
                         {
                             BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id);
                             if (goodsrecipename != null) {
-                                ToastUtils.warning("已有改做法配方,不能在新增了!");
+                                ToastUtils.warning("已有该做法配方,不能再新增了!");
                                 return;
                             }
                         }
@@ -538,7 +538,7 @@ public class GoodInformation extends LinearLayout implements MyClickListener {
                     //判断配方是否有相同规格的了
                     BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id);
                     if (goodsrecipename != null) {
-                        ToastUtils.warning("已有改做法配方,不能在新增了!");
+                        ToastUtils.warning("已有该做法配方,不能再新增了!");
                         return;
                     }
                     //新增配方名称
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
index 3ba9e9ae..dd9a92bb 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
@@ -446,7 +446,7 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
         {
             BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids,Good.id);
             if (goodsrecipename != null) {
-                ToastUtils.warning("已有改做法配方,不能在新增了!");
+                ToastUtils.warning("已有该做法配方,不能再新增了!");
                 return isSuceess;
             }
         }
diff --git a/app/src/main/res/layout/datatab/layout/wl_item.xml b/app/src/main/res/layout/datatab/layout/wl_item.xml
index fbce4ddc..27d92d20 100644
--- a/app/src/main/res/layout/datatab/layout/wl_item.xml
+++ b/app/src/main/res/layout/datatab/layout/wl_item.xml
@@ -57,25 +57,25 @@
                 android:layout_weight="1"
                 android:background="@drawable/border">
                 <RelativeLayout
+                    android:id="@+id/button_update"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1">
 
                     <ImageView
-                        android:id="@+id/button_update"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
                         android:src="@mipmap/new_update" />
                 </RelativeLayout>
                 <RelativeLayout
+                    android:id="@+id/button_item"
                     android:layout_width="0dp"
-                    android:layout_height="30dp"
+                    android:layout_height="50dp"
                     android:layout_weight="1"
                     android:background="@drawable/border">
                     <ImageView
                         android:layout_centerInParent="true"
-                        android:id="@+id/button_item"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:src="@mipmap/new_delete"/>
diff --git a/app/src/main/res/layout/fragment_make_good.xml b/app/src/main/res/layout/fragment_make_good.xml
index 5aa8614a..1bdc158b 100644
--- a/app/src/main/res/layout/fragment_make_good.xml
+++ b/app/src/main/res/layout/fragment_make_good.xml
@@ -18,7 +18,7 @@
             android:layout_weight="1"
             android:orientation="horizontal">
             <LinearLayout
-                android:layout_width="100dp"
+                android:layout_width="90dp"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="35dp"
                 android:background="@color/white"
@@ -66,14 +66,14 @@
                         android:id="@+id/rv_right"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginRight="360dp"
+                        android:layout_marginRight="250dp"
                         android:orientation="vertical"
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
                     <LinearLayout
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="@dimen/dp_10"
-                        android:layout_width="350dp"
+                        android:layout_width="250dp"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
                         <ImageView
@@ -85,7 +85,7 @@
                         <RelativeLayout
                             android:id="@+id/loadgoodliebiao"
                             android:layout_marginTop="@dimen/dp_10"
-                            android:layout_width="350dp"
+                            android:layout_width="match_parent"
                             android:layout_height="match_parent">
                             <ScrollView
                                 android:layout_width="match_parent"
@@ -165,6 +165,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:text="称(单击清零):"
+                android:paddingTop="15dp"
                 android:textSize="@dimen/TitleSize" />
 
             <TextView
diff --git a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
index 87d48d9d..c8fbb91e 100644
--- a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
+++ b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
@@ -11,7 +11,7 @@
     <RelativeLayout
         android:layout_centerInParent="true"
         android:layout_margin="20dp"
-        android:layout_width="400dp"
+        android:layout_width="500dp"
         android:layout_height="400dp"
         android:background="@drawable/common_bg_with_radius_and_border">
 
@@ -138,8 +138,8 @@
                         android:orientation="vertical">
                         <Button
                             android:id="@+id/control_switch_shoudong"
-                            android:layout_width="80dp"
-                            android:layout_height="50dp"
+                            android:layout_width="120dp"
+                            android:layout_height="70dp"
                             android:layout_centerHorizontal="true"
                             android:background="@drawable/silosbuttonbj"
                             android:text="出料"
@@ -149,8 +149,8 @@
                         <Button
                             android:layout_marginTop="@dimen/dp_10"
                             android:id="@+id/control_huishou"
-                            android:layout_width="80dp"
-                            android:layout_height="50dp"
+                            android:layout_width="120dp"
+                            android:layout_height="70dp"
                             android:layout_centerHorizontal="true"
                             android:background="@drawable/silosbuttonbj"
                             android:text="回收"
diff --git a/app/src/main/res/layout/item/layout/loadinggood_item.xml b/app/src/main/res/layout/item/layout/loadinggood_item.xml
index 50aa712b..7d436089 100644
--- a/app/src/main/res/layout/item/layout/loadinggood_item.xml
+++ b/app/src/main/res/layout/item/layout/loadinggood_item.xml
@@ -36,11 +36,12 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:layout_marginLeft="10dp"
+                    android:textSize="16sp"
                     android:text="01"></TextView>
             </RelativeLayout>
 
             <RelativeLayout
-                android:layout_marginRight="60dp"
+                android:layout_marginRight="100dp"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 <LinearLayout
@@ -54,6 +55,7 @@
                         android:layout_height="wrap_content"
                         android:text="金牡丹菠萝奶茶茶饮"
                         android:textAlignment="center"
+                        android:textSize="16sp"
                         />
 
                     <TextView
@@ -61,6 +63,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="中杯/去冰/无糖"
+                        android:textSize="16sp"
                         android:textAlignment="center" />
                     <TextView
                         android:visibility="gone"
@@ -73,7 +76,9 @@
         </LinearLayout>
 
         <RelativeLayout
-            android:layout_width="match_parent"
+            android:layout_width="100dp"
+            android:gravity="right"
+            android:layout_alignParentRight="true"
             android:layout_height="match_parent">
             <TextView
                 android:id="@+id/loading_status"
@@ -81,20 +86,22 @@
                 android:layout_marginRight="10dp"
                 android:gravity="center"
                 android:layout_width="100dp"
+                android:textSize="16sp"
                 android:layout_height="50dp"
                 android:text="制作中"></TextView>
             <Button
                 android:layout_alignParentBottom="true"
                 android:id="@+id/quxiaozhizuo"
                 android:layout_width="100dp"
-                android:layout_height="50dp"
+                android:layout_height="40dp"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="5dp"
                 android:layout_alignParentRight="true"
                 android:background="@drawable/bg_btn_login_selected"
                 android:text="取消"
+                android:textSize="16sp"
                 android:textColor="@color/white"
-                android:textSize="14sp"/>
+                />
         </RelativeLayout>
         <RelativeLayout
             android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/item/layout/newmakegood.xml b/app/src/main/res/layout/item/layout/newmakegood.xml
index 333110a2..776665a1 100644
--- a/app/src/main/res/layout/item/layout/newmakegood.xml
+++ b/app/src/main/res/layout/item/layout/newmakegood.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="220dp"
+    android:layout_width="205dp"
     android:layout_height="180dp">
 
 
diff --git a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
index 5c12afb8..9ad54c98 100644
--- a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
+++ b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
@@ -26,6 +26,20 @@
                 android:text="通道校准"
                 android:textSize="20dp"
                 android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="60dp"
+                android:text="当前重量："
+                android:textSize="20sp"/>
+
+            <TextView
+                android:id="@+id/current_weight"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="实际出料重量："
+                android:textSize="20sp"/>
         </LinearLayout>
 
         <Button
@@ -45,7 +59,7 @@
             android:id="@+id/title_bc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginTop="15dp"
             android:text="11 豆瓣酱"
             android:textAlignment="center"
@@ -107,7 +121,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="最小出料时间："
-                                            android:textSize="25sp"/>
+                                            android:textSize="20sp"/>
 
                                         <EditText
                                             android:id="@+id/min_time"
@@ -121,20 +135,20 @@
                                             android:maxLines="1"
                                             android:padding="3dp"
                                             android:text="2"
-                                            android:textSize="25dp"/>
+                                            android:textSize="20sp"/>
 
                                     </LinearLayout>
 
                                     <LinearLayout
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:layout_marginTop="30dp"
+                                        android:layout_marginTop="20dp"
                                         android:orientation="horizontal">
                                         <TextView
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="最小出料重量："
-                                            android:textSize="25sp"/>
+                                            android:textSize="20sp"/>
 
                                         <EditText
                                             android:id="@+id/min_weight"
@@ -148,19 +162,19 @@
                                             android:maxLines="1"
                                             android:padding="3dp"
                                             android:text="2"
-                                            android:textSize="25dp"/>
+                                            android:textSize="20sp"/>
 
                                     </LinearLayout>
 
                                     <Button
                                         android:id="@+id/btn_min_standard"
                                         android:layout_width="match_parent"
-                                        android:layout_marginTop="30dp"
+                                        android:layout_marginTop="20dp"
                                         android:layout_height="wrap_content"
                                         android:background="@drawable/bg_btn_login_selected"
                                         android:text="最小校准"
                                         android:textColor="@color/white"
-                                        android:textSize="25sp"/>
+                                        android:textSize="20sp"/>
                                 </LinearLayout>
 
                                 <LinearLayout
@@ -179,7 +193,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="最大出料时间："
-                                            android:textSize="25sp"/>
+                                            android:textSize="20sp"/>
 
                                         <EditText
                                             android:id="@+id/max_time"
@@ -193,20 +207,20 @@
                                             android:maxLines="1"
                                             android:padding="3dp"
                                             android:text="2"
-                                            android:textSize="25dp"/>
+                                            android:textSize="20sp"/>
 
                                     </LinearLayout>
 
                                     <LinearLayout
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:layout_marginTop="30dp"
+                                        android:layout_marginTop="20dp"
                                         android:orientation="horizontal">
                                         <TextView
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="最大出料重量："
-                                            android:textSize="25sp"/>
+                                            android:textSize="20sp"/>
 
                                         <EditText
                                             android:id="@+id/max_weight"
@@ -220,19 +234,19 @@
                                             android:maxLines="1"
                                             android:padding="3dp"
                                             android:text="2"
-                                            android:textSize="25dp"/>
+                                            android:textSize="20sp"/>
 
                                     </LinearLayout>
 
                                     <Button
-                                        android:layout_marginTop="30dp"
+                                        android:layout_marginTop="20dp"
                                         android:id="@+id/btn_max_standard"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:background="@drawable/bg_btn_login_selected"
                                         android:text="最大校准"
                                         android:textColor="@color/white"
-                                        android:textSize="25sp" />
+                                        android:textSize="20sp" />
 
                                 </LinearLayout>
 
@@ -245,14 +259,14 @@
                                 android:background="@color/gray"/>
 
                             <Button
-                                android:layout_marginTop="30dp"
+                                android:layout_marginTop="20dp"
                                 android:id="@+id/btn_save"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/bg_btn_login_selected"
                                 android:text="保存参数"
                                 android:textColor="@color/white"
-                                android:textSize="25sp" />
+                                android:textSize="20sp" />
 
                             <View
                                 android:layout_width="650dp"
@@ -263,7 +277,7 @@
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:layout_marginTop="30dp"
+                                android:layout_marginTop="20dp"
                                 android:orientation="horizontal">
 
                                 <LinearLayout
@@ -274,7 +288,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="模拟出料重量："
-                                        android:textSize="25sp"/>
+                                        android:textSize="20sp"/>
 
                                     <EditText
                                         android:id="@+id/sim_discharge_weight"
@@ -288,7 +302,7 @@
                                         android:maxLines="1"
                                         android:padding="3dp"
                                         android:text="2"
-                                        android:textSize="25dp"/>
+                                        android:textSize="20sp"/>
 
                                 </LinearLayout>
 
@@ -300,14 +314,14 @@
                                     android:background="@drawable/bg_btn_login_selected"
                                     android:text="模拟出料"
                                     android:textColor="@color/white"
-                                    android:textSize="25sp" />
+                                    android:textSize="20sp" />
 
                             </LinearLayout>
 
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:layout_marginTop="30dp"
+                                android:layout_marginTop="20dp"
                                 android:orientation="horizontal">
 
                                 <LinearLayout
@@ -318,14 +332,14 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="实际出料重量："
-                                        android:textSize="25sp"/>
+                                        android:textSize="20sp"/>
 
                                     <TextView
                                         android:id="@+id/tv_discharge_result"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text=""
-                                        android:textSize="25sp"/>
+                                        android:textSize="20sp"/>
 
                                 </LinearLayout>