1.供应订单详情

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

app/src/main/AndroidManifest.xml

@@ -1024,6 +1024,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.order.QualityApplyDetailActivity"
+            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/retrofit/ApiService.java

@@ -1346,7 +1346,7 @@ public interface ApiService {
      *
      * @return
      */
-    @POST("/enterStoreApply/fo/app/page/list")
+    @GET("/enterStoreApply/fo/app/page/list")
     Observable<BaseBean> addFoStockApplyList(@QueryMap Map<String, Object> param);
 
     /**
@@ -1354,7 +1354,7 @@ public interface ApiService {
      *
      * @return
      */
-    @POST("/enterStoreApply/co/app/page/list")
+    @GET("/enterStoreApply/co/app/page/list")
     Observable<BaseBean> addCoStockApplyList(@QueryMap Map<String, Object> param);
 
     /**
@@ -1403,6 +1403,14 @@ public interface ApiService {
     Observable<BaseBean> enterStoreApplyList(@QueryMap Map<String, Object> param);
 
 
+    /**
+     * 质检审核
+     *
+     * @return
+     */
+    @PUT("/enterStoreApply/fo/quality-inspection/audit/{id}")
+    Observable<BaseBean> enterFoStoreApplyList(@Path("id") String id, @Body RequestBody requestBody);
+
     /**
      * 获取一个订单子表的全部流水
      *
@@ -1419,6 +1427,36 @@ public interface ApiService {
     @PUT("/saleOrder/audit/{orderId}")
     Observable<BaseBean> saleOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
 
+    /**
+     * step2-审核
+     *
+     * @return
+     */
+    @PUT("/supplierOrder/audit/{orderId}")
+    Observable<BaseBean> supplierOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+
+    /**
+     * step2-审核
+     *
+     * @return
+     */
+    @PUT("/insideOrder/audit/{orderId}")
+    Observable<BaseBean> insideOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+    /**
+     * step2-审核
+     *
+     * @return
+     */
+    @PUT("/purchaseOrder/audit/{orderId}")
+    Observable<BaseBean> purchaseOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+    /**
+     * step2-审核
+     *
+     * @return
+     */
+    @PUT("/crucible/audit/{orderId}")
+    Observable<BaseBean> crucibleOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+
     /**
      * *获取当前用户某类消息
      *

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

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AddStockBean;
 import com.wd.workoffice.bean.UseApplyBean;
 import com.wd.workoffice.bean.event.CheckAddStockEvent;
 import com.wd.workoffice.bean.event.CheckUseEvent;
@@ -67,7 +68,7 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
     LinearLayout llCheck;
     @BindView(R.id.tv_box_num)
     TextView tvBoxNum;
-    private UseApplyBean.RecordsBean info;
+    private AddStockBean.RecordsBean info;
     private String orderType;
 
     @Override
@@ -77,7 +78,7 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        info = JSON.parseObject(getIntent().getStringExtra("info"), UseApplyBean.RecordsBean.class);
+        info = JSON.parseObject(getIntent().getStringExtra("info"), AddStockBean.RecordsBean.class);
         orderType = getIntent().getStringExtra("orderType");
         tvNum.setText(String.valueOf(info.getProductAmount()));
         tvBoxNum.setText(String.valueOf(info.getBoxCode()));
@@ -205,6 +206,7 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
                 }
                 toast("操作成功");
                 EventBus.getDefault().post(new CheckAddStockEvent());
+                finish();
             }
         });
     }

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

@@ -265,7 +265,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
                     case R.id.tv_return:
                         startActivity(ReturnApplyActivity.class,
                                 "status", dataBean.getStatus() + "",
-                                "orderType", dataBean.getOrderType() + "",
+                                "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "num", proList.get(position).getStoreSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
@@ -286,6 +286,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
                     case R.id.tv_quality:
                         startActivity(QualityApplyActivity.class,
                                 "status", dataBean.getStatus() + "",
+                                "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "num", proList.get(position).getStoreSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
@@ -382,7 +383,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
         Map<String, Object> dataParam = WorkUtils.simpleParam();
         dataParam.put("result", status);
         dataParam.put("comment", remark);
-        RtfUtils.getRtf().saleOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getRtf().crucibleOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

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

@@ -270,6 +270,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
                     case R.id.tv_quality:
                         startActivity(QualityApplyActivity.class,
                                 "status", dataBean.getStatus() + "",
+                                "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "num", proList.get(position).getStoreSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
@@ -372,7 +373,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
         Map<String, Object> dataParam = WorkUtils.simpleParam();
         dataParam.put("result", status);
         dataParam.put("comment", remark);
-        RtfUtils.getRtf().saleOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getRtf().insideOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

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

@@ -392,7 +392,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
         Map<String, Object> dataParam = WorkUtils.simpleParam();
         dataParam.put("result", status);
         dataParam.put("comment", remark);
-        RtfUtils.getRtf().saleOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getRtf().purchaseOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/QualityApplyDetailActivity.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.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AddStockBean;
+import com.wd.workoffice.bean.UseApplyBean;
+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.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.Map;
+
+import androidx.appcompat.app.AlertDialog;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+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 QualityApplyDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_refuse)
+    TextView tvRefuse;
+    @BindView(R.id.tv_agree)
+    TextView tvAgree;
+    @BindView(R.id.ll_bottom)
+    LinearLayout llBottom;
+    @BindView(R.id.tv_num)
+    TextView tvNum;
+    @BindView(R.id.tv_person)
+    TextView tvPerson;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.tv_remark)
+    TextView tvRemark;
+    @BindView(R.id.tv_check_person)
+    TextView tvCheckPerson;
+    @BindView(R.id.tv_check_time)
+    TextView tvCheckTime;
+    @BindView(R.id.tv_check_remark)
+    TextView tvCheckRemark;
+    @BindView(R.id.tv_check_status)
+    TextView tvCheckStatus;
+    @BindView(R.id.ll_check)
+    LinearLayout llCheck;
+    @BindView(R.id.tv_box_num)
+    TextView tvBoxNum;
+    private AddStockBean.RecordsBean info;
+    private String orderType;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        info = JSON.parseObject(getIntent().getStringExtra("info"), AddStockBean.RecordsBean.class);
+        orderType = getIntent().getStringExtra("orderType");
+        tvNum.setText(String.valueOf(info.getProductAmount()));
+        tvBoxNum.setText(String.valueOf(info.getBoxCode()));
+        tvPerson.setText(String.valueOf(info.getCreatedByName()));
+        tvTime.setText(info.getCreatedTime());
+        tvRemark.setText(String.valueOf(info.getApplyRemark()));
+        if (TextUtils.equals(info.getQualityInspectionStatus(), "0")) {
+            llBottom.setVisibility(View.VISIBLE);
+            llCheck.setVisibility(View.GONE);
+        } else {
+            llBottom.setVisibility(View.GONE);
+            llCheck.setVisibility(View.VISIBLE);
+            tvCheckPerson.setText(info.getUpdatedByName());
+            tvCheckTime.setText(info.getUpdatedTime());
+            tvCheckRemark.setText(info.getAuditRemark());
+            tvCheckStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(info.getQualityInspectionStatus())));
+        }
+    }
+
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_add_stock_apply_detail;
+    }
+
+
+    @OnClick({R.id.tv_refuse, R.id.tv_agree})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_refuse:
+                checkDialog(2, info.getId());
+                break;
+            case R.id.tv_agree:
+                checkDialog(1, info.getId());
+                break;
+        }
+    }
+
+    private void checkDialog(int status, int id) {
+        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(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.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().enterFoStoreApplyList(id + "", WorkUtils.convertMapToBody(param));
+        } else {
+            observable = RtfUtils.getRtf().enterFoStoreApplyList(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());
+                finish();
+            }
+        });
+    }
+
+}

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

@@ -138,21 +138,12 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
             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);
@@ -211,7 +202,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                 tvOrderNo.setText(dataBean.getId());
                 tvTime.setText(dataBean.getCreatedTime());
                 tvSendTime.setText(dataBean.getRequireTime());
-                tvDesc.setText(dataBean.getAttrName());
+                tvOrderDesc.setText(dataBean.getAttrName());
                 tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
 
                 OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
@@ -247,7 +238,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                     case R.id.tv_add:
                         startActivity(AddStockApplyActivity.class,
                                 "status", dataBean.getStatus() + "",
-                                "orderType", dataBean.getOrderType() + "",
+                                "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "num", proList.get(position).getCanInStoreProductSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
@@ -258,7 +249,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                     case R.id.tv_return:
                         startActivity(ReturnApplyActivity.class,
                                 "status", dataBean.getStatus() + "",
-                                "orderType", dataBean.getOrderType() + "",
+                                "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "num", proList.get(position).getStoreSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
@@ -278,6 +269,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                         break;
                     case R.id.tv_quality:
                         startActivity(QualityApplyActivity.class,
+                                "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "status", dataBean.getStatus() + "",
                                 "num", proList.get(position).getStoreSum() + "",
                                 "product", proList.get(position).getProductName(),
@@ -298,7 +290,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({ R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
+    @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:
@@ -381,7 +373,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
         Map<String, Object> dataParam = WorkUtils.simpleParam();
         dataParam.put("result", status);
         dataParam.put("comment", remark);
-        RtfUtils.getRtf().saleOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getRtf().supplierOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/java/com/wd/workoffice/ui/adapter/QualitypplyAdapter.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.AddStockBean;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.List;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class QualitypplyAdapter extends BaseQuickAdapter<AddStockBean.RecordsBean, BaseViewHolder> {
+    int status;
+
+    public QualitypplyAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    public QualitypplyAdapter(int layoutResId, @Nullable List<AddStockBean.RecordsBean> data, int status) {
+        super(layoutResId, data);
+        this.status = status;
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, AddStockBean.RecordsBean item) {
+        helper.setText(R.id.tv_name, item.getSerialNumber());
+        helper.setText(R.id.tv_num, String.valueOf(item.getProductAmount()));
+        helper.setText(R.id.tv_box_num, String.valueOf(item.getBoxCode()));
+        helper.setText(R.id.tv_time, item.getCreatedTime());
+        helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getQualityInspectionStatus())));
+        if (status == 0) {
+            helper.setVisible(R.id.ll_btn, true);
+            helper.addOnClickListener(R.id.tv_agree);
+            helper.addOnClickListener(R.id.tv_refuse);
+        }
+    }
+}
+

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

@@ -248,7 +248,7 @@ public class AddStockApplyFragment extends WorkBaseFg {
             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 if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+        } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
             observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
         }else {
             observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));

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

@@ -21,7 +21,9 @@ 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.activity.bat.order.QualityApplyDetailActivity;
 import com.wd.workoffice.ui.adapter.AddStockSendApplyAdapter;
+import com.wd.workoffice.ui.adapter.QualitypplyAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -56,7 +58,7 @@ public class QualityApplyFragment extends WorkBaseFg {
     private String state;
     private int page = 1;
     private Map<String, Object> param;
-    private AddStockSendApplyAdapter dataAdapter;
+    private QualitypplyAdapter dataAdapter;
     private List<AddStockBean.RecordsBean> dataList;
     private String orderId;
     private String productId;
@@ -72,13 +74,13 @@ public class QualityApplyFragment extends WorkBaseFg {
     @Override
     protected void initData() {
         param = WorkUtils.pageKey();
-        param.put("status", state);
+        param.put("qualityInspectionStatus", 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 = new QualitypplyAdapter(R.layout.item_add_stock_apply, dataList, Integer.valueOf(state));
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         getData();
@@ -160,7 +162,7 @@ public class QualityApplyFragment extends WorkBaseFg {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(AddStockApplyDetailActivity.class,
+                startActivity(QualityApplyDetailActivity.class,
                         "orderType",orderType,
                         "info", JSON.toJSONString(dataList.get(position)));
             }
@@ -236,14 +238,10 @@ public class QualityApplyFragment extends WorkBaseFg {
         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));
+        if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().enterFoStoreApplyList(id + "", WorkUtils.convertMapToBody(param));
         } else {
-            observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+            observable = RtfUtils.getRtf().enterFoStoreApplyList(id + "", WorkUtils.convertMapToBody(param));
         }
         observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override

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

@@ -114,7 +114,7 @@
                         android:layout_weight="1"
                         android:background="@null"
                         android:gravity="right"
-                        android:hint="输入数量"
+                        android:hint="输入箱号"
                         android:padding="3mm"
                         android:textColor="@color/flexible_text_gray"
                         android:textSize="14sp" />