1.4个订单详情初版

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

app/src/main/AndroidManifest.xml

@@ -857,7 +857,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.order.sale.SaleOrderDetailActivity"
+            android:name=".ui.activity.bat.order.SaleOrderDetailActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="订单详情"
             android:launchMode="singleTop"
@@ -976,6 +976,38 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.order.OutOrderDetailActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="订单详情"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.order.SupplierOrderDetailActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="订单详情"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.order.InsideOrderDetailActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="订单详情"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.order.QualityApplyActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="质检申请列表"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
 
         <provider
             android:name="androidx.core.content.FileProvider"

app/src/main/java/com/wd/workoffice/bean/OrderDetail.java

@@ -88,6 +88,33 @@ public class OrderDetail {
     private Object deptId;
     private List<OrderItemsBean> orderItems;
     private List<OrderFlowsBean> orderFlows;
+    private String supplierName;
+    private String enterStockType;
+    private String inStockName;
+
+    public String getInStockName() {
+        return inStockName;
+    }
+
+    public void setInStockName(String inStockName) {
+        this.inStockName = inStockName;
+    }
+
+    public String getEnterStockType() {
+        return enterStockType;
+    }
+
+    public void setEnterStockType(String enterStockType) {
+        this.enterStockType = enterStockType;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
 
     public int getCreatedBy() {
         return createdBy;

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

@@ -1124,6 +1124,18 @@ public interface ApiService {
     @GET("/saleOrder/oneInfo/{orderId}")
     Observable<BaseBean> saleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
 
+    /**
+     *
+     * @return
+     */
+    @GET("/purchaseOrder/oneInfo/{orderId}")
+    Observable<BaseBean> purchaseOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
+    /**
+     *
+     * @return
+     */
+    @GET("/supplierOrder/oneInfo/{orderId}")
+    Observable<BaseBean> supplierOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
     /**
      * 获取发货申请分页列表
      *
@@ -1203,30 +1215,90 @@ public interface ApiService {
      */
     @GET("/returnApply/so/page/list")
     Observable<BaseBean> returnApplyList(@QueryMap Map<String, Object> param);
+    /**
+     * step7_7-退货申请流水列表
+     *
+     * @return
+     */
+    @GET("/returnApply/po/page/list")
+    Observable<BaseBean> returnPoApplyList(@QueryMap Map<String, Object> param);
 
     /**
      * step4_1-发起入库申请
      *
      * @return
      */
-    @POST(" /procedureStart/so/applyStock/{orderItemId}")
+    @POST("/procedureStart/so/applyStock/{orderItemId}")
     Observable<BaseBean> addStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
 
+    /**
+     * step4_1-发起入库申请
+     *
+     * @return
+     */
+    @POST("/procedureStart/fo/applyStock/{orderItemId}")
+    Observable<BaseBean> addFoStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
 
     /**
-     * /enterStoreApply/so/app/page/list
+     * step4_1-发起入库申请
+     *
+     * @return
+     */
+    @POST("/procedureStart/po/applyStock/{orderItemId}")
+    Observable<BaseBean> addPoStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
+
+    /**
+     * 入库申请列表
      *
      * @return
      */
     @GET("/enterStoreApply/so/app/page/list")
     Observable<BaseBean> addStockApplyList(@QueryMap Map<String, Object> param);
     /**
-     * /enterStoreApply/so/app/page/list
+     * s入库申请列表
+     *
+     * @return
+     */
+    @POST("/enterStoreApply/fo/app/page/list")
+    Observable<BaseBean> addFoStockApplyList(@QueryMap Map<String, Object> param);
+    /**
+     * step4_3-入库申请列表
+     *
+     * @return
+     */
+    @GET("/enterStoreApply/po/app/page/list")
+    Observable<BaseBean> addPoStockApplyList(@QueryMap Map<String, Object> param);
+
+    /**
+     * /step4_2-入库申请审核
+     *
+     * @return
+     */
+    @PUT("/enterStoreApply/po/audit/{id}")
+    Observable<BaseBean> addPoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+    /**
+     * step4_2-入库申请审核
      *
      * @return
      */
     @PUT("/enterStoreApply/so/audit/{id}")
     Observable<BaseBean> addStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+    /**
+     * step4_2-入库申请审核
+     *
+     * @return
+     */
+    @PUT("/enterStoreApply/fo/audit/{id}")
+    Observable<BaseBean> addFoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+    /**
+     * 质检申请列表
+     *
+     * @return
+     */
+    @GET("/enterStoreApply/fo/quality-inspection/page/list")
+    Observable<BaseBean> enterStoreApplyList(@QueryMap Map<String, Object> param);
+
+
     /**
      * 获取一个订单子表的全部流水
      *
@@ -1266,4 +1338,12 @@ public interface ApiService {
     @GET("/notice-message-item/content")
     Observable<BaseBean> msgContent(@Query("id") String id);
 
+    /**
+     * 设置入库方式
+     *
+     * @return
+     */
+    @PUT("/purchaseOrder/enter-stock-type")
+    Observable<BaseBean> purchaseOrderStockType(@QueryMap Map<String, Object> param);
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java

+package com.wd.workoffice.ui.activity.bat.order;
+
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.OrderDetail;
+import com.wd.workoffice.bean.event.CheckOrderEvent;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.InsideOrderDetailProductAdapter;
+import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
+import com.wd.workoffice.ui.adapter.SupplierOrderDetailProductAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * 内部订单详情
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class InsideOrderDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_status)
+    TextView tvStatus;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.ll_top)
+    RelativeLayout llTop;
+    @BindView(R.id.tv_refuse)
+    TextView tvRefuse;
+    @BindView(R.id.tv_agree)
+    TextView tvAgree;
+    @BindView(R.id.ll_check)
+    LinearLayout llCheck;
+    @BindView(R.id.tv_finish_apply)
+    TextView tvFinishApply;
+    @BindView(R.id.tv_send_apply)
+    TextView tvSendApply;
+    @BindView(R.id.ll_apply)
+    LinearLayout llApply;
+    @BindView(R.id.ll_bottom)
+    LinearLayout llBottom;
+    @BindView(R.id.rv_process)
+    RecyclerView rvProcess;
+    @BindView(R.id.tv_name)
+    TextView tvName;
+    @BindView(R.id.tv_dep)
+    TextView tvDep;
+    @BindView(R.id.rl_dep)
+    RelativeLayout rlDep;
+    @BindView(R.id.tv_place_name)
+    TextView tvPlaceName;
+    @BindView(R.id.tv_place_dep)
+    TextView tvPlaceDep;
+    @BindView(R.id.tv_warehouse)
+    TextView tvWarehouse;
+    @BindView(R.id.tv_order_no)
+    TextView tvOrderNo;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.tv_send_time)
+    TextView tvSendTime;
+    @BindView(R.id.tv_order_desc)
+    TextView tvOrderDesc;
+    @BindView(R.id.tv_price)
+    TextView tvPrice;
+    @BindView(R.id.rv_pro)
+    RecyclerView rvPro;
+    @BindView(R.id.tv_claim1)
+    TextView tvClaim1;
+    @BindView(R.id.tv_claim2)
+    TextView tvClaim2;
+    @BindView(R.id.tv_claim3)
+    TextView tvClaim3;
+    @BindView(R.id.tv_claim4)
+    TextView tvClaim4;
+    @BindView(R.id.tv_claim5)
+    TextView tvClaim5;
+    @BindView(R.id.tv_claim6)
+    TextView tvClaim6;
+    private OrderDetail dataBean;
+    private List<OrderDetail.OrderFlowsBean> flowList;
+    private OrderProcessAdapter flowAdapter;
+    private InsideOrderDetailProductAdapter proAdapter;
+    private List<OrderDetail.OrderItemsBean> proList;
+    private Integer status;
+    private String identity;
+    private QMUIDialog.MenuDialogBuilder settingDialog;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        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销售 2生产
+
+        } else {
+            rlDep.setVisibility(View.GONE);
+        }
+        switch (status) {
+//          {"待审核", "待接单", "待生产", "已入库","已交付"};
+//          { "100", "200", "710", "500","600"};
+            case 100:
+                llBottom.setVisibility(View.VISIBLE);
+                llCheck.setVisibility(View.VISIBLE);
+                break;
+            case 200:
+                break;
+            case 300:
+                llBottom.setVisibility(View.VISIBLE);
+                break;
+            case 410:
+                llBottom.setVisibility(View.VISIBLE);
+                break;
+            case 500:
+                llBottom.setVisibility(View.VISIBLE);
+                break;
+            case 600:
+                llBottom.setVisibility(View.VISIBLE);
+                break;
+            default:
+                llBottom.setVisibility(View.VISIBLE);
+                break;
+        }
+    }
+
+
+    @Override
+    protected void initData() {
+        getData();
+        flowList = new ArrayList<>();
+        flowAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowList);
+        flowAdapter.bindToRecyclerView(rvProcess);
+        flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
+        proList = new ArrayList<>();
+        proAdapter = new InsideOrderDetailProductAdapter(R.layout.item_order_product, proList, status);
+        proAdapter.bindToRecyclerView(rvPro);
+        proAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
+                flowList.addAll(dataBean.getOrderFlows());
+                flowAdapter.notifyDataSetChanged();
+                proList.addAll(dataBean.getOrderItems());
+                proAdapter.notifyDataSetChanged();
+
+                tvName.setText(dataBean.getSupplierName());
+                tvDep.setText(dataBean.getReceiveDeptName());
+                tvStatus.setText(dataBean.getStatusName());
+                tvPlaceName.setText(dataBean.getLaunchUserName());
+                tvPlaceDep.setText(dataBean.getLaunchDeptName());
+                tvWarehouse.setText(dataBean.getInStockName());
+                tvOrderNo.setText(dataBean.getId());
+                tvTime.setText(dataBean.getCreatedTime());
+                tvSendTime.setText(dataBean.getRequireTime());
+                tvDesc.setText(dataBean.getAttrName());
+                tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
+
+                OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
+                tvClaim1.setText(expandInfo.getDemond4());
+                tvClaim2.setText(expandInfo.getDemond5());
+                tvClaim3.setText(expandInfo.getDemond1());
+                tvClaim4.setText(expandInfo.getDemond2());
+                tvClaim5.setText(expandInfo.getDemond3());
+                tvClaim6.setText(expandInfo.getComments());
+
+                tvDesc.setText(dataBean.getAttrName());
+                tvStatus.setText(dataBean.getStatusName());
+
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        proAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                switch (view.getId()) {
+                    case R.id.tv_get:
+                        startActivity(UseApplyActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "num", proList.get(position).getCanOutStoreProductSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "productId", proList.get(position).getProductId() + "");
+                        break;
+                    case R.id.tv_add:
+                        startActivity(AddStockApplyActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "orderType", dataBean.getOrderType() + "",
+                                "num", proList.get(position).getCanInStoreProductSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "orderItemId", proList.get(position).getId(),
+                                "productId", proList.get(position).getProductId() + "");
+                        break;
+                    case R.id.tv_return:
+                        startActivity(ReturnApplyActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "orderType", dataBean.getOrderType() + "",
+                                "num", proList.get(position).getStoreSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "productId", proList.get(position).getProductId() + "");
+                        break;
+                    case R.id.tv_flow:
+                        startActivity(ProFlowActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "num", proList.get(position).getStoreSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "productId", proList.get(position).getProductId() + "",
+                                "orderItemId", proList.get(position).getId(),
+                                "info", JSON.toJSONString(proList.get(position)));
+                        break;
+                    case R.id.tv_quality:
+                        startActivity(QualityApplyActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "num", proList.get(position).getStoreSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "productId", proList.get(position).getProductId() + "",
+                                "orderItemId", proList.get(position).getId(),
+                                "info", JSON.toJSONString(proList.get(position)));
+                        break;
+                }
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_supplier_order;
+    }
+
+
+    @OnClick({ R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_refuse:
+                checkDialog(2);
+                break;
+            case R.id.tv_agree:
+                checkDialog(1);
+                break;
+            case R.id.tv_finish_apply:
+                if (dataBean == null) {
+                    toast("正在加载中，请稍后");
+                    return;
+                }
+                startActivity(EndApplyActivity.class,
+                        "status", getIntent().getStringExtra("status"),
+                        "orderType", dataBean.getOrderType(),
+                        "orderId", getIntent().getStringExtra("id"));
+                break;
+            case R.id.tv_send_apply:
+                startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
+                break;
+        }
+    }
+
+    private void checkDialog(int status) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        View view = LayoutInflater.from(this).inflate(R.layout.view_check_order, null);
+        TextView tvOk = view.findViewById(R.id.tv_ok);
+        TextView tvPrice = view.findViewById(R.id.tv_price);
+        tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
+        TextView tvNum = view.findViewById(R.id.tv_num);
+        TextView tvCancel = view.findViewById(R.id.tv_cancel);
+        EditText etRemark = view.findViewById(R.id.et_content);
+        etRemark.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                tvNum.setText(s.length() + "/140");
+            }
+        });
+        builder.setView(view);
+        AlertDialog addCartDialog = builder.create();
+        tvOk.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                    toast("请填写备注");
+                    return;
+                }
+                check(status, etRemark.getText().toString());
+                addCartDialog.dismiss();
+            }
+        });
+        tvCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                addCartDialog.dismiss();
+            }
+        });
+        addCartDialog.show();
+    }
+
+
+    private void check(int status, String remark) {
+        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>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                toast("操作成功");
+                llBottom.setVisibility(View.GONE);
+                EventBus.getDefault().post(new CheckOrderEvent());
+            }
+        });
+    }
+
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/QualityApplyActivity.java

