Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/manage/manageMenu/ManageMenuActivity.java

@@ -11,6 +11,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
+import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
 import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
 import com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity;
 import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
@@ -57,30 +58,27 @@ public class ManageMenuActivity extends AppCompatActivity {
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 switch (marketingMenuAdapter.getData().get(position)) {
                     case C.MENU.MENU_MANAGER_OPER: {
-                        //会员等级
+
                     }
                     break;
                     case C.MENU.MENU_MANAGER_GOODS: {
-                        //积分规则
-                        ActivityUtils.startActivity(IntegralActivity.class);
+
                     }
                     break;
                     case C.MENU.MENU_MANAGER_BALE: {
-                        //优惠券设置
-                        ActivityUtils.startActivity(ReturnTicketActivity.class);
+
                     }
                     break;
                     case C.MENU.MENU_MANAGER_REPLENISHMENT: {
-                        //充值优惠
+                        ActivityUtils.startActivity(ManageMenuActivity.this, ReplenishmentActivity.class);
                     }
                     break;
                     case C.MENU.MENU_MANAGER_OTHER: {
-                        //营销计划
-                        ActivityUtils.startActivity(MsActivity.class);
+
                     }
                     break;
                     case C.MENU.MENU_MANAGER_INVENTORY: {
-                        //群发短信
+
                     }
                     break;
                     default: {

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentActivity.java

 package com.xingdata.zzdpos.ui.manage.replenishment;
 
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 
+import com.blankj.utilcode.util.KeyboardUtils;
 import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.databinding.ActivityReplenishmentBinding;
+import com.xingdata.zzdpos.model.Psb;
+import com.xingdata.zzdpos.model.Sssku;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 
-public class ReplenishmentActivity extends AppCompatActivity {
+import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentFragment;
+
+import java.util.List;
+
+public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ActivityReplenishmentBinding> implements ReplenishmentContract.View {
+    private ReplenishmentFragment mReplenishmentFragment = new ReplenishmentFragment();
+//    private ReplenishmentDetailFragment mReplenishmentDetailFragment = new ReplenishmentDetailFragment();
+    private boolean isAllowFragment = true;
+    LoadingDialog mLoadingDialog = new LoadingDialog();
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_replenishment;
+    }
+
+    @Override
+    public void initView() {
+        loadRootFragment(R.id.f_bottom, mReplenishmentFragment, true, false);
+
+    }
+
+    @Override
+    public void addPsbSuc() {
+//        mReplenishmentDetailFragment.pop();
+        mPresenter.refreshPsb();
+    }
+
+
+    @Override
+    public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C) {
+             mReplenishmentFragment.showReplenishmentList(A, B, C);
+    }
+
+    @Override
+    public void openReplenishmentDetailFragment(List<Sssku> ssskuList) {
+//        if (isAllowFragment) {
+//            isAllowFragment = false;
+//            mReplenishmentDetailFragment.setSsskuList(ssskuList);
+//            start(mReplenishmentDetailFragment);
+//        }
+
+    }
+
+    @Override
+    public void openReplenishmentDetailFragment(Psb psb) {
+//        if (isAllowFragment) {
+//            isAllowFragment = false;
+//            mReplenishmentDetailFragment.setPsb(psb);
+//            start(mReplenishmentDetailFragment);
+//
+//        }
+
+    }
+
+    @Override
+    protected void onPause() {
+        KeyboardUtils.hideSoftInput(this);
+        super.onPause();
+    }
+
+    @Override
+    public void isShowLoading(Boolean is) {
+        if (is) {
+            mLoadingDialog.show((BaseActivity) mContext);
+        } else {
+            if (mLoadingDialog.isShowing) {
+                mLoadingDialog.dismiss();
+            }
+        }
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_replenishment);
+    public void isAllowFragment(Boolean is) {
+        isAllowFragment = is;
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentContract.java

+package com.xingdata.zzdpos.ui.manage.replenishment;
+
+
+
+import com.xingdata.zzdpos.base.BasePresenter;
+import com.xingdata.zzdpos.base.BaseView;
+import com.xingdata.zzdpos.model.Psb;
+import com.xingdata.zzdpos.model.Sssku;
+
+import java.util.List;
+
+/**
+ * Created by Eurus on 2017/11/23.
+ */
+
+public interface ReplenishmentContract {
+
+    interface View extends BaseView {
+
+        void isShowLoading(Boolean is);
+
+        void isAllowFragment(Boolean is);
+
+
+
+        /**
+         * 提交订货成功
+         */
+        void addPsbSuc();
+
+        /**
+         * 展示待确认的订单
+         */
+        void showReplenishmentList(List<Psb> A,List<Psb> B,List<Psb> C);
+
+
+
+        /**
+         * 跳转订货详情
+         */
+        void openReplenishmentDetailFragment(List<Sssku> ssskuList);
+
+        /**
+         * 跳转订货详情
+         */
+        void openReplenishmentDetailFragment(Psb psb);
+    }
+
+    abstract class Presenter extends BasePresenter<View> {
+
+
+        /**
+         * 补货订货页面 - 点击一键补货
+         */
+        public abstract void clickAdd();
+
+        /**
+         * 补货订货页面 - 查询门店订货订单
+         */
+        public abstract void queryPsbList();
+
+        /**
+         * 补货订货页面 - 查询门店订货详情
+         */
+        public abstract void queryPsbDetail(Psb psb);
+
+
+        /**
+         * 补货订货详情页面 - 点击订货提交
+         */
+        public abstract void clickReplenishmentSubmit(Psb psb);
+
+        /**
+         * 补货订货详情页面 - 点击订货修改
+         */
+        public abstract void clickReplenishmentUpdate(Psb psb);
+
+        /**
+         * 补货订货详情页面 - 点击确定收货
+         */
+        public abstract void clickReplenishmentConfirm(String psbNo);
+
+        /**
+         * 补货订货页面 - 刷新
+         */
+        public abstract void refreshPsb();
+
+        /**
+         * 补货订货页面 - 更改Fragment跳转安全
+         */
+        public abstract void isAllowFragment(Boolean is);
+
+    }
+
+
+}
+
+

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentPresenter.java

+package com.xingdata.zzdpos.ui.manage.replenishment;
+
+
+import android.util.Log;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.api.ApiFactory;
+import com.xingdata.zzdpos.model.Psb;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReplenishmentPresenter extends ReplenishmentContract.Presenter {
+    private List<Psb> unConfirmedPsbList = new ArrayList<>();
+    private List<Psb> unReceivePsbList = new ArrayList<>();
+    private List<Psb> finishedPsbList = new ArrayList<>();
+
+
+    @Override
+    public void onAttached() {
+
+    }
+
+
+
+
+    @Override
+    public void clickAdd() {
+        mView.isShowLoading(true);
+        ApiFactory.Psb.preOrder().doFinally(() -> {
+            mView.isShowLoading(false);
+        })
+                .subscribe(ssskuPager -> {
+                    mView.openReplenishmentDetailFragment(ssskuPager.getList());
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+
+    }
+
+    @Override
+    public void queryPsbList() {
+        unConfirmedPsbList.clear();
+        unReceivePsbList.clear();
+        finishedPsbList.clear();
+        ApiFactory.Psb.queryPsb(1, 200).doFinally(() -> {
+
+        })
+                .subscribe(psbPager -> {
+                    for (Psb psb : psbPager.getList()) {
+                        switch (psb.getPsbStatus()) {
+                            case 3:
+                                unConfirmedPsbList.add(psb);
+                                break;
+                            case 1:
+                                unReceivePsbList.add(psb);
+                                break;
+                            case 0:
+                                finishedPsbList.add(psb);
+                                break;
+                        }
+
+                    }
+                    mView.showReplenishmentList(unConfirmedPsbList, unReceivePsbList, finishedPsbList);
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
+    @Override
+    public void queryPsbDetail(Psb psb) {
+        mView.isShowLoading(true);
+        ApiFactory.Psb.queryPsbDetail(psb.getPsbNo(), psb.getId()).doFinally(() -> {
+            mView.isShowLoading(false);
+        })
+                .subscribe(psbNew -> {
+//                    psbNew.setOutChannelNameabcn(psb.getOutChannelNameabcn());
+//                    psbNew.setCityAddress(psb.getCityAddress());
+//                    psbNew.setCityProvName(psb.getCityProvName());
+//                    psbNew.setCityName(psb.getCityName());
+//                    psbNew.setCityCountyName(psb.getCityCountyName());
+                    mView.openReplenishmentDetailFragment(psbNew);
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
+    @Override
+    public void clickReplenishmentSubmit(Psb psb) {
+        mView.isShowLoading(true);
+        String s = com.alibaba.fastjson.JSON.toJSONString(psb);
+        ApiFactory.Psb.addPsb(psb).doFinally(() -> {
+            mView.isShowLoading(false);
+        })
+                .subscribe(psb1 -> {
+                    mView.addPsbSuc();
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+
+    }
+
+    @Override
+    public void clickReplenishmentUpdate(Psb psb) {
+        ApiFactory.Psb.updatePsb(psb).doFinally(() -> {
+
+        })
+                .subscribe(object -> {
+                    mView.addPsbSuc();
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+
+    }
+
+    @Override
+    public void clickReplenishmentConfirm(String psbNo) {
+        ApiFactory.Psb.confirmRPsb(psbNo).doFinally(() -> {
+
+        })
+                .subscribe(object -> {
+                    mView.addPsbSuc();
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
+    @Override
+    public void refreshPsb() {
+        queryPsbList();
+        Log.e("r", "isrefreshp");
+    }
+
+
+    @Override
+    public void isAllowFragment(Boolean is) {
+        mView.isAllowFragment(is);
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/adpter/ReplenishmentAdapter.java

+package com.xingdata.zzdpos.ui.manage.replenishment.adpter;
+
+
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemReplenishmentBinding;
+import com.xingdata.zzdpos.model.Psb;
+import com.xingdata.zzdpos.ui.login.LoginPresenter;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+import java.util.List;
+
+
+public class ReplenishmentAdapter extends BaseAdapter<Psb, ItemReplenishmentBinding> {
+
+
+    public ReplenishmentAdapter(@Nullable List<Psb> data) {
+        super(R.layout.item_replenishment, data);
+
+    }
+
+
+    @Override
+    protected void convert(ItemReplenishmentBinding mViewBinding, Psb item) {
+        mViewBinding.setAmt(ConvertUtil.fenToYuan(item.getPsbAmt()));
+        mViewBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(item.getCreateTime()));
+        mViewBinding.setNo(item.getPsbNo());
+        mViewBinding.setNum(item.getPsbCnt() + "");
+        mViewBinding.setShopName(LoginPresenter.loginReturnBean.getShopNameAbcn());
+        switch (item.getPsbStatus()) {
+            case 3:
+                mViewBinding.setStatus("待确认");
+                break;
+            case 1:
+                mViewBinding.setStatus("待收货");
+                break;
+            case 0:
+                mViewBinding.setStatus("已入库");
+                break;
+        }
+        mViewBinding.setSupplierName(item.getOutChannelNameabcn());
+        mViewBinding.setSupplierAddress(item.getOutCityProvName() + item.getOutCityName() + item.getOutCityCountyName() + item.getOutCityAddress());
+
+    }
+
+    @Override
+    protected View getItemView(int layoutResId, ViewGroup parent) {
+        return super.getItemView(layoutResId, parent);
+    }
+
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/adpter/ReplenishmentDetailAdapter.java

+//package com.xingdata.zzdpos.ui.manage.replenishment.adpter;
+//
+//
+//import android.support.annotation.Nullable;
+//import android.support.v4.content.ContextCompat;
+//import android.text.Editable;
+//import android.text.TextWatcher;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import android.widget.EditText;
+//
+//
+//import com.xingdata.zzdpos.R;
+//import com.xingdata.zzdpos.model.Sssku;
+//import com.xingdata.zzdpos.util.ConvertUtil;
+//
+//import java.util.List;
+//
+//public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenishmentDetailBinding> {
+//    private Boolean isTouch = true;
+//    private UpdatePriceListener mUpdatePriceListener;
+//
+//    public ReplenishmentDetailAdapter(@Nullable List<Sssku> data, boolean Touch) {
+//        super(R.layout.item_replenishment_detail, data);
+//        isTouch = Touch;
+//
+//    }
+//
+//
+//    @Override
+//    protected void convert(ItemReplenishmentDetailBinding mViewBinding, Sssku item) {
+//        mViewBinding.imgGoods.setImageURI(item.getSpuImg());
+//        mViewBinding.tvGoodsName.setText(item.getSpuName());
+//        mViewBinding.tvGoodsCode.setText(item.getSpuBarcode() + "");
+//        mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
+//        mViewBinding.tvGoodsPrice.setText(ConvertUtil.fenToYuan(item.getSkuCost(), false));
+//        mViewBinding.tvStock.setText(item.getSkuStock() + "");
+//        if (item.getSkuCnt() != null) {
+//            mViewBinding.etCount.setText(item.getSkuCnt() + "");
+//        } else {
+//            item.setSkuCnt(1);
+//        }
+//
+//        if (!isTouch) {
+//            mViewBinding.etCount.setEnabled(false);
+//            mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext,R.color.white_cargo));
+//            mViewBinding.btnDown.setVisibility(View.GONE);
+//            mViewBinding.btnUp.setVisibility(View.GONE);
+//        }
+//    }
+//
+//
+//    @Override
+//    protected void convert(BaseViewHolder helper, Sssku item) {
+//
+//        if (isTouch) {
+//            helper.getView(R.id.btn_up).setOnClickListener(v -> {
+//                Integer sellCount = item.getSkuCnt();
+//                if (sellCount >= 0 && sellCount < 9999) {
+//                    helper.setText(R.id.et_count, String.valueOf(++sellCount));
+//                    item.setSkuCnt(sellCount);
+////                mUpdatePriceListener.updatePrice(1L*(item.getSkuCost()));
+//                }
+//            });
+//            helper.getView(R.id.btn_down).setOnClickListener(v -> {
+//                Integer sellCount = item.getSkuCnt();
+//                if (sellCount == 1) {
+//                    return;
+//                }
+//                if (sellCount > 1 && sellCount <= 9999) {
+//                    helper.setText(R.id.et_count, String.valueOf(--sellCount));
+//                    item.setSkuCnt(sellCount);
+////                mUpdatePriceListener.updatePrice(-1L*(item.getSkuCost()));
+//
+//                }
+//            });
+//            ((EditText) helper.getView(R.id.et_count)).addTextChangedListener((new TextWatcher() {
+//
+//                @Override
+//                public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+//
+//                }
+//
+//                @Override
+//                public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+//                    Integer sellCount = ((EditText) helper.getView(R.id.et_count)).getText().toString().length() == 0 ? 1 : Integer.valueOf(((EditText) helper.getView(R.id.et_count)).getText().toString());
+//                    if (sellCount==0){
+//                        sellCount=1;
+//                        helper.setText(R.id.et_count,"");
+//
+//                    }
+//                    Integer changedNum = sellCount - item.getSkuCnt();
+//                    item.setSkuCnt(sellCount);
+//                    mUpdatePriceListener.updatePrice(item.getSkuCost() * changedNum);
+//                }
+//
+//                @Override
+//                public void afterTextChanged(Editable editable) {
+//                }
+//
+//
+//            }));
+//        }
+//        super.convert(helper, item);
+//    }
+//
+//    @Override
+//    protected View getItemView(int layoutResId, ViewGroup parent) {
+//        return super.getItemView(layoutResId, parent);
+//    }
+//
+//
+//    public void setmUpdatePriceListener(UpdatePriceListener updatePriceListener) {
+//        this.mUpdatePriceListener = updatePriceListener;
+//    }
+//
+//
+//    public abstract static class UpdatePriceListener {
+//
+//        public abstract void updatePrice(long amt);
+//    }
+//
+//}

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentFragment.java

+package com.xingdata.zzdpos.ui.manage.replenishment.fragment;
+
+
+import android.view.View;
+
+import android.widget.TextView;
+
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentReplenishementBinding;
+import com.xingdata.zzdpos.model.Psb;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
+import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentPresenter;
+import com.xingdata.zzdpos.ui.manage.replenishment.adpter.ReplenishmentAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Created by Administrator on 2017/11/24.
+ */
+
+public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter, FragmentReplenishementBinding> {
+    private FragmentViewAdapter mFragmentPagerAdapter;
+    private List<BaseFragment> fragments;
+    private long mExitTime = 0;
+    private final int UNCONFIRMED = 3;
+    private final int UNRECEIVE = 1;
+    private final int FINISH = 0;
+    private int status = UNCONFIRMED;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_replenishement;
+    }
+
+    @Override
+    public void initView() {
+        initData();
+        initTab();
+        mPresenter.queryPsbList();
+
+//
+//        mViewBinding.btnAdd.setOnClickListener(view -> {
+//            mPresenter.clickAdd();
+//        });
+//
+//        mViewBinding.btnSearch.setOnClickListener(view -> {
+//            if (mViewBinding.etKeyword.getText().toString().trim().length() == 0) {
+//                ToastUtils.showShort("请输入供货商名称");
+//                return;
+//            }
+//            List<Psb> psbs = new ArrayList<>();
+//            if (psbArrayList == null) {
+//                return;
+//            }
+//            for (Psb psb : psbArrayList) {
+//                if (mViewBinding.etKeyword.getText().toString().trim().length() == 0) {
+//                    return;
+//                }
+//                Pattern pattern = Pattern.compile(mViewBinding.etKeyword.getText().toString(), Pattern.CASE_INSENSITIVE);
+//
+//                Matcher matcher = pattern.matcher((psb.getOutChannelNameabcn() + ""));
+//                if (matcher.find()) {
+//                    psbs.add(psb);
+//
+//                }
+//            }
+//
+//            mReplenishmentAdapter.setNewData(psbs);
+//            mReplenishmentAdapter.loadMoreEnd();
+//        });
+
+    }
+
+//    private void initRecycler() {
+//        mViewBinding.rlProduct.setLayoutManager(new GridLayoutManager(getActivity(), 3));
+//
+//        mReplenishmentAdapter = new ReplenishmentAdapter(new ArrayList<>());
+//        mReplenishmentAdapter.setEmptyView(getEmptyView());
+//        mReplenishmentAdapter.bindToRecyclerView(mViewBinding.rlProduct);
+//        mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
+//        mReplenishmentAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rlProduct);
+//        mReplenishmentAdapter.setOnItemClickListener((adapter, view, position) -> {
+//            if ((System.currentTimeMillis() - mExitTime) > 500) {
+//                mPresenter.queryPsbDetail(mReplenishmentAdapter.getData().get(position));
+//            } else {
+//                ToastUtils.showLong("您操作太快了");
+//            }
+//
+//        });
+//    }
+
+
+    private void onRefresh() {
+        mPresenter.refreshPsb();
+    }
+
+
+    private void initTab() {
+
+        mViewBinding.tab.setupWithViewPager(mViewBinding.fragmentContainer);
+        mViewBinding.tab.getTabAt(0).setText("待确认");
+        mViewBinding.tab.getTabAt(1).setText("待收货");
+        mViewBinding.tab.getTabAt(2).setText("已入库");
+    }
+
+    public void initData() {
+        fragments = new ArrayList<>();
+        fragments.add(new ReplenishmentListFragment());
+        fragments.add(new ReplenishmentListFragment());
+        fragments.add(new ReplenishmentListFragment());
+
+
+        mFragmentPagerAdapter = new FragmentViewAdapter(fragments, getChildFragmentManager());
+        mViewBinding.fragmentContainer.setAdapter(mFragmentPagerAdapter);
+
+    }
+
+
+    public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C) {
+        ((ReplenishmentListFragment) fragments.get(0)).setData(A, true);
+        ((ReplenishmentListFragment) fragments.get(1)).setData(B, true);
+        ((ReplenishmentListFragment) fragments.get(2)).setData(C, true);
+
+
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentListFragment.java

+package com.xingdata.zzdpos.ui.manage.replenishment.fragment;
+
+
+import android.content.Intent;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+import android.widget.TextView;
+
+import com.blankj.utilcode.util.ActivityUtils;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentReplenishmentListBinding;
+import com.xingdata.zzdpos.databinding.FragmentServiceBinding;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Psb;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.ui.main.MainPresenter;
+import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
+import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentPresenter;
+import com.xingdata.zzdpos.ui.manage.replenishment.adpter.ReplenishmentAdapter;
+import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
+import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresenter, FragmentReplenishmentListBinding> {
+    private ReplenishmentAdapter mReplenishmentAdapter;
+    private List<Psb> psbs = new ArrayList<>();
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_replenishment_list;
+    }
+
+    @Override
+    public void initView() {
+        if (mReplenishmentAdapter == null) {
+            mReplenishmentAdapter = new ReplenishmentAdapter(psbs);
+            mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+            mViewBinding.recycler.setAdapter(mReplenishmentAdapter);
+
+        } else {
+           
+            mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+            mViewBinding.recycler.setAdapter(mReplenishmentAdapter);
+        }
+
+        mReplenishmentAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
+                intent.putExtra(Saleorder.class.getName(), mReplenishmentAdapter.getData().get(position).getId());
+                ActivityUtils.startActivity(intent);
+            }
+        });
+
+        mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
+
+    }
+
+    private void onRefresh() {
+        mPresenter.queryPsbList();
+    }
+
+
+    /**
+     * 设置数据
+     *
+     * @param pager     数据
+     * @param isRefresh 是否刷新
+     */
+
+    /**
+     * 设置数据
+     *
+     * @param psbList   数据
+     * @param isRefresh 是否刷新
+     */
+    public void setData(List<Psb> psbList, boolean isRefresh) {
+        if (mReplenishmentAdapter == null) {
+            psbs = psbList;
+            return;
+        }
+        if (isRefresh) {
+            mReplenishmentAdapter.setEnableLoadMore(true);
+            mViewBinding.srlProduct.setRefreshing(false);
+        }
+        if (isRefresh) mReplenishmentAdapter.setNewData(psbList);
+        else if (psbList.size() > 0) mReplenishmentAdapter.addData(psbList);
+        if (mReplenishmentAdapter.getData().size() == 0) {
+            mViewBinding.llEmpty.setVisibility(View.VISIBLE);
+            mViewBinding.recycler.setVisibility(View.GONE);
+        } else {
+            mViewBinding.llEmpty.setVisibility(View.GONE);
+            mViewBinding.recycler.setVisibility(View.VISIBLE);
+        }
+
+    }
+
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/MsMainFragment.java

 package com.xingdata.zzdpos.ui.statistics.fragment.ms;
 
 
+import android.databinding.DataBindingUtil;
+import android.graphics.Typeface;
+import android.support.design.widget.TabLayout;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentMsMainBinding;
+import com.xingdata.zzdpos.databinding.ItemMenuBottomBinding;
+import com.xingdata.zzdpos.databinding.ItemStringBinding;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
 
@@ -11,9 +20,16 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
 
-public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBinding> {
 
+public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBinding> {
+    private int[] titleInts = {R.string.statistics_menu_ms_recharge, R.string.statistics_menu_ms_usedTicket};
     private FragmentViewAdapter mFragmentStateAdapter;
     private List<Long> dateLongs = new ArrayList<>();
     private List<BaseFragment> fragments = new ArrayList<>();
@@ -57,7 +73,60 @@ public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBi
             }, 1);
 
         }
+        initTab();
+
+    }
+
+    private void initTab() {
+
+        Observable.create(new ObservableOnSubscribe<View>() {
+            @Override
+            public void subscribe(ObservableEmitter<View> e) throws Exception {
+                e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
+                e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
+            }
+        }).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<View>() {
+            int i = 0;
+
+            @Override
+            public void accept(View view) throws Exception {
+
+                ItemStringBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
+                if (i == 0) {
+                    itemMenuBottomBinding.itemTv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+                }
+                itemMenuBottomBinding.itemTv.setText(titleInts[i]);
+                itemMenuBottomBinding.itemTv.setPadding(0, 0, 0, 0);
+
+                mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
+                i++;
+            }
+        });
+
+
+        mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
+                textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+                textView.setText(tab.getText());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+                TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
+                textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
+                textView.setText(tab.getText());
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
+
     }
+
     public int getTabItem() {
         return mViewBinding.tabLayout.getSelectedTabPosition();
     }

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity">
-
-</android.support.constraint.ConstraintLayout>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <FrameLayout
+            android:id="@+id/f_bottom"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+        </FrameLayout>
+
+
+    </android.support.constraint.ConstraintLayout>
+
+</layout>
\ No newline at end of file

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

@@ -37,6 +37,7 @@
                 android:layout_weight="1"
                 android:drawableTop="@mipmap/icon_receivables"
                 android:gravity="center"
+                android:textSize="@dimen/all_sub_title_size"
                 android:text="@string/menu_receivables"
                 android:textColor="#FFF" />
 
@@ -48,6 +49,7 @@
                 android:drawableTop="@mipmap/icon_billing"
                 android:gravity="center"
                 android:text="@string/menu_billing"
+                android:textSize="@dimen/all_sub_title_size"
                 android:textColor="#FFF" />
 
 

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

@@ -24,7 +24,8 @@
             android:background="@color/white_caocao"
             app:layout_constraintTop_toTopOf="parent"
             app:tabIndicatorColor="@color/red_lvzhi"
-            app:tabIndicatorHeight="@dimen/view_line_L2">
+            app:tabIndicatorHeight="@dimen/view_line_L2"
+            app:tabTextColor="@color/black_baozheng">
 
         </android.support.design.widget.TabLayout>
 

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

@@ -75,7 +75,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{opername}"
                         android:textColor="@color/white_caocao"
-                        android:textSize="@dimen/big_text_size" />
+                        android:textSize="@dimen/all_text_size" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -83,7 +83,7 @@
                         android:layout_marginStart="@dimen/all_padding"
                         android:text="@{phone}"
                         android:textColor="@color/white_caocao"
-                        android:textSize="@dimen/small_text_size" />
+                        android:textSize="@dimen/all_text_size_small" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -98,7 +98,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{address}"
                         android:textColor="@color/white_caocao"
-                        android:textSize="@dimen/small_text_size" />
+                        android:textSize="@dimen/all_text_size_small" />
 
                     <ImageView
                         android:layout_width="wrap_content"

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white_caocao"
+        android:orientation="vertical"
+        android:splitMotionEvents="false">
+
+        <include
+            android:id="@+id/ic_title"
+            layout="@layout/title_order"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:attr/selectableItemBackground"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="@dimen/dp_4"
+                android:drawableStart="@mipmap/but_add"
+                android:gravity="center"
+                android:padding="@dimen/all_padding"
+                android:text="@string/manage_replenishment_add"
+                android:textColor="@color/red_lvzhi"
+                android:textSize="@dimen/big_text_size" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming" />
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:tabIndicatorHeight="3dp"
+            app:tabMinWidth="150dp"
+            app:tabSelectedTextColor="@color/blue"
+            app:tabTextColor="@color/black">
+
+            <android.support.design.widget.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="待确认"
+                app:tabGravity="fill" />
+
+
+            <android.support.design.widget.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="待收货"
+                app:tabGravity="fill" />
+
+
+            <android.support.design.widget.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="已入库"
+                app:tabGravity="fill" />
+        </android.support.design.widget.TabLayout>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_margin"
+            android:background="@color/gray_zhouyu" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+           />
+
+
+    </LinearLayout>
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/srl_product"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/ll_title">
+
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recycler"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="visible">
+
+
+            </android.support.v7.widget.RecyclerView>
+
+        </android.support.v4.widget.SwipeRefreshLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/ll_title"
+            android:background="@color/white_caocao"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_empty"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawablePadding="@dimen/all_margin"
+                android:drawableTop="@mipmap/nong"
+                android:gravity="center"
+                android:lineSpacingExtra="@dimen/all_padding"
+                android:text="@string/replenishment_empty_hint"
+                android:textColor="@color/gray_huanggai"
+                android:textSize="@dimen/all_text_size" />
+        </LinearLayout>
+
+    </android.support.constraint.ConstraintLayout>
+
+</layout>
\ No newline at end of file

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

@@ -26,7 +26,7 @@
             android:padding="0dp"
             android:text="@string/menu_service"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/big_text_size"
+            android:textSize="@dimen/all_sub_title_size"
             app:layout_constraintTop_toTopOf="parent">
 
         </TextView>

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

@@ -23,7 +23,8 @@
             android:id="@+id/text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black_baozheng" />
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size" />
 
     </LinearLayout>
 </layout>

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

@@ -27,6 +27,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_margin"
+            android:textStyle="bold"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size_small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/img_left" />
 
@@ -36,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_padding_left_right"
             android:text="本店"
-            android:textSize="@dimen/small_text_size"
+            android:textSize="@dimen/all_text_size_small"
             app:layout_constraintBottom_toBottomOf="@id/img_left"
             app:layout_constraintEnd_toEndOf="parent" />
 
@@ -57,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_padding"
             android:text="11-15    15：23"
-            android:textSize="@dimen/small_text_size"
+            android:textSize="@dimen/all_text_size_small_small"
             app:layout_constraintBottom_toBottomOf="@id/img_left"
             app:layout_constraintStart_toEndOf="@id/img_left" />
 

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

@@ -14,7 +14,7 @@
             android:singleLine="true"
             android:text="北京店"
             android:textColor="@color/black"
-            android:textSize="14sp" />
+            android:textSize="@dimen/all_text_size_low" />
 
 
 </RelativeLayout>

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

@@ -36,7 +36,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/big_text_size"/>
+            android:textSize="@dimen/all_sub_title_size"/>
 
 
 

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

@@ -34,7 +34,7 @@
             android:layout_centerInParent="true"
             android:text="标题"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_size"
+            android:textSize="@dimen/all_sub_title_size"
            />
 
 

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

@@ -52,7 +52,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/big_text_size"
+            android:textSize="@dimen/all_sub_title_size"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/iv_right"

app/src/main/res/values/dimens.xml

@@ -8,8 +8,13 @@
     <dimen name="all_margin_big">28dp</dimen>
     <dimen name="all_spacing">6dp</dimen>
     <dimen name="all_sub_title_size">20sp</dimen>
+    <dimen name="big_text_size">18sp</dimen>
+    <dimen name="sbig_text_size">25sp</dimen>
     <dimen name="all_text_size">16sp</dimen>
+    <dimen name="all_text_size_low">14sp</dimen>
     <dimen name="all_text_size_small">12sp</dimen>
+    <dimen name="all_text_size_small_small">10sp</dimen>
+    <dimen name="small_text_size">13sp</dimen>
     <dimen name="all_caption_size">12sp</dimen>
     <dimen name="all_body_size">14sp</dimen>
     <dimen name="all_tiny_size">9sp</dimen>
@@ -21,10 +26,7 @@
     <dimen name="all_text_size_super_big">25sp</dimen>
     <dimen name="all_margin_left">17dp</dimen>
     <dimen name="title_height">50dp</dimen>
-    <dimen name="small_text_size">13sp</dimen>
     <dimen name="all_textview_width">120dp</dimen>
-    <dimen name="big_text_size">18sp</dimen>
-    <dimen name="sbig_text_size">25sp</dimen>
     <dimen name="all_dialog_button">40dp</dimen>
     <integer name="all_top_weight">2</integer>
     <integer name="all_content_weight">25</integer>

app/src/main/res/values/strings.xml

@@ -272,7 +272,7 @@
     <string name="replenishment_add">一键补货</string>
     <string name="replenishment_order">共%s个订单</string>
     <string name="replenishment_search_hint">搜索供货商订单</string>
-    <string name="replenishment_empty_hint">没有相关订单</string>
+    <string name="replenishment_empty_hint">还没有订货单哦~</string>
     <string name="replenishment_detail_cancel">关闭</string>
     <string name="replenishment_detail_submit">定货提交</string>
     <string name="replenishment_detail_print">打印</string>
@@ -634,6 +634,8 @@
     <string name="statistics_hint">统计</string>
     <string name="statistics_menu_order">订单</string>
     <string name="statistics_menu_ms">营销</string>
+    <string name="statistics_menu_ms_recharge">充值记录</string>
+    <string name="statistics_menu_ms_usedTicket">已用优惠券</string>
     <string name="statistics_todayAmt_hint">今日销售额</string>
     <string name="statistics_todayOrder_hint">今日订单数</string>
     <string name="statistics_todayRecharge_hint">今日充值</string>
@@ -656,6 +658,8 @@
     <string name="oder_detail_cutAmt">抹零金额:</string>
     <string name="ticket_detail_date">使用时间:</string>
     <string name="ticket_detail_no">销售单号:</string>
+    <!--管理POS-->
+    <string name="manage_replenishment_add">一键补货</string>
 
 
 </resources>