1.修改添加跳转路径

2.//TODO erp用户激活测试，忘记/重置密码测试，审核规则，领用申请列表/退件列表/参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，刷新token

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/sale/SaleOrderDetailActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java

-package com.wd.workoffice.ui.activity.bat.order.sale;
+package com.wd.workoffice.ui.activity.bat.order;
 
 import android.text.Editable;
 import android.text.TextUtils;
@@ -105,12 +105,15 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
     LinearLayout llCheck;
     @BindView(R.id.ll_apply)
     LinearLayout llApply;
+    @BindView(R.id.rl_dep)
+    RelativeLayout rlDep;
     private OrderDetail dataBean;
     private List<OrderDetail.OrderFlowsBean> flowList;
     private OrderProcessAdapter flowAdapter;
     private OrderDetailProductAdapter proAdapter;
     private List<OrderDetail.OrderItemsBean> proList;
     private Integer status;
+    private String identity;
 
     @Override
     protected void initView() {
@@ -118,6 +121,12 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
         rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         status = Integer.valueOf(getIntent().getStringExtra("status"));
+        identity = getIntent().getStringExtra("identity");
+        if (TextUtils.equals(identity, "1")) {//销售1
+
+        } else {
+            rlDep.setVisibility(View.GONE);
+        }
         switch (status) {
 //            private String tab[] = {
 //            "全部", "待审核", "待接单", "待生产", "已入库",
@@ -350,7 +359,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
         Map<String, Object> dataParam = WorkUtils.simpleParam();
         dataParam.put("result", status);
         dataParam.put("comment", remark);
-        RtfUtils.getRtf().saleOrderCheck(dataBean.getId(),WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getRtf().saleOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/java/com/wd/workoffice/ui/fg/ProSaleFragment.java

@@ -10,7 +10,7 @@ import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.bean.event.CheckOrderEvent;
 import com.wd.workoffice.contract.SaleSaleContract;
 import com.wd.workoffice.presenter.SaleSalePresenter;
-import com.wd.workoffice.ui.activity.bat.order.sale.SaleOrderDetailActivity;
+import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
 import com.wd.workoffice.ui.adapter.ProSaleAdapter;
 import com.wd.workoffice.util.WorkUtils;
 

app/src/main/java/com/wd/workoffice/ui/fg/ProSupplierFragment.java

 package com.wd.workoffice.ui.fg;
 
 import android.os.Bundle;
+import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
@@ -8,6 +9,7 @@ import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.contract.SaleSaleContract;
 import com.wd.workoffice.presenter.SaleSalePresenter;
+import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
 import com.wd.workoffice.ui.adapter.ProSupplierAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -71,6 +73,15 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
                 saleSalePresenter.getSupplierOrder(param);
             }
         }, rvData);
+        orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(SupplierOrderDetailActivity.class,
+                        "identity",identity,
+                        "id", orderList.get(position).getId() + "",
+                        "status", orderList.get(position).getStatus() + "");
+            }
+        });
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/fg/SaleOutFragment.java

@@ -10,7 +10,6 @@ import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.contract.SaleSaleContract;
 import com.wd.workoffice.presenter.SaleSalePresenter;
 import com.wd.workoffice.ui.activity.bat.order.OutOrderDetailActivity;
-import com.wd.workoffice.ui.activity.bat.order.sale.SaleOrderDetailActivity;
 import com.wd.workoffice.ui.adapter.SaleOutAdapter;
 import com.wd.workoffice.util.WorkUtils;
 

app/src/main/java/com/wd/workoffice/ui/fg/SaleSaleFragment.java

@@ -13,7 +13,7 @@ import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.bean.event.CheckOrderEvent;
 import com.wd.workoffice.contract.SaleSaleContract;
 import com.wd.workoffice.presenter.SaleSalePresenter;
-import com.wd.workoffice.ui.activity.bat.order.sale.SaleOrderDetailActivity;
+import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
 import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
 import com.wd.workoffice.util.WorkUtils;
 

app/src/main/java/com/wd/workoffice/ui/fg/SaleSupplierFragment.java

 package com.wd.workoffice.ui.fg;
 
 import android.os.Bundle;
+import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
@@ -8,6 +9,8 @@ import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.contract.SaleSaleContract;
 import com.wd.workoffice.presenter.SaleSalePresenter;
+import com.wd.workoffice.ui.activity.bat.order.OutOrderDetailActivity;
+import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
 import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -72,6 +75,15 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
                 saleSalePresenter.getSupplierOrder(param);
             }
         }, rvData);
+        orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(SupplierOrderDetailActivity.class,
+                        "identity",identity,
+                        "id", orderList.get(position).getId() + "",
+                        "status", orderList.get(position).getStatus() + "");
+            }
+        });
     }
 
     @Override