+package com.wd.workoffice.ui.activity.bat.order;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.google.android.material.tabs.TabLayout;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.ui.adapter.VpDataAdapter;
+import com.wd.workoffice.ui.fg.AddStockApplyFragment;
+import com.wd.workoffice.ui.fg.QualityApplyFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * 质检
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class QualityApplyActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.tl_tab)
+    TabLayout tlTab;
+    @BindView(R.id.vp_data)
+    ViewPager vpData;
+    private String tab[] = {
+            "待审核", "已通过", "已驳回"};
+    private String order[] = {
+            "0", "1", "2"};
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        tlTab.setupWithViewPager(vpData);
+        tlTab.setTabMode(TabLayout.MODE_FIXED);
+    }
+
+    @Override
+    protected void initData() {
+        FragmentManager sfm = getSupportFragmentManager();
+        List<Fragment> data = new ArrayList<>();
+        for (int i = 0; i < tab.length; i++) {
+            QualityApplyFragment saleFragment = new QualityApplyFragment();
+            Bundle bundle = new Bundle();
+            bundle.putString("state", order[i]);
+            bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+            bundle.putString("orderType", getIntent().getStringExtra("orderType"));
+            bundle.putString("productId", getIntent().getStringExtra("productId"));
+            bundle.putString("num", getIntent().getStringExtra("num"));
+            saleFragment.setArguments(bundle);
+            data.add(saleFragment);
+
+        }
+        VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
+        vpData.setAdapter(vpFgAdapter);
+        for (int i = 0; i < tab.length; i++) {
+            tlTab.getTabAt(i).setText(tab[i]);
+        }
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_order;
+    }
+
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        if (TextUtils.equals(getIntent().getStringExtra("status"), "300")) {
+//            getMenuInflater().inflate(R.menu.menu_add, menu);
+//        }
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        switch (item.getItemId()) {
+//            case R.id.add:
+//                startActivity(AddStockApplyAddActivity.class,
+//                        "num", getIntent().getStringExtra("num"),
+//                        "orderType",getIntent().getStringExtra("orderType"),
+//                        "productId", getIntent().getStringExtra("productId"),
+//                        "orderItemId", getIntent().getStringExtra("orderItemId"),
+//                        "simpleCode", getIntent().getStringExtra("simpleCode"),
+//                        "id", getIntent().getStringExtra("orderId"));
+//                break;
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnApplyActivity.java

 package com.wd.workoffice.ui.activity.bat.order;
 
-import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -18,11 +11,10 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.EndApplyBean;
 import com.wd.workoffice.bean.ReturnApplyBean;
+import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.EndApplyAdapter;
 import com.wd.workoffice.ui.adapter.RetrunSendApplyAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -31,16 +23,16 @@ import java.util.List;
 import java.util.Map;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 提前结束
+ * 退货
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -55,6 +47,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
     private List<ReturnApplyBean.RecordsBean> dataList;
     private RetrunSendApplyAdapter dataAdapter;
     private int page = 1;
+    private String orderType;
 
     @Override
     protected void initView() {
@@ -65,6 +58,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        orderType = getIntent().getStringExtra("orderType");
         dataList = new ArrayList<>();
         dataAdapter = new RetrunSendApplyAdapter(R.layout.item_return_apply, dataList);
         dataAdapter.bindToRecyclerView(rvData);
@@ -78,7 +72,15 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
     }
 
     private void getData() {
-        RtfUtils.getRtf().returnApplyList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        Observable<BaseBean> observable;
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            observable = RtfUtils.getRtf().returnApplyList(param);
+        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+            observable = RtfUtils.getRtf().returnPoApplyList(param);
+        }  else {
+            observable = RtfUtils.getRtf().returnApplyList(param);
+        }
+        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -138,7 +140,8 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(EndApplyDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
+                startActivity(EndApplyDetailActivity.class,
+                        "info", JSON.toJSONString(dataList.get(position)));
             }
         });
     }
