1.首页改版

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数
token刷新问题

app/src/main/java/com/wd/workoffice/contract/BatChooseInfoContract.java

@@ -5,6 +5,7 @@ import com.wd.workoffice.bean.DepBean;
 import com.wd.workoffice.bean.ProcessBean;
 import com.wd.workoffice.bean.ProductBean;
 import com.wd.workoffice.bean.StockBean;
+import com.wd.workoffice.bean.TradingBean;
 
 import java.util.List;
 import java.util.Map;
@@ -24,7 +25,12 @@ public interface BatChooseInfoContract {
         Observable<BaseBean> getProcess(String processCode, Integer transitPartId);
 
         Observable<BaseBean> getPro(Map<String, Object> param);
+
         Observable<BaseBean> getStock(Map<String,Object> param);
+
+        Observable<BaseBean> getTradingPro(String code);
+
+        Observable<BaseBean> getTradingProList(Map<String,Object> param);
     }
 
     interface View extends IBaseView {
@@ -32,7 +38,12 @@ public interface BatChooseInfoContract {
 
 
         void getPro(List<ProductBean.RecordsBean> dataList);
+
         void getStock(List<StockBean> dataList);
+
+        void getTradingPro(TradingBean.RecordsBean code, List<ProductBean.RecordsBean> dataList);
+
+        void getTradingProList(List<TradingBean.RecordsBean> dataList);
     }
 
     interface Presenter extends IBasePresenter<View> {
@@ -44,5 +55,8 @@ public interface BatChooseInfoContract {
 
         void getStock(Map<String,Object> param);
 
+        void getTradingPro(TradingBean.RecordsBean code);
+
+        void getTradingProList(Map<String,Object> param);
     }
 }

app/src/main/java/com/wd/workoffice/model/BatChooseInfoModel.java

@@ -31,4 +31,14 @@ public class BatChooseInfoModel implements BatChooseInfoContract.Model {
     public Observable<BaseBean> getStock(Map<String,Object> param) {
         return RtfUtils.getRtf().getStock(param);
     }
+
+    @Override
+    public Observable<BaseBean> getTradingPro(String code) {
+        return RtfUtils.getRtf().tradingProDialog(code);
+    }
+
+    @Override
+    public Observable<BaseBean> getTradingProList(Map<String, Object> param) {
+        return RtfUtils.getRtf().tradingPro(param);
+    }
 }

app/src/main/java/com/wd/workoffice/presenter/BatChooseInfoPresenter.java

@@ -5,8 +5,8 @@ import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.bean.ProcessBean;
 import com.wd.workoffice.bean.ProductBean;
 import com.wd.workoffice.bean.StockBean;
+import com.wd.workoffice.bean.TradingBean;
 import com.wd.workoffice.contract.BatChooseInfoContract;
-import com.wd.workoffice.contract.BatSaleContract;
 import com.wd.workoffice.model.BatChooseInfoModel;
 import com.wd.workoffice.retrofit.WorkObserver;
 
@@ -85,6 +85,7 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract.
             }
         });
     }
+
     @Override
     public void getStock(Map<String, Object> param) {
         mView.showLoading();
@@ -111,6 +112,69 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract.
             }
         });
     }
+
+    @Override
+    public void getTradingPro(TradingBean.RecordsBean code) {
+        mView.showLoading();
+        mModel.getTradingPro(code.getProductSoleCode()).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+                mDisposable.add(d);
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                mView.hideLoading();
+                mView.onError(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                mView.hideLoading();
+                if (data.getCode() != 0) {
+                    mView.onError(data.getMessage());
+                    return;
+                }
+                List<ProductBean.RecordsBean> productBean = JSON.parseArray(data.getData().toString(), ProductBean.RecordsBean.class);
+                mView.getTradingPro(code, JSON.parseArray(data.getData().toString(), ProductBean.RecordsBean.class));
+            }
+        });
+    }
+
+    @Override
+    public void getTradingProList(Map<String, Object> param) {
+        mView.showLoading();
+        mModel.getTradingProList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+                mDisposable.add(d);
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                mView.hideLoading();
+                mView.onError(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                mView.hideLoading();
+                if (data.getCode() != 0) {
+                    mView.onError(data.getMessage());
+                    return;
+                }
+                List<TradingBean.RecordsBean> dataList;
+                TradingBean jsonData = JSON.parseObject(data.getData().toString(), TradingBean.class);
+                if (jsonData != null) {
+                    dataList = jsonData.getRecords();
+                } else {
+                    dataList = new ArrayList<>();
+                }
+                mView.getTradingProList(dataList);
+            }
+        });
+    }
+
     @Override
     public BatChooseInfoContract.Model bindModel() {
         return BatChooseInfoModel.newInstance();

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseClientActivity.java

@@ -66,7 +66,7 @@ public class ChooseClientActivity extends WorkToolBarActivity {
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
         param = WorkUtils.pageKey();
         param.put("searchType", getIntent().getStringExtra("code"));
-        param.put("deptId", UserKeeper.getInstance().getUserDepId());
+//        param.put("deptId", UserKeeper.getInstance().getUserDepId());
         if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getPermission())) {
             toast(R.string.permission);
         } else {

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreTradingProductActivity.java

@@ -86,7 +86,7 @@ public class StoreTradingProductActivity extends WorkToolBarActivity {
     }
 
 
-    private void openDialog(TradingBean.RecordsBean quantity, List<ProductBean.RecordsBean> data) {
+       private void openDialog(TradingBean.RecordsBean quantity, List<ProductBean.RecordsBean> data) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = LayoutInflater.from(this).inflate(R.layout.view_add_cart_trading, null);
         TextView tvOk = view.findViewById(R.id.tv_ok);