1.内部交易，下单

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

@@ -43,7 +43,7 @@ public interface BatChooseInfoContract {
 
         void getTradingPro( List<ProductBean.RecordsBean> dataList);
 
-        void getTradingProList(List<TradingBean.RecordsBean> dataList);
+        void getTradingProList(List<ProductBean.RecordsBean> dataList);
     }
 
     interface Presenter extends IBasePresenter<View> {

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

@@ -40,6 +40,7 @@ public class BatChooseInfoModel implements BatChooseInfoContract.Model {
 
     @Override
     public Observable<BaseBean> getTradingProList(Map<String, Object> param) {
-        return RtfUtils.getRtf().tradingPro(param);
+        //TODO 其他类型内部订单下单，需区分接口，暂时不需要功能
+        return RtfUtils.getRtf().tradingUsablePro(param);
     }
 }

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

@@ -164,8 +164,8 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract.
                     mView.onError(data.getMessage());
                     return;
                 }
-                List<TradingBean.RecordsBean> dataList;
-                TradingBean jsonData = JSON.parseObject(data.getData().toString(), TradingBean.class);
+                List<ProductBean.RecordsBean> dataList;
+                ProductBean jsonData = JSON.parseObject(data.getData().toString(), ProductBean.class);
                 if (jsonData != null) {
                     dataList = jsonData.getRecords();
                 } else {

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

@@ -1184,6 +1184,14 @@ public interface ApiService {
     @GET("/stockQuantity/return-stock/page/list")
     Observable<BaseBean> tradingPro(@QueryMap Map<String, Object> param);
 
+    /**
+     * 生产-获取产品列表
+     *
+     * @return
+     */
+    @GET("/insideOrder/usableProduct/page/list")
+    Observable<BaseBean> tradingUsablePro(@QueryMap Map<String, Object> param);
+
 //    /**
 //     * 获取产品去向(搜索置换产品)
 //     *

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

@@ -169,11 +169,13 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
             batChooseInfoPresenter.getStock(stockParam);
         }
         if (TextUtils.equals("6", type)) {
-            tradingProductList = new ArrayList<>();
-            tradingProductAdapter = new TradingProductAdapter(R.layout.item_trading_product, tradingProductList);
-            tradingProductAdapter.bindToRecyclerView(rvData);
-            tradeParam.put("deptId", getIntent().getStringExtra("deptId"));//内部交易
-            batChooseInfoPresenter.getTradingProList(tradeParam);
+            //TODO 特殊类型内部订单下单
+//            tradingProductList = new ArrayList<>();
+//            tradingProductAdapter = new TradingProductAdapter(R.layout.item_trading_product, tradingProductList);
+//            tradingProductAdapter.bindToRecyclerView(rvData);
+//            tradeParam.put("deptId", getIntent().getStringExtra("deptId"));//内部交易
+//            batChooseInfoPresenter.getTradingProList(tradeParam);
+            batChooseInfoPresenter.getTradingProList(param);
             batChooseInfoPresenter.getStock(stockParam);
         }
     }
@@ -191,20 +193,21 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
         proAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
-                if (TextUtils.equals("6", type)) {
-                    openDialogInside(tradingProductList.get(position));
-                } else {
+                //TODO 内部订单修改弹窗类型，后期业务逻辑修改
+//                if (TextUtils.equals("6", type)) {
+//                    openDialogInside(tradingProductList.get(position));
+//                } else {
                     openDialog(proList.get(position));
-                }
+//                }
             }
         });
         if (TextUtils.equals(type, "6")) {
-            tradingProductAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
-                @Override
-                public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
-                    openDialogInside(tradingProductList.get(position));
-                }
-            });
+//            tradingProductAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+//                @Override
+//                public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+//                    openDialogInside(tradingProductList.get(position));
+//                }
+//            });
         }
     }
 
@@ -534,22 +537,38 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
     }
 
     @Override
