1.三大件详情

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

app/src/main/java/com/wd/workoffice/bean/mesBean/MachineDetailBean.java

@@ -925,7 +925,7 @@ public class MachineDetailBean {
             private String productsName;
             private String figureNumber;
             private String productsType;
-            private Object productsStandards;
+            private String productsStandards;
             private String materialsUsed;
             private String useRequirement;
             private String useLife;
@@ -939,9 +939,9 @@ public class MachineDetailBean {
             private Object createUserName;
             private String updateUserId;
             private String updateUserName;
-            private Object remark;
+            private String remark;
             private boolean delete;
-            private List<?> attachments;
+            private List<ImageBean> attachments;
 
             public String getId() {
                 return id;
@@ -1007,11 +1007,11 @@ public class MachineDetailBean {
                 this.productsType = productsType;
             }
 
-            public Object getProductsStandards() {
+            public String getProductsStandards() {
                 return productsStandards;
             }
 
-            public void setProductsStandards(Object productsStandards) {
+            public void setProductsStandards(String productsStandards) {
                 this.productsStandards = productsStandards;
             }
 
@@ -1119,11 +1119,11 @@ public class MachineDetailBean {
                 this.updateUserName = updateUserName;
             }
 
-            public Object getRemark() {
+            public String getRemark() {
                 return remark;
             }
 
-            public void setRemark(Object remark) {
+            public void setRemark(String remark) {
                 this.remark = remark;
             }
 
@@ -1135,11 +1135,11 @@ public class MachineDetailBean {
                 this.delete = delete;
             }
 
-            public List<?> getAttachments() {
+            public List<ImageBean> getAttachments() {
                 return attachments;
             }
 
-            public void setAttachments(List<?> attachments) {
+            public void setAttachments(List<ImageBean> attachments) {
                 this.attachments = attachments;
             }
         }

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

@@ -242,7 +242,32 @@ public interface MesApiService {
      *
      * @return
      */
-    @POST("/himes/api//msSceneFeedback/approval.json")
+    @POST("/himes/api/msSceneFeedback/approval.json")
     Observable<BaseMesBean> userDataCheck(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+
+    /**
+     * 连铸三大件
+     *
+     * @return
+     */
+    @GET("/himes/api/msContinuousProducts/show/{id}.json")
+    Observable<BaseMesBean> threeDetail(@Path("id") String id, @Query("functionId") String functionId);
+
+    /**
+     * 其他供应商供货情况
+     *
+     * @return
+     */
+    @GET("/himes/api/msSupplierSupply/show/{id}.json")
+    Observable<BaseMesBean> supplierDetail(@Path("id") String id, @Query("functionId") String functionId);
+
+    /**
+     * 其他中包耐材记录
+     *
+     * @return
+     */
+    @GET("/himes/api/msLadleRefractoryRecord/show/{id}.json")
+    Observable<BaseMesBean> middleDetail(@Path("id") String id, @Query("functionId") String functionId);
+
 }

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

@@ -128,7 +128,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
         } else {
             btnReviews.setVisibility(View.VISIBLE);
         }
-        rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.HORIZONTAL, false));
+        rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
         rvAnnex.setLayoutManager(new LinearLayoutManager(this,  RecyclerView.VERTICAL, false));
 
     }

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

@@ -254,7 +254,8 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
         data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesSupplierActivity.class);
+                startActivity(MesSupplierActivity.class,"data",JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+
             }
         });
         data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.EditText;
+import android.os.Bundle;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.event.AddFactoryEvent;
+import com.wd.workoffice.bean.mesBean.ImageBean;
+import com.wd.workoffice.bean.mesBean.MachineDetailBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.ImgAdapter;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
+import java.util.ArrayList;
+import java.util.List;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
 
 /**
  * author : flexible
@@ -22,21 +30,55 @@ import butterknife.ButterKnife;
  * github: https://github.com/FlexibleXd
  **/
 public class MesThreeDetailActivity extends WorkToolBarActivity {
-
-    @BindView(R.id.tv_factory)
-    TextView tvFactory;
-    @BindView(R.id.rl_factory)
-    RelativeLayout rlFactory;
-    @BindView(R.id.et_content)
-    EditText etContent;
+    @BindView(R.id.tv_pro)
+    TextView tvPro;
+    @BindView(R.id.rl_pro)
+    RelativeLayout rlPro;
+    @BindView(R.id.et_img_code)
+    TextView etImgCode;
+    @BindView(R.id.et_type)
+    TextView etType;
+    @BindView(R.id.et_spec)
+    TextView etSpec;
+    @BindView(R.id.tv_material)
+    TextView tvMaterial;
+    @BindView(R.id.tv_requirements)
+    TextView tvRequirements;
+    @BindView(R.id.tv_years)
+    TextView tvYears;
+    @BindView(R.id.tv_position)
+    TextView tvPosition;
+    @BindView(R.id.tv_baking_method)
+    TextView tvBakingMethod;
+    @BindView(R.id.tv_baking_temperature)
+    TextView tvBakingTemperature;
+    @BindView(R.id.tv_baking_time)
+    TextView tvBakingTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    @BindView(R.id.tv_content)
+    TextView tvContent;
+    @BindView(R.id.rv_img)
+    RecyclerView rvImg;
+    @BindView(R.id.tv_remark)
+    TextView tvRemark;
+    private MachineDetailBean.ProductListBean dataBean;
+    private List<ImageBean> imgList;
+    private ImgAdapter imgAdapter;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
+        rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
+
     }
 
     @Override
     protected void initData() {
+        imgList = new ArrayList<>();
+        imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
+        imgAdapter.bindToRecyclerView(rvImg);
+        getData();
     }
 
 
@@ -46,24 +88,46 @@ public class MesThreeDetailActivity extends WorkToolBarActivity {
 
     @Override
     protected int layoutId() {
-        return R.layout.activity_mes_user_data_three;
+        return R.layout.activity_mes_user_data_three_detail;
     }
 
-
+    private void getData() {
+        RtfUtils.getMesRtf().threeDetail( getIntent().getStringExtra("id"),"1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
-    public void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
+            public void doOnSubscribe(Disposable d) {
             }
 
             @Override
-    public void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
             }
 
-    @Subscribe
-    public void refresh(AddFactoryEvent event) {
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
+                    return;
                 }
 
+                dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.ProductListBean.class);
+                imgList.addAll(dataBean.getAttachments());
+                imgAdapter.notifyDataSetChanged();
+                tvPro.setText(dataBean.getProductsName());
+                etImgCode.setText(dataBean.getFigureNumber());
+                etSpec.setText(dataBean.getProductsStandards());
+                etType.setText(dataBean.getProductsType());
+                tvMaterial.setText(dataBean.getMaterialsUsed());
+                tvRequirements.setText(dataBean.getUseRequirement());
+                tvYears.setText(dataBean.getUseLife());
+                tvPosition.setText(dataBean.getSlagLineLocation());
+                tvBakingMethod.setText(dataBean.getBakingMethod());
+                tvBakingTime.setText(dataBean.getBakingDateTime()+"");
+                tvBakingTemperature.setText(dataBean.getBakingTemperature());
+                tvContent.setText(dataBean.getUseProblemFeedback());
+                tvRemark.setText(dataBean.getRemark());
+            }
+        });
+    }
 }

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

@@ -330,13 +330,13 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
         data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesThreeModifyActivity.class);
+                startActivity(MesThreeDetailActivity.class, "id", machineDetailBean.getProductList().get(position).getId());
             }
         });
         data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesSupplierActivity.class,"data",JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+                startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
             }
         });
         data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {

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

@@ -51,7 +51,8 @@
                 android:background="@android:color/white"
                 android:orientation="vertical"
                 android:paddingHorizontal="23mm"
-                android:paddingVertical="20mm">
+                android:paddingVertical="20mm"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="78dp"