1.用户反馈连铸机 三大件新增

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketProActivity.java

@@ -29,7 +29,7 @@ import flexible.xd.android_base.network.rtfhttp.Transformer;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 选择客户
+ * 选择产品
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -133,7 +133,7 @@ public class MesTicketProActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
-        param.put("name", etKey.getText().toString());
+        param.put("productName", etKey.getText().toString());
         param.put("pageNum", 1);
         page = 1;
         getData();

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java

@@ -11,6 +11,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.AddTicketEvent;
+import com.wd.workoffice.bean.event.RefreshMachineEvent;
 import com.wd.workoffice.bean.mesBean.MchineDetailBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -18,6 +20,9 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -309,5 +314,20 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
         }
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
 
+    @Subscribe
+    public void refresh(RefreshMachineEvent event) {
+        getData();
+    }
 }

app/src/main/res/layout/activity_mes_user_data_machine_detail.xml

@@ -669,7 +669,7 @@
                     android:id="@+id/tv_add1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
+                    android:gravity="right"
                     android:text="添加 +"
                     android:textSize="16sp" />
             </LinearLayout>
@@ -680,6 +680,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10mm"
             android:background="@android:color/white"
+            android:gravity="right"
             android:paddingHorizontal="20mm"
             android:paddingVertical="9mm">
 
@@ -694,7 +695,8 @@
                 android:id="@+id/rv_data2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true" />
+                android:layout_alignParentRight="true"
+                android:layout_gravity="right" />
 
         </RelativeLayout>
 
@@ -702,6 +704,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="10mm"
             android:background="@android:color/white"
             android:paddingHorizontal="20mm"
             android:paddingVertical="9mm">
@@ -723,15 +726,16 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_data3"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-                t
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right" />
+
 
                 <TextView
                     android:id="@+id/tv_add3"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="添加 +"
                     android:gravity="right"
+                    android:text="添加 +"
                     android:textSize="16sp" />
             </LinearLayout>
         </RelativeLayout>
@@ -739,6 +743,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="10mm"
             android:background="@android:color/white"
             android:paddingHorizontal="20mm"
             android:paddingVertical="9mm">
@@ -765,8 +770,8 @@
                 <TextView
                     android:id="@+id/tv_add4"
                     android:layout_width="match_parent"
-                    android:gravity="right"
                     android:layout_height="wrap_content"
+                    android:gravity="right"
                     android:text="添加 +"
                     android:textSize="16sp" />
             </LinearLayout>

app/src/main/res/layout/activity_mes_user_data_three.xml

 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -64,14 +65,13 @@
                 android:textSize="14sp" />
 
 
-            <EditText
+            <TextView
                 android:id="@+id/et_img_code"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
-                android:hint="请输入"
                 android:textSize="14sp" />
         </RelativeLayout>
 
@@ -91,14 +91,13 @@
                 android:text="产品类别"
                 android:textSize="14sp" />
 
-            <EditText
+            <TextView
                 android:id="@+id/et_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
-                android:hint="请输入"
                 android:textSize="14sp" />
         </RelativeLayout>
 
@@ -118,14 +117,13 @@
                 android:text="产品规格"
                 android:textSize="14sp" />
 
-            <EditText
+            <TextView
                 android:id="@+id/et_spec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
-                android:hint="请输入"
                 android:textSize="14sp" />
         </RelativeLayout>
 
@@ -295,6 +293,7 @@
         <View style="@style/dividerX" />
 
         <RelativeLayout
+            android:id="@+id/rl_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -308,8 +307,8 @@
                 android:text="烘烤时间"
                 android:textSize="14sp" />
 
-            <EditText
-                android:id="@+id/et_baking_time"
+            <TextView
+                android:id="@+id/tv_baking_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -338,8 +337,8 @@
             android:layout_marginTop="3mm"
             android:background="@drawable/shape_input_white"
             android:gravity="top"
-            android:minLines="3"
             android:hint="请输入"
+            android:minLines="3"
             android:padding="5mm"
             android:textSize="14sp" />
 
@@ -378,15 +377,16 @@
 
 
         <EditText
+            android:id="@+id/et_remark"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20mm"
             android:layout_marginTop="3mm"
+            android:layout_marginBottom="100mm"
             android:background="@drawable/shape_input_white"
             android:gravity="top"
-            android:minLines="3"
             android:hint="请输入"
-            android:layout_marginBottom="100mm"
+            android:minLines="3"
             android:padding="5mm"
             android:textSize="14sp" />
     </LinearLayout>

app/src/main/res/layout/item_machine.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="14mm"
     android:background="@android:color/white"
+    android:gravity="right"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="right"
         android:paddingHorizontal="5mm"
         android:text="zzz"
         android:textColor="@color/blue_btn" />