-    public void getTradingProList(List<TradingBean.RecordsBean> dataList) {
+    public void getTradingProList(List<ProductBean.RecordsBean> dataList) {
+        //TODO 内部订单修改弹窗类型，后期业务逻辑修改
         if (page == 1) {
-            tradingProductList.clear();
-            tradingProductList.addAll(dataList);
-            tradingProductAdapter.notifyDataSetChanged();
-            tradingProductAdapter.loadMoreComplete();
+            proList.clear();
+            proList.addAll(dataList);
+            proAdapter.notifyDataSetChanged();
+            proAdapter.loadMoreComplete();
         } else {
-            tradingProductAdapter.loadMoreComplete();
-            tradingProductList.addAll(dataList);
-            tradingProductAdapter.notifyDataSetChanged();
+            proAdapter.loadMoreComplete();
+            proList.addAll(dataList);
+            proAdapter.notifyDataSetChanged();
         }
         if (dataList.size() == 0) {
-            tradingProductAdapter.loadMoreEnd();
+            proAdapter.loadMoreEnd();
         } else {
             page++;
         }
+//        if (page == 1) {
+//            tradingProductList.clear();
+//            tradingProductList.addAll(dataList);
+//            tradingProductAdapter.notifyDataSetChanged();
+//            tradingProductAdapter.loadMoreComplete();
+//        } else {
+//            tradingProductAdapter.loadMoreComplete();
+//            tradingProductList.addAll(dataList);
+//            tradingProductAdapter.notifyDataSetChanged();
+//        }
+//        if (dataList.size() == 0) {
+//            tradingProductAdapter.loadMoreEnd();
+//        } else {
+//            page++;
+//        }
     }
 
     @Override
@@ -633,19 +652,35 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                 toast("请选择入库仓库");
                 return true;
             }
