1.用户反馈连铸机 其他供应商新增

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

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -189,11 +189,19 @@ public interface MesApiService {
     Observable<BaseMesBean> machineDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
-     * 连铸机详情
+     * 连铸三大件单独新增
      *
      * @return
      */
     @POST("/himes/api/msContinuousProducts/save.json")
     Observable<BaseMesBean> threeAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
 
+    /**
+     * otherSupplierAdd
+     *
+     * @return
+     */
+    @POST("/himes/api/msSupplierSupply/save.json")
+    Observable<BaseMesBean> otherSupplierAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+
 }

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

@@ -282,7 +282,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
                 startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
                 break;
             case R.id.tv_add3:
-                startActivity(MesOtherSupplierAddActivity.class);
+                startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
                 break;
             case R.id.tv_add4:
                 startActivity(MesPackageAddActivity.class);

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

@@ -14,6 +14,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
@@ -26,6 +27,7 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
+import com.wd.workoffice.util.PickTimeUtils;
 import com.wd.workoffice.util.WorkUtils;
 import com.zhihu.matisse.Matisse;
 import com.zhihu.matisse.MimeType;
@@ -35,6 +37,7 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -79,7 +82,7 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
     @BindView(R.id.et_baking_temperature)
     EditText etBakingTemperature;
     @BindView(R.id.tv_baking_time)
-    TextView tvBakingTime;
+    EditText tvBakingTime;
     @BindView(R.id.rl_time)
     RelativeLayout rlTime;
     @BindView(R.id.et_content)

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

@@ -25,6 +25,7 @@
 
 
             <EditText
+                android:id="@+id/et_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -51,6 +52,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_years"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -77,6 +79,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_supply_num"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -103,6 +106,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_stock_num"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -118,7 +122,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
             android:paddingVertical="15mm"
             android:paddingLeft="18mm"
             android:text="使用问题反馈（侵蚀、冲刷、断裂等）"
@@ -138,15 +141,34 @@
             android:padding="5mm"
             android:textSize="14sp" />
 
-        <androidx.recyclerview.widget.RecyclerView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10mm" />
+            android:paddingHorizontal="20mm">
+
+            <ImageView
+                android:id="@+id/iv_img1"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:src="@mipmap/img_add" />
+
+            <ImageView
+                android:id="@+id/iv_img2"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:layout_marginHorizontal="15mm"
+                android:src="@mipmap/img_add" />
+
+            <ImageView
+                android:id="@+id/iv_img3"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:src="@mipmap/img_add" />
+        </LinearLayout>
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
             android:paddingVertical="15mm"
             android:paddingLeft="18mm"
             android:text="备注"
@@ -154,11 +176,12 @@
 
 
         <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="10mm"
+            android:layout_marginBottom="100mm"
             android:background="@drawable/shape_input_white"
             android:gravity="top"
             android:hint="请输入"

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

@@ -307,13 +307,14 @@
                 android:text="烘烤时间"
                 android:textSize="14sp" />
 
-            <TextView
+            <EditText
                 android:id="@+id/tv_baking_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
+                android:inputType="number"
                 android:hint="请输入"
                 android:textSize="14sp" />
         </RelativeLayout>