1.新增多种订单类型入库

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

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

@@ -22,7 +22,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
- * 发货申请列表
+ * 入库列表
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -54,6 +54,7 @@ public class AddStockApplyActivity extends WorkToolBarActivity {
             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);
@@ -90,6 +91,7 @@ public class AddStockApplyActivity extends WorkToolBarActivity {
             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"),

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyAddActivity.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;
@@ -11,7 +10,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.CheckAddStockEvent;
-import com.wd.workoffice.bean.event.CheckUseEvent;
+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;
@@ -25,6 +24,7 @@ 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;
 
 /**
@@ -49,6 +49,7 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
     @BindView(R.id.et_box_num)
     EditText etBoxNum;
     private Map<String, Object> param;
+    private String orderType;
 
     @Override
     protected void initView() {
@@ -57,6 +58,7 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        orderType = getIntent().getStringExtra("orderType");
         tvNum.setText(String.format("最大领用数量(%s)", getIntent().getStringExtra("num")));
         param = new HashMap<>();
         param.put("productId", getIntent().getStringExtra("productId"));
@@ -109,7 +111,17 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
         param.put("boxCode", boxCode);
         param.put("orderItemId", getIntent().getStringExtra("orderItemId"));
         param.put("applyRemark", remark);
-        RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        Observable<BaseBean> observable;
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            observable = RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
+        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+            observable = RtfUtils.getRtf().addPoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
+        } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().addFoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
+        } else {
+            observable = RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("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/activity/bat/order/AddStockApplyDetailActivity.java

@@ -17,6 +17,7 @@ import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.UseApplyBean;
 import com.wd.workoffice.bean.event.CheckAddStockEvent;
 import com.wd.workoffice.bean.event.CheckUseEvent;
+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;
@@ -30,6 +31,7 @@ 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;
 
 /**
@@ -66,6 +68,7 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
     @BindView(R.id.tv_box_num)
     TextView tvBoxNum;
     private UseApplyBean.RecordsBean info;
+    private String orderType;
 
     @Override
     protected void initView() {
@@ -75,6 +78,7 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
     @Override
     protected void initData() {
         info = JSON.parseObject(getIntent().getStringExtra("info"), UseApplyBean.RecordsBean.class);
+        orderType = getIntent().getStringExtra("orderType");
         tvNum.setText(String.valueOf(info.getProductAmount()));
         tvBoxNum.setText(String.valueOf(info.getBoxCode()));
         tvPerson.setText(String.valueOf(info.getCreatedByName()));
@@ -169,7 +173,17 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
         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) {
             }