-            if (tradingCarList.size() == 0) {
+            if (carList.size() == 0) {
                 toast("购物车没有产品");
                 return true;
             }
-            startActivity(StoreTradingCarActivity.class,
-                    "pro", JSON.toJSONString(tradingCarList),
+//            if (tradingCarList.size() == 0) {
+//                toast("购物车没有产品");
+//                return true;
+//            }
+            //TODO 前置类型不选择，默认跳转普通
+            startActivity(StoreSaleCarActivity.class,
+                    "pro", JSON.toJSONString(carList),
                     "supplierId", supplyId == null ? "" : supplyId.toString(),
                     "subProcess", chooseProcess == null ? "" : chooseProcess.getName(),
                     "subProcessId", chooseProcess == null ? "" : chooseProcess.getId() + "",
                     "inStockId", chooseStock == null ? "" : chooseStock.getId() + "",
+                    "intoStore", chooseStock == null ? "" : chooseStock.getId() + "",
+                    "outerStore", chooseSendStock == null ? "" : chooseSendStock.getId() + "",
                     "customerId", clientId == null ? "" : clientId.toString(),
                     "receiveDeptId", getIntent().getStringExtra("deptId"),
                     "code", permissionCode);
+//            startActivity(StoreTradingCarActivity.class,
+//                    "pro", JSON.toJSONString(tradingCarList),
+//                    "supplierId", supplyId == null ? "" : supplyId.toString(),
+//                    "subProcess", chooseProcess == null ? "" : chooseProcess.getName(),
+//                    "subProcessId", chooseProcess == null ? "" : chooseProcess.getId() + "",
+//                    "inStockId", chooseStock == null ? "" : chooseStock.getId() + "",
+//                    "customerId", clientId == null ? "" : clientId.toString(),
+//                    "receiveDeptId", getIntent().getStringExtra("deptId"),
+//                    "code", permissionCode);
         } else {
             if (carList.size() == 0) {
                 toast("购物车没有产品");
@@ -945,26 +980,26 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(ModifyCarEvent event) {
         String pro = event.getPro();
-        if (TextUtils.equals("6", type)) {
-            tradingCarList.clear();
-            tradingCarList.addAll(JSON.parseArray(pro, TradingBean.RecordsBean.class));
-            for (TradingBean.RecordsBean tradingPro : tradingProductList) {//购物车信息置空
-                tradingPro.setChooseNum(null);
-                tradingPro.setChooseName(null);
-                tradingPro.setChangePro(null);
-            }
-            for (TradingBean.RecordsBean recordsBean : tradingCarList) {//判断购物车信息，添加信息
-                for (TradingBean.RecordsBean bean : tradingProductList) {
-                    if (bean.getId() == recordsBean.getId()) {
-                        bean.setChooseNum(recordsBean.getChooseNum());
-                        bean.setChooseName(recordsBean.getChooseName());
-                        bean.setChangePro(recordsBean.getChangePro());
-                    }
-                }
-
-            }
-            tradingProductAdapter.notifyDataSetChanged();
-        } else {
+//        if (TextUtils.equals("6", type)) {
+//            tradingCarList.clear();
+//            tradingCarList.addAll(JSON.parseArray(pro, TradingBean.RecordsBean.class));
+//            for (TradingBean.RecordsBean tradingPro : tradingProductList) {//购物车信息置空
+//                tradingPro.setChooseNum(null);
+//                tradingPro.setChooseName(null);
+//                tradingPro.setChangePro(null);
+//            }
+//            for (TradingBean.RecordsBean recordsBean : tradingCarList) {//判断购物车信息，添加信息
+//                for (TradingBean.RecordsBean bean : tradingProductList) {
+//                    if (bean.getId() == recordsBean.getId()) {
+//                        bean.setChooseNum(recordsBean.getChooseNum());
+//                        bean.setChooseName(recordsBean.getChooseName());
+//                        bean.setChangePro(recordsBean.getChangePro());
+//                    }
+//                }
+//
+//            }
+//            tradingProductAdapter.notifyDataSetChanged();
+//        } else {
             carList.clear();
             carList.addAll(JSON.parseArray(pro, ProductBean.RecordsBean.class));
             for (ProductBean.RecordsBean proInfo : proList) {//购物车信息置空
@@ -983,7 +1018,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
 
             }
             proAdapter.notifyDataSetChanged();
-        }
+//        }
         changeCarBadge();
     }
 }

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

@@ -233,6 +233,9 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
         param.put("launchOrderAmount", getIntent().getStringExtra("launchOrderAmount"));
         param.put("launchUserId", UserKeeper.getInstance().getUserId());
         param.put("launchDeptId", UserKeeper.getInstance().getUserDepId());
+        //内部交易，暂时写死
+        param.put("type", "product");
+        param.put("businessFormat", "PD");
         getBillData();
     }
 
@@ -306,6 +309,14 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
             data.put("productCount", recordsBean.getCarNum());
             data.put("annex", recordsBean.getUrl());
 //            data.put("provideMethod", recordsBean.getProvideMethod());
+
+//            if (TextUtils.equals(getIntent().getStringExtra("code"),
+//                    PermissionType.PROCESS_INSIDE.getCode())) {
+//                data.put("sourceProductId", recordsBean.getId());
+//                data.put("sourceProductCount", recordsBean.getCarNum());
+//                data.put("stockId", recordsBean.getStockId());
+//            }
+
             orderItems.add(data);
         }
         return orderItems;

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

@@ -88,6 +88,11 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
             } else {
                 helper.setGone(R.id.rl_receive_order, false);
             }
+            if (TextUtils.equals(orderType,
+                    PermissionType.PROCESS_INSIDE.getCode())) {
+                helper.setGone(R.id.rl_choose_dep, false);
+                helper.setGone(R.id.rl_pro_from, false);
+            }
             helper.setGone(R.id.rl_mark, TextUtils.equals(orderType, PermissionType.PROCESS_SALE.getCode()));
         } else if (type == 2) {
             helper.setGone(R.id.ll_inner_price, false);