@@ -148,100 +151,4 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
         return R.layout.activity_pro_price;
     }
 
-//    @Override
-//    public boolean onCreateOptionsMenu(Menu menu) {
-//        if (TextUtils.equals("status", getIntent().getStringExtra("300"))) {
-//            getMenuInflater().inflate(R.menu.menu_add, menu);
-//        }
-//        return super.onCreateOptionsMenu(menu);
-//    }
-//
-//    @Override
-//    public boolean onOptionsItemSelected(MenuItem item) {
-//        switch (item.getItemId()) {
-//            case R.id.add:
-//                checkDialog();
-//                break;
-//        }
-//        return super.onOptionsItemSelected(item);
-//    }
-
-
-//    private void checkDialog() {
-//        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-//        View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
-//        TextView tvOk = view.findViewById(R.id.tv_ok);
-//        TextView tvDesc = view.findViewById(R.id.tv_desc);
-//        tvDesc.setText("提前申请结束");
-//        TextView tvNum = view.findViewById(R.id.tv_num);
-//        TextView tvCancel = view.findViewById(R.id.tv_cancel);
-//        EditText etRemark = view.findViewById(R.id.et_content);
-//        etRemark.addTextChangedListener(new TextWatcher() {
-//            @Override
-//            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-//
-//            }
-//
-//            @Override
-//            public void onTextChanged(CharSequence s, int start, int before, int count) {
-//
-//            }
-//
-//            @Override
-//            public void afterTextChanged(Editable s) {
-//                tvNum.setText(s.length() + "/140");
-//            }
-//        });
-//        builder.setView(view);
-//        AlertDialog addCartDialog = builder.create();
-//        tvOk.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                if (TextUtils.isEmpty(etRemark.getText().toString())) {
-//                    toast("请填写原因");
-//                    return;
-//                }
-//                check(etRemark.getText().toString());
-//                addCartDialog.dismiss();
-//            }
-//        });
-//        tvCancel.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                addCartDialog.dismiss();
-//            }
-//        });
-//        addCartDialog.show();
-//    }
-//
-//
-//    private void check(String remark) {
-//        Map<String, Object> param = WorkUtils.simpleParam();
-//        param.put("orderType", getIntent().getStringExtra("orderType"));
-//        param.put("applyRemark", remark);
-//        param.put("orderId", getIntent().getStringExtra("orderId"));
-//        RtfUtils.getRtf().endApply(getIntent().getStringExtra("orderId"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
-//            @Override
-//            public void doOnSubscribe(Disposable d) {
-//            }
-//
-//            @Override
-//            public void onFail(String errorMsg) {
-//                hideLoading();
-//                toast(errorMsg);
-//            }
-//
-//            @Override
-//            public void onSuccess(BaseBean data) {
-//                hideLoading();
-//                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
-//                    return;
-//                }
-//                toast("操作成功");
-//                getData();
-//            }
-//        });
-//    }
-
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java

+package com.wd.workoffice.ui.activity.bat.order;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.OrderDetail;
+import com.wd.workoffice.bean.event.CheckOrderEvent;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
+import com.wd.workoffice.ui.adapter.SupplierOrderDetailProductAdapter;
+import com.wd.workoffice.util.DialogUtils;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * 供应详情
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class SupplierOrderDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_status)
+    TextView tvStatus;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.ll_top)
+    RelativeLayout llTop;
+    @BindView(R.id.tv_refuse)
+    TextView tvRefuse;
+    @BindView(R.id.tv_agree)
+    TextView tvAgree;
+    @BindView(R.id.ll_check)
+    LinearLayout llCheck;
+    @BindView(R.id.tv_finish_apply)
+    TextView tvFinishApply;
+    @BindView(R.id.tv_send_apply)
+    TextView tvSendApply;
+    @BindView(R.id.ll_apply)
+    LinearLayout llApply;
+    @BindView(R.id.ll_bottom)
+    LinearLayout llBottom;
+    @BindView(R.id.rv_process)
+    RecyclerView rvProcess;
+    @BindView(R.id.tv_name)
+    TextView tvName;
+    @BindView(R.id.tv_dep)
+    TextView tvDep;
+    @BindView(R.id.rl_dep)
+    RelativeLayout rlDep;
+    @BindView(R.id.tv_place_name)
+    TextView tvPlaceName;
+    @BindView(R.id.tv_place_dep)
+    TextView tvPlaceDep;
+    @BindView(R.id.tv_warehouse)
+    TextView tvWarehouse;
+    @BindView(R.id.tv_order_no)
+    TextView tvOrderNo;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.tv_send_time)
+    TextView tvSendTime;
+    @BindView(R.id.tv_order_desc)
+    TextView tvOrderDesc;
+    @BindView(R.id.tv_price)
+    TextView tvPrice;
+    @BindView(R.id.rv_pro)
+    RecyclerView rvPro;
+    @BindView(R.id.tv_claim1)
+    TextView tvClaim1;
+    @BindView(R.id.tv_claim2)
+    TextView tvClaim2;
+    @BindView(R.id.tv_claim3)
+    TextView tvClaim3;
+    @BindView(R.id.tv_claim4)
+    TextView tvClaim4;
+    @BindView(R.id.tv_claim5)
+    TextView tvClaim5;
+    @BindView(R.id.tv_claim6)
+    TextView tvClaim6;
+    private OrderDetail dataBean;
+    private List<OrderDetail.OrderFlowsBean> flowList;
+    private OrderProcessAdapter flowAdapter;
+    private SupplierOrderDetailProductAdapter proAdapter;
+    private List<OrderDetail.OrderItemsBean> proList;
+    private Integer status;
+    private String identity;
+    private QMUIDialog.MenuDialogBuilder settingDialog;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        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销售 2生产
+
+        } else {
+            rlDep.setVisibility(View.GONE);
+        }
+        switch (status) {
+//          {"待审核", "待接单", "待生产", "已入库","已交付"};
+//          { "100", "200", "710", "500","600"};
+            case 100:
+                llBottom.setVisibility(View.VISIBLE);
+                llCheck.setVisibility(View.VISIBLE);
+                break;
+            case 200:
+                break;
+            case 300:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                tvSendApply.setVisibility(View.GONE);
+                break;
+            case 410:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+            case 500:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+            case 600:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+            default:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                tvSendApply.setVisibility(View.GONE);
+                break;
+        }
+    }
+
+
+    @Override
+    protected void initData() {
+        getData();
+        flowList = new ArrayList<>();
+        flowAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowList);
+        flowAdapter.bindToRecyclerView(rvProcess);
+        flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
+        proList = new ArrayList<>();
+        proAdapter = new SupplierOrderDetailProductAdapter(R.layout.item_order_product, proList, status);
+        proAdapter.bindToRecyclerView(rvPro);
+        proAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
+                flowList.addAll(dataBean.getOrderFlows());
+                flowAdapter.notifyDataSetChanged();
+                proList.addAll(dataBean.getOrderItems());
+                proAdapter.notifyDataSetChanged();
+
+                tvName.setText(dataBean.getSupplierName());
+                tvDep.setText(dataBean.getReceiveDeptName());
+                tvStatus.setText(dataBean.getStatusName());
+                tvPlaceName.setText(dataBean.getLaunchUserName());
+                tvPlaceDep.setText(dataBean.getLaunchDeptName());
+                tvWarehouse.setText(dataBean.getInStockName());
+                tvOrderNo.setText(dataBean.getId());
+                tvTime.setText(dataBean.getCreatedTime());
+                tvSendTime.setText(dataBean.getRequireTime());
+                tvDesc.setText(dataBean.getAttrName());
+                tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
+
+                OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
+                tvClaim1.setText(expandInfo.getDemond4());
+                tvClaim2.setText(expandInfo.getDemond5());
+                tvClaim3.setText(expandInfo.getDemond1());
+                tvClaim4.setText(expandInfo.getDemond2());
+                tvClaim5.setText(expandInfo.getDemond3());
+                tvClaim6.setText(expandInfo.getComments());
+
+                tvDesc.setText(dataBean.getAttrName());
+                tvStatus.setText(dataBean.getStatusName());
+
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        proAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                switch (view.getId()) {
+                    case R.id.tv_get:
+                        startActivity(UseApplyActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "num", proList.get(position).getCanOutStoreProductSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "productId", proList.get(position).getProductId() + "");
+                        break;
+                    case R.id.tv_add:
+                        startActivity(AddStockApplyActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "orderType", dataBean.getOrderType() + "",
+                                "num", proList.get(position).getCanInStoreProductSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "orderItemId", proList.get(position).getId(),
+                                "productId", proList.get(position).getProductId() + "");
+                        break;
+                    case R.id.tv_return:
+                        startActivity(ReturnApplyActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "orderType", dataBean.getOrderType() + "",
+                                "num", proList.get(position).getStoreSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "productId", proList.get(position).getProductId() + "");
+                        break;
+                    case R.id.tv_flow:
+                        startActivity(ProFlowActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "num", proList.get(position).getStoreSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "productId", proList.get(position).getProductId() + "",
+                                "orderItemId", proList.get(position).getId(),
+                                "info", JSON.toJSONString(proList.get(position)));
+                        break;
+                    case R.id.tv_quality:
+                        startActivity(QualityApplyActivity.class,
+                                "status", dataBean.getStatus() + "",
+                                "num", proList.get(position).getStoreSum() + "",
+                                "product", proList.get(position).getProductName(),
+                                "simpleCode", proList.get(position).getProductSimpleCode(),
+                                "orderId", getIntent().getStringExtra("id"),
+                                "productId", proList.get(position).getProductId() + "",
+                                "orderItemId", proList.get(position).getId(),
+                                "info", JSON.toJSONString(proList.get(position)));
+                        break;
+                }
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_supplier_order;
+    }
+
+
+    @OnClick({ R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_refuse:
+                checkDialog(2);
+                break;
+            case R.id.tv_agree:
+                checkDialog(1);
+                break;
+            case R.id.tv_finish_apply:
+                if (dataBean == null) {
+                    toast("正在加载中，请稍后");
+                    return;
+                }
+                startActivity(EndApplyActivity.class,
+                        "status", getIntent().getStringExtra("status"),
+                        "orderType", dataBean.getOrderType(),
+                        "orderId", getIntent().getStringExtra("id"));
+                break;
+            case R.id.tv_send_apply:
+                startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
+                break;
+        }
+    }
+
+    private void checkDialog(int status) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        View view = LayoutInflater.from(this).inflate(R.layout.view_check_order, null);
+        TextView tvOk = view.findViewById(R.id.tv_ok);
+        TextView tvPrice = view.findViewById(R.id.tv_price);
+        tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
+        TextView tvNum = view.findViewById(R.id.tv_num);
+        TextView tvCancel = view.findViewById(R.id.tv_cancel);
+        EditText etRemark = view.findViewById(R.id.et_content);
+        etRemark.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                tvNum.setText(s.length() + "/140");
+            }
+        });
+        builder.setView(view);
+        AlertDialog addCartDialog = builder.create();
+        tvOk.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                    toast("请填写备注");
+                    return;
+                }
+                check(status, etRemark.getText().toString());
+                addCartDialog.dismiss();
+            }
+        });
+        tvCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                addCartDialog.dismiss();
+            }
+        });
+        addCartDialog.show();
+    }
+
+
+    private void check(int status, String remark) {
+        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>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                toast("操作成功");
+                llBottom.setVisibility(View.GONE);
+                EventBus.getDefault().post(new CheckOrderEvent());
+            }
+        });
+    }
+
+}

app/src/main/java/com/wd/workoffice/ui/adapter/InsideOrderDetailProductAdapter.java

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.OrderDetail;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
+    int status;
+
+    public InsideOrderDetailProductAdapter(int layoutResId, List data, Integer status) {
+        super(layoutResId, data);
+        this.status = status;
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
+        helper.setText(R.id.tv_name, item.getProductName());
+        helper.setText(R.id.tv_card, item.getProductSoleCode());
+        helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
+        helper.setText(R.id.tv_spec, item.getProductSpec());
+        helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_unit, item.getProductUnit());
+        helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
+        helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
+        helper.addOnClickListener(R.id.tv_get);
+        helper.addOnClickListener(R.id.tv_return);
+        helper.addOnClickListener(R.id.tv_flow);
+        helper.addOnClickListener(R.id.tv_add);
+        helper.addOnClickListener(R.id.tv_quality);
+        helper.setGone(R.id.tv_quality, true);
+        switch (status) {
+//          "待审核", "待接单", "待生产", "已入库","已交付"};
+//           "100", "200", "710", "500","600"};
+            case 100:
+                break;
+            case 200:
+                break;
+            case 300:
+                break;
+            case 400:
+                break;
+            case 500:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                helper.setGone(R.id.tv_return, false);
+                helper.setGone(R.id.tv_flow, false);
+                break;
+            case 600:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                helper.setGone(R.id.tv_flow, false);
+                helper.setGone(R.id.tv_return, false);
+                break;
+        }
+    }
+}
+

app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.OrderDetail;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
+    int status;
+
+    public OutOrderDetailProductAdapter(int layoutResId, List data, Integer status) {
+        super(layoutResId, data);
+        this.status = status;
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
+        helper.setText(R.id.tv_name, item.getProductName());
+        helper.setText(R.id.tv_card, item.getProductSoleCode());
+        helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
+        helper.setText(R.id.tv_spec, item.getProductSpec());
+        helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_unit, item.getProductUnit());
+        helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
+        helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
+        helper.addOnClickListener(R.id.tv_get);
+        helper.addOnClickListener(R.id.tv_return);
+        helper.addOnClickListener(R.id.tv_flow);
+        helper.addOnClickListener(R.id.tv_add);
+        switch (status) {
+//          "待审核", "待接单", "待生产", "已入库","已交付"};
+//           "100", "200", "710", "500","600"};
+            case 100:
+                break;
+            case 200:
+                break;
+            case 300:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                helper.setGone(R.id.tv_return, false);
+                break;
+            case 400:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                helper.setGone(R.id.tv_return, false);
+                break;
+            case 500:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                helper.setGone(R.id.tv_return, false);
+                break;
+            case 600:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                break;
+        }
+    }
+}
+

app/src/main/java/com/wd/workoffice/ui/adapter/SupplierOrderDetailProductAdapter.java

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.OrderDetail;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
+    int status;
+
+    public SupplierOrderDetailProductAdapter(int layoutResId, List data, Integer status) {
+        super(layoutResId, data);
+        this.status = status;
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
+        helper.setText(R.id.tv_name, item.getProductName());
+        helper.setText(R.id.tv_card, item.getProductSoleCode());
+        helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
+        helper.setText(R.id.tv_spec, item.getProductSpec());
+        helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_unit, item.getProductUnit());
+        helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
+        helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
+        helper.addOnClickListener(R.id.tv_get);
+        helper.addOnClickListener(R.id.tv_return);
+        helper.addOnClickListener(R.id.tv_flow);
+        helper.addOnClickListener(R.id.tv_add);
+        helper.addOnClickListener(R.id.tv_quality);
+        helper.setGone(R.id.tv_quality, true);
+        switch (status) {
+//          "待审核", "待接单", "待生产", "已入库","已交付"};
+//           "100", "200", "710", "500","600"};
+            case 100:
+                break;
+            case 200:
+                break;
+            case 300:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                helper.setGone(R.id.tv_return, false);
+                break;
+            case 400:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                helper.setGone(R.id.tv_return, false);
+                break;
+            case 500:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                helper.setGone(R.id.tv_return, false);
+                break;
+            case 600:
+                helper.setGone(R.id.ll_btn, true);
+                helper.setGone(R.id.tv_get, false);
+                break;
+        }
+    }
+}
+

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

@@ -19,6 +19,8 @@ import com.wd.workoffice.bean.AddStockBean;
 import com.wd.workoffice.bean.SendApplyBean;
 import com.wd.workoffice.bean.event.CheckAddStockEvent;
 import com.wd.workoffice.bean.event.CheckSendEvent;
+import com.wd.workoffice.bean.workEnum.OrderType;
+import com.wd.workoffice.bean.workEnum.PermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.bat.order.AddStockApplyDetailActivity;
@@ -40,6 +42,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 
@@ -61,6 +64,7 @@ public class AddStockApplyFragment extends WorkBaseFg {
     private List<AddStockBean.RecordsBean> dataList;
     private String orderId;
     private String productId;
+    private String orderType;
 
     @Override
     protected void initView() {
@@ -92,11 +96,22 @@ public class AddStockApplyFragment extends WorkBaseFg {
             state = arguments.getString("state");
             orderId = arguments.getString("orderId");
             productId = arguments.getString("productId");
+            orderType = arguments.getString("orderType");
         }
     }
 
     private void getData() {
-        RtfUtils.getRtf().addStockApplyList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        Observable<BaseBean> observable;
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            observable = RtfUtils.getRtf().addStockApplyList(param);
+        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+            observable = RtfUtils.getRtf().addPoStockApplyList(param);
+        } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().addFoStockApplyList(param);
+        }  else {
+            observable = RtfUtils.getRtf().addStockApplyList(param);
+        }
+        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -149,7 +164,9 @@ public class AddStockApplyFragment extends WorkBaseFg {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(AddStockApplyDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
+                startActivity(AddStockApplyDetailActivity.class,
+                        "orderType",orderType,
+                        "info", JSON.toJSONString(dataList.get(position)));
             }
         });
         dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@@ -222,7 +239,17 @@ public class AddStockApplyFragment extends WorkBaseFg {
         param.put("result", status);
         param.put("comment", remark);
         param.put("id", id);
-        RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        Observable<BaseBean> observable;
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+            observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        } else {
+            observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        }
+        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

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

+package com.wd.workoffice.ui.fg;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkBaseFg;
+import com.wd.workoffice.bean.AddStockBean;
+import com.wd.workoffice.bean.event.CheckAddStockEvent;
+import com.wd.workoffice.bean.workEnum.OrderType;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.bat.order.AddStockApplyDetailActivity;
+import com.wd.workoffice.ui.adapter.AddStockSendApplyAdapter;
+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;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class QualityApplyFragment extends WorkBaseFg {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private String state;
+    private int page = 1;
+    private Map<String, Object> param;
+    private AddStockSendApplyAdapter dataAdapter;
+    private List<AddStockBean.RecordsBean> dataList;
+    private String orderId;
+    private String productId;
+    private String orderType;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this, getContentView());
+        rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        param = WorkUtils.pageKey();
+        param.put("status", state);
+        param.put("orderId", orderId);
+        param.put("productId", productId);
+        page = 1;
+        param.put("current", page);
+        dataList = new ArrayList<>();
+        dataAdapter = new AddStockSendApplyAdapter(R.layout.item_add_stock_apply, dataList, Integer.valueOf(state));
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        getData();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle arguments = getArguments();
+        if (arguments != null) {
+            state = arguments.getString("state");
+            orderId = arguments.getString("orderId");
+            productId = arguments.getString("productId");
+            orderType = arguments.getString("orderType");
+        }
+    }
+
+    private void getData() {
+        Observable<BaseBean> observable;
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            observable = RtfUtils.getRtf().enterStoreApplyList(param);
+        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+            observable = RtfUtils.getRtf().enterStoreApplyList(param);
+        } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().enterStoreApplyList(param);
+        }  else {
+            observable = RtfUtils.getRtf().enterStoreApplyList(param);
+        }
+        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<AddStockBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), AddStockBean.class).getRecords();
+                if (page == 1) {
+                    srlRefresh.finishRefresh();
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page = 1;
+            param.put("current", page);
+            getData();
+        });
+        dataAdapter.setOnLoadMoreListener(() -> {
+            param.put("current", page);
+            getData();
+        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(AddStockApplyDetailActivity.class,
+                        "orderType",orderType,
+                        "info", JSON.toJSONString(dataList.get(position)));
+            }
+        });
+        dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                switch (view.getId()) {
+                    case R.id.tv_refuse:
+                        checkDialog(2, dataList.get(position).getId());
+                        break;
+                    case R.id.tv_agree:
+                        checkDialog(1, dataList.get(position).getId());
+                        break;
+
+                }
+            }
+        });
+    }
+
+
+    private void checkDialog(int status, int id) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        View view = LayoutInflater.from(getActivity()).inflate(R.layout.view_check, null);
+        TextView tvOk = view.findViewById(R.id.tv_ok);
+        TextView tvDesc = view.findViewById(R.id.tv_desc);
+        tvDesc.setText(status == 1 ? "通过" : "拒绝");
+        TextView tvNum = view.findViewById(R.id.tv_num);
+        TextView tvCancel = view.findViewById(R.id.tv_cancel);
+        EditText etRemark = view.findViewById(R.id.et_content);
+        etRemark.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                tvNum.setText(s.length() + "/140");
+            }
+        });
+        builder.setView(view);
+        AlertDialog addCartDialog = builder.create();
+        tvOk.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
+                    toast("请填写备注");
+                    return;
+                }
+                check(status, etRemark.getText().toString(), id);
+                addCartDialog.dismiss();
+            }
+        });
+        tvCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                addCartDialog.dismiss();
+            }
+        });
+        addCartDialog.show();
+    }
+
+
+    private void check(int status, String remark, int id) {
+        Map<String, Object> param = WorkUtils.simpleParam();
+        param.put("result", status);
+        param.put("comment", remark);
+        param.put("id", id);
+        Observable<BaseBean> observable;
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+            observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        } else {
+            observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        }
+        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                toast("操作成功");
+                EventBus.getDefault().post(new CheckAddStockEvent());
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.fg_work_contacts;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(CheckAddStockEvent event) {
+        page = 1;
+        param.put("current", page);
+        getData();
+    }
+}

app/src/main/java/com/wd/workoffice/ui/fg/SaleInsideFragment.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.InsideOrderDetailActivity;
+import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
 import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -72,6 +75,15 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V
                 saleSalePresenter.getInsideOrder(param);
             }
         }, rvData);
+        orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(InsideOrderDetailActivity.class,
+                        "identity",identity,
+                        "id", orderList.get(position).getId() + "",
+                        "status", orderList.get(position).getStatus() + "");
+            }
+        });
     }
 
     @Override

app/src/main/java/com/wd/workoffice/util/WorkUtils.java

@@ -105,6 +105,22 @@ public class WorkUtils {
             return "场外库";
         }
     }
+    /**
+     * code： "1"：中转入库
+     * "2"：直接入库
+     *
+     * @param code
+     * @return
+     */
+    public static String getEnterStockType(String code) {
+        if (TextUtils.equals("1", code)) {
+            return "中转入库";
+        } else if (TextUtils.equals("2", code)) {
+            return "直接入库";
+        } else {
+            return "";
+        }
+    }
 
     /**
      * name：订单code

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/ll_top"
+        android:layout_width="match_parent"
+        android:layout_height="60mm"
+        android:layout_alignParentTop="true"
+        android:background="@color/blue_bg"
+        android:gravity="center_vertical|right"
+        android:orientation="horizontal"
+        android:paddingHorizontal="20mm">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true">
+
+            <ImageView
+                android:layout_width="18mm"
+                android:layout_height="18mm"
+                android:src="@mipmap/order_detail_bell" />
+
+            <TextView
+                android:id="@+id/tv_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10mm"
+                android:text="拒绝"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10mm"
+            android:text="同意"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="60mm"
+        android:visibility="gone"
+        android:layout_alignParentBottom="true"
+        android:gravity="center_vertical|right"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/ll_check"
+            android:layout_width="match_parent"
+            android:layout_height="60mm"
+            android:layout_alignParentBottom="true"
+            android:gravity="center_vertical|right"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_refuse"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_red_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="拒绝"
+                android:textColor="@color/white" />
+
+            <TextView
+                android:id="@+id/tv_agree"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_green_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="同意"
+                android:textColor="@color/white" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_apply"
+            android:layout_width="match_parent"
+            android:layout_height="60mm"
+            android:layout_alignParentBottom="true"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_finish_apply"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_blue_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="提前结束申请"
+                android:textColor="@color/white" />
+
+            <TextView
+                android:id="@+id/tv_send_apply"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_blue_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="发货申请"
+                android:textColor="@color/white" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/ll_bottom"
+        android:layout_below="@id/ll_top"
+        android:background="@color/white">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/ll_bottom"
+            android:orientation="vertical"
+            android:paddingBottom="20mm">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_process"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm" />
+
+            <View style="@style/ViewX" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="订单信息"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <LinearLayout  android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="10mm"
+                android:paddingTop="10mm"
+                android:paddingBottom="20mm"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingHorizontal="20mm">
+
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5mm">
+
+                    <TextView
+                        android:id="@+id/tv_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="邢台德龙钢铁客户"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:textColor="#0841F0"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="14mm"
+                    android:paddingVertical="10mm"
+                    android:background="#FCFCFD"
+                    android:orientation="vertical">
+                    <RelativeLayout
+                        android:id="@+id/rl_dep"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="接单部门"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_dep"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <!-- 1.下单 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="下单人"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_place_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <!-- 2.所属公司 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="所属公司"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_company"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:text="王紫逸"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/rv_supplier"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="供应商"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_supplier"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <!-- 3.订单编号 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="订单编号"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_order_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:text="王紫逸"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <!-- 4.下单时间 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="下单时间"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="要求发货时间"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_send_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10mm"
+                    android:gravity="right">
+
+                    <TextView
+                        android:id="@+id/tv_order_desc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="15mm"
+                        android:text="对方发起提前结束"
+                        android:textColor="@color/red_btn_bg"
+                        android:textSize="13sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="订单总价:￥"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/tv_price"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="15sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <View style="@style/ViewX" />
+
+
+            <RelativeLayout
+                android:id="@+id/rl_set"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:text="订单入库方式"
+                    android:textSize="14sp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/tv_set"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginRight="3mm"
+                        android:text=""
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:id="@+id/iv_setting"
+                        android:layout_width="15mm"
+                        android:layout_height="20mm"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
+            </RelativeLayout>
+            <View style="@style/ViewX" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="货品信息"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_pro"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <View style="@style/ViewX" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="订单要求"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="交提货地点:"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="5mm" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="运输方式及费用承担:"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="质量要求技术标准，供方对质量负责的条件和期限："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="包装、唛头及发货要求："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="注意事项："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="备注："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim6"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</RelativeLayout>

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

@@ -190,6 +190,7 @@
                     android:paddingVertical="10mm">
 
                     <RelativeLayout
+                        android:id="@+id/rl_dep"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingHorizontal="10mm">

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/ll_top"
+        android:layout_width="match_parent"
+        android:layout_height="60mm"
+        android:layout_alignParentTop="true"
+        android:background="@color/blue_bg"
+        android:gravity="center_vertical|right"
+        android:orientation="horizontal"
+        android:paddingHorizontal="20mm">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true">
+
+            <ImageView
+                android:layout_width="18mm"
+                android:layout_height="18mm"
+                android:src="@mipmap/order_detail_bell" />
+
+            <TextView
+                android:id="@+id/tv_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10mm"
+                android:text="拒绝"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10mm"
+            android:text="同意"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="60mm"
+        android:visibility="gone"
+        android:layout_alignParentBottom="true"
+        android:gravity="center_vertical|right"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/ll_check"
+            android:layout_width="match_parent"
+            android:layout_height="60mm"
+            android:layout_alignParentBottom="true"
+            android:gravity="center_vertical|right"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_refuse"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_red_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="拒绝"
+                android:textColor="@color/white" />
+
+            <TextView
+                android:id="@+id/tv_agree"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_green_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="同意"
+                android:textColor="@color/white" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_apply"
+            android:layout_width="match_parent"
+            android:layout_height="60mm"
+            android:layout_alignParentBottom="true"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_finish_apply"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_blue_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="提前结束申请"
+                android:textColor="@color/white" />
+
+            <TextView
+                android:id="@+id/tv_send_apply"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_blue_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="发货申请"
+                android:textColor="@color/white" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/ll_bottom"
+        android:layout_below="@id/ll_top"
+        android:background="@color/white">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/ll_bottom"
+            android:orientation="vertical"
+            android:paddingBottom="20mm">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_process"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm" />
+
+            <View style="@style/ViewX" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="订单信息"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="10mm"
+                android:paddingTop="10mm"
+                android:paddingBottom="20mm"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingHorizontal="20mm">
+
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5mm">
+
+                    <TextView
+                        android:id="@+id/tv_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="邢台德龙钢铁客户"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:textColor="#0841F0"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="14mm"
+                    android:paddingVertical="10mm"
+                    android:background="#FCFCFD"
+                    android:orientation="vertical">
+                    <RelativeLayout
+                        android:id="@+id/rl_dep"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="接单部门"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_dep"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <!-- 1.下单 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="下单人"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_place_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="下单部门"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_place_dep"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="下单仓库"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_warehouse"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <!-- 3.订单编号 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="订单编号"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_order_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="下单时间"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="要求发货时间"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_send_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10mm"
+                    android:gravity="right">
+
+                    <TextView
+                        android:id="@+id/tv_order_desc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="15mm"
+                        android:text="对方发起提前结束"
+                        android:textColor="@color/red_btn_bg"
+                        android:textSize="13sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="订单总价:￥"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/tv_price"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="15sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <View style="@style/ViewX" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="货品信息"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_pro"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <View style="@style/ViewX" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="订单要求"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="交提货地点:"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="5mm" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="运输方式及费用承担:"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="质量要求技术标准，供方对质量负责的条件和期限："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="包装、唛头及发货要求："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="注意事项："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="备注："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim6"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</RelativeLayout>

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

@@ -231,6 +231,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="right"
+        android:visibility="gone"
         android:layout_marginTop="10mm">
 
         <TextView
@@ -254,6 +255,17 @@
             android:paddingVertical="5mm"
             android:text="退货"
             android:textColor="@color/white" />
+        <TextView
+            android:id="@+id/tv_quality"
+            android:layout_width="wrap_content"
+            android:visibility="gone"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10mm"
+            android:background="@drawable/shape_blue_btn"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="质检"
+            android:textColor="@color/white" />
 
         <TextView
             android:id="@+id/tv_add"