Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -10,6 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     //解决问题的代码
     dexOptions {
@@ -80,6 +81,5 @@ dependencies {
     compile 'com.github.ybq:Android-SpinKit:1.1.0'
     compile 'com.youth.banner:banner:1.4.10'
     compile 'cn.jzvd:jiaozivideoplayer:6.0.0'
-    compile 'com.liulishuo.filedownloader:library:1.6.8'
     compile(name: 'zx_print_library-debug', ext: 'aar')
 }

app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java

@@ -58,7 +58,7 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
 
     @Override
     public String getPrice() {
-        return ConvertUtil.fenToYuan(skuPrice, false);
+        return ConvertUtil.fenToYuan(skuPricePay, false);
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java

@@ -977,7 +977,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public String getGoodsAmtSum() {
-        return ConvertUtil.fenToYuan(orderAuthAmt, true);
+        return ConvertUtil.fenToYuan(orderPayAmt, true);
     }
 
     @Override
@@ -987,7 +987,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public String getGoodsReduAmt() {
-        return null;
+        return ConvertUtil.fenToYuan(orderReduAmt, true);
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

@@ -34,6 +34,7 @@ import io.reactivex.schedulers.Schedulers;
 
 
 public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
+    public static MainActivity mainActivity;
     private int[] titleInts = {R.string.menu_cashier, R.string.menu_service, R.string.menu_myself};
     private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R.mipmap.icon_menu_myself_0};
     private FragmentViewAdapter mFragmentPagerAdapter;
@@ -48,6 +49,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
 
     @Override
     public void initView() {
+        mainActivity=this;
         mPresenter.initHandoverInfo();
         List<BaseFragment> fragments = new ArrayList<>();
         fragments.add(new CasherFragment());

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/ReplenishmentDetailFragment.java

+//package com.xingdata.zzdpos.ui.manage.replenishment.fragment;
+//
+//
+//import android.annotation.SuppressLint;
+//import android.graphics.drawable.Drawable;
+//import android.support.v7.widget.LinearLayoutManager;
+//import android.view.KeyEvent;
+//import android.view.View;
+//import android.widget.TextView;
+//
+//import com.blankj.utilcode.util.KeyboardUtils;
+//import com.blankj.utilcode.util.TimeUtils;
+//import com.blankj.utilcode.util.ToastUtils;
+//import com.xingdata.api.print.ZX_PrintPOS;
+//import com.xingdata.zzdhd.R;
+//import com.xingdata.zzdhd.base.BaseActivity;
+//import com.xingdata.zzdhd.base.BaseFragment;
+//import com.xingdata.zzdhd.databinding.FragmentReplenishementDetailBinding;
+//import com.xingdata.zzdhd.model.Psb;
+//import com.xingdata.zzdhd.model.Sssku;
+//import com.xingdata.zzdhd.ui.dialog.PromptDialog;
+//import com.xingdata.zzdhd.ui.login.LoginPresenter;
+//import com.xingdata.zzdhd.ui.manager.replenishment.ReplenishmentPresenter;
+//import com.xingdata.zzdhd.ui.manager.replenishment.adpter.ReplenishmentDetailAdapter;
+//import com.xingdata.zzdhd.util.ConvertUtil;
+//import com.xingdata.zzdhd.util.OnClickListener;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.regex.Matcher;
+//import java.util.regex.Pattern;
+//
+//
+///**
+// * Created by Administrator on 2017/11/24.
+// */
+//
+//public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPresenter, FragmentReplenishementDetailBinding> {
+//
+//    private ReplenishmentDetailAdapter mReplenishmentDetailAdapter;
+//    private List<Sssku> ssskuList = new ArrayList<>();
+//    private Psb mPsb;
+//    private long sumPrice;
+//    private boolean isAdd = true;
+//
+//    @Override
+//    public int getLayoutId() {
+//        return R.layout.fragment_replenishement_detail;
+//    }
+//
+//    @Override
+//    public void initView() {
+//
+//        initRecycycler();
+//        mViewBinding.btnSearch.setOnClickListener(view -> {
+//            scrollToItem(mViewBinding.etKeyword.getText().toString().trim());
+//        });
+//        mViewBinding.etKeyword.setOnKeyListener((v, keyCode, event) -> {
+//            if (keyCode == KeyEvent.KEYCODE_ENTER)
+//                scrollToItem(mViewBinding.etKeyword.getText().toString().trim());
+//            return false;
+//        });
+//        mViewBinding.btnCanel.setOnClickListener(view -> {
+//            this.pop();
+//        });
+//
+//        mViewBinding.btnEnd.setOnClickListener(view -> {
+//            if (mPsb == null || mPsb.getPsbStatus() == null) {
+//                Psb psb = new Psb();
+//                psb.setPsbType("0");
+//                psb.setSsskuList(mReplenishmentDetailAdapter.getData());
+//                mPresenter.clickReplenishmentSubmit(psb);
+//            } else {
+//                switch (mPsb.getPsbStatus()) {
+//                    case 3:
+//                        mPsb.setPsbdetailList(mReplenishmentDetailAdapter.getData());
+//                        mPresenter.clickReplenishmentUpdate(mPsb);
+//                        break;
+//                    case 1:
+//                        mPresenter.clickReplenishmentConfirm(mPsb.getPsbNo());
+//                        break;
+//                }
+//            }
+//        });
+//        mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
+//            @Override
+//            protected void myOnClickListener(View v) {
+//                ZX_PrintPOS.getInstance(mContext).printOrder(1, mPsb);
+//            }
+//        });
+//    }
+//
+//    private void initRecycycler() {
+//        mViewBinding.replenishmentRightRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+//        if (mPsb != null && mPsb.getPsbStatus() != null) {
+//            switch (mPsb.getPsbStatus()) {
+//                case 3:
+//                    mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
+//                    break;
+//                case 1:
+//                    mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
+//                    break;
+//                case 0:
+//                    mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
+//                    break;
+//                default:
+//                    mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
+//                    break;
+//            }
+//        } else {
+//            mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
+//        }
+//        mReplenishmentDetailAdapter.setEmptyView(getEmptyView());
+//        mViewBinding.replenishmentRightRecycler.setAdapter(mReplenishmentDetailAdapter);
+//        mReplenishmentDetailAdapter.setOnItemLongClickListener((adapter, view, position) -> {
+//            PromptDialog delDialog = new PromptDialog();
+//            delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View view) {
+//                    mReplenishmentDetailAdapter.getData().remove(position);
+//                    mReplenishmentDetailAdapter.notifyDataSetChanged();
+//                    delDialog.dismiss();
+//                }
+//            }, new View.OnClickListener() {
+//                @Override
+//                public void onClick(View view) {
+//                    delDialog.dismiss();
+//                }
+//            }).setCancelables(false).show((BaseActivity) mContext);
+//            return false;
+//        });
+//        mReplenishmentDetailAdapter.setmUpdatePriceListener(new ReplenishmentDetailAdapter.UpdatePriceListener() {
+//            @Override
+//            public void updatePrice(long amt) {
+//                sumPrice = sumPrice + amt;
+//                mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(sumPrice, true));
+//            }
+//        });
+//        initData();
+//    }
+//
+//    private void initData() {
+//        if (isAdd) {
+//            mViewBinding.setIsShowSupplier(false);
+//        } else {
+//            mViewBinding.setIsShowSupplier(true);
+//            mViewBinding.setSupplierName(mPsb.getOutChannelNameabcn());
+//            mViewBinding.setSupplierAddress(mPsb.getOutCityProvName() + mPsb.getOutCityName() + mPsb.getOutCityCountyName() + mPsb.getOutCityAddress());
+//            mViewBinding.setSupplierTel(mPsb.getOutContactMob());
+//            mViewBinding.setDate(TimeUtils.millis2String(mPsb.getCreateTime()));
+//            mViewBinding.setNo(mPsb.getPsbNo());
+//        }
+//        if (this.ssskuList.size() != 0) {
+//            mViewBinding.setSumNum(ssskuList.size() + "种");
+//            mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(getSumPrice(), true));
+//        } else {
+//            mViewBinding.setSumNum("0个");
+//            mViewBinding.setFinallyPrice("￥0.00");
+//        }
+//        mViewBinding.setShopOderName(LoginPresenter.loginReturnBean.getOperName());
+//        mViewBinding.setShopName(LoginPresenter.loginReturnBean.getShopNameAbcn());
+//        mViewBinding.setShopAddress(LoginPresenter.loginReturnBean.getCityProvName() + LoginPresenter.loginReturnBean.getCityName() + LoginPresenter.loginReturnBean.getCityCountyName() + LoginPresenter.loginReturnBean.getCityAddress());
+//        mViewBinding.setShopTel(LoginPresenter.loginReturnBean.getContactTel());
+//
+//        if (mPsb != null && mPsb.getPsbStatus() != null) {
+//            switch (mPsb.getPsbStatus()) {
+//                case 3:
+//                    mViewBinding.btnEnd.setText("修改订单");
+//                    mViewBinding.btnPrint.setVisibility(View.VISIBLE);
+//                    break;
+//                case 1:
+//                    mViewBinding.btnEnd.setText("确认收货");
+//                    mViewBinding.btnPrint.setVisibility(View.VISIBLE);
+//                    break;
+//                case 0:
+//                    mViewBinding.btnEnd.setVisibility(View.GONE);
+//                    mViewBinding.btnPrint.setVisibility(View.VISIBLE);
+//                    break;
+//                default:
+//                    break;
+//            }
+//        }
+//
+//    }
+//
+//    public long getSumPrice() {
+//        sumPrice = 0;
+//        for (Sssku sssku : mReplenishmentDetailAdapter.getData()) {
+//            sumPrice = sumPrice + sssku.getSellSumAmt();
+//        }
+//        return sumPrice;
+//    }
+//
+//
+//    public void setSsskuList(List<Sssku> ssskuList) {
+//        this.ssskuList = ssskuList;
+//        isAdd = true;
+//        this.mPsb = null;
+//    }
+//
+//    public void setPsb(Psb psb) {
+//        this.mPsb = psb;
+//        this.ssskuList = psb.getSsskuList();
+//        isAdd = false;
+//    }
+//
+//
+//    @Override
+//    public void onDestroy() {
+//        mPresenter.isAllowFragment(true);
+//        super.onDestroy();
+//    }
+//
+//    /**
+//     * 获取空页面
+//     *
+//     *
+//     * @return 空页面
+//     */
+//    protected View getEmptyView() {
+//        @SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+//        Drawable drawable=getResources().getDrawable(R.mipmap.bg_no_null);
+//        drawable.setBounds(0,0,200,200);
+//
+//        TextView textView=((TextView) view.findViewById(R.id.tv_empty));
+//        textView.setCompoundDrawablesRelative(null,drawable,null,null);
+//        textView.setText(R.string.replenishment_detail_full);
+//        textView.setTextColor(getResources().getColor(R.color.black));
+//        return view;
+//    }
+//    private void scrollToItem(String string) {
+//
+//        if (string.length() == 0) {
+//            ToastUtils.showShort("请输入搜索内容");
+//            return;
+//        }
+//        Pattern pattern = Pattern.compile(string, Pattern.CASE_INSENSITIVE);
+//
+//        for (int i = 0; i < mReplenishmentDetailAdapter.getData().size(); i++) {
+//            Matcher matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuBarcode() + "");
+//            if (matcher.find()) {
+//                ((LinearLayoutManager) mViewBinding.replenishmentRightRecycler.getLayoutManager()).scrollToPositionWithOffset(i, 0);
+//                ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
+//                KeyboardUtils.hideSoftInput(getActivity());
+//                return;
+//            }
+//            matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuAb() + "");
+//            if (matcher.find()) {
+//                ((LinearLayoutManager) mViewBinding.replenishmentRightRecycler.getLayoutManager()).scrollToPositionWithOffset(i, 0);
+//                ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
+//                KeyboardUtils.hideSoftInput(getActivity());
+//                return;
+//            }
+//            matcher = pattern.matcher((mReplenishmentDetailAdapter.getData().get(i)).getSpuName() + "");
+//            if (matcher.find()) {
+//                ((LinearLayoutManager) mViewBinding.replenishmentRightRecycler.getLayoutManager()).scrollToPositionWithOffset(i, 0);
+//                ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
+//                KeyboardUtils.hideSoftInput(getActivity());
+//                return;
+//            }
+//        }
+//
+//        ToastUtils.showShort("没有找到相关货品");
+//    }
+//}

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/settle/SettlePresenter.java

 package com.xingdata.zzdpos.ui.settle;
 
 
+import android.content.Context;
+
 import com.blankj.utilcode.util.StringUtils;
+import com.xingdata.api.print.ZX_PrintPOS;
+import com.xingdata.zzdpos.App;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.db.DBFactory;
@@ -11,6 +15,7 @@ import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.Vip;
+import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import java.util.ArrayList;
@@ -301,6 +306,7 @@ public class SettlePresenter extends SettleContract.Presenter {
     private void paySucc(Saleorder saleorder) {
         mView.showPaySuccFragment(saleorder);
         this.updateHandover(MainPresenter.handoverInfo);
+        ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, saleorder);
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.statistics;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.databinding.DataBindingUtil;
+import android.graphics.Paint;
 import android.util.TimeUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +12,7 @@ import android.view.View;
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.ToastUtils;
 import com.google.gson.Gson;
+import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityStatisticsDetailBinding;
@@ -23,6 +25,7 @@ import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -128,6 +131,8 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(), false));
         viewOrderDetailBinding.setOperName(mSaleorder.getOperName());
         viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt() + "");
+
+
         if (mSaleorder.getCutAmt() == null || mSaleorder.getCutAmt() == 0) {
             viewOrderDetailBinding.setCutAmtShow(false);
         } else {
@@ -145,7 +150,14 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 itemSettleSaledetailBinding.tvCount.setText(saledetail.getCnt());
                 itemSettleSaledetailBinding.tvPrice.setText("￥" + saledetail.getPrice());
                 itemSettleSaledetailBinding.tvName.setText(saledetail.getName());
-//              itemSettleSaledetailBinding.tvInitialPrice.setText(saledetail.getpr);
+
+                if (saledetail.isDiscount()) {
+                    itemSettleSaledetailBinding.tvInitialPrice.setText(ConvertUtil.fenToYuan(saledetail.getSkuPrice(), true));
+                    itemSettleSaledetailBinding.tvInitialPrice.setVisibility(View.VISIBLE);
+                    itemSettleSaledetailBinding.tvInitialPrice.setPaintFlags(itemSettleSaledetailBinding.tvInitialPrice.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+                } else {
+                    itemSettleSaledetailBinding.tvInitialPrice.setVisibility(View.GONE);
+                }
                 viewOrderDetailBinding.llGoodsList.addView(view);
 
             }
@@ -169,6 +181,14 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
                 }
             });
+            mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
+                @Override
+                protected void myOnClickListener(View v) {
+                    ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, mSaleorder);
+                    mViewBinding.btnPrint.setEnabled(false);
+                    mViewBinding.btnPrint.setText("已打印");
+                }
+            });
         }
     }
 

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/drawable/shape_gray_round_rectangle_stroke.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="@dimen/all_shape_radius"/>
+    <corners android:radius="@dimen/all_radius"/>
     <stroke
         android:width="@dimen/edit_border"
         android:color="@color/gary"/>

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/activity_statistics_detail.xml

@@ -53,7 +53,7 @@
             app:layout_constraintBottom_toBottomOf="parent">
 
             <Button
-                android:id="@+id/btn_cancel"
+                android:id="@+id/btn_print"
                 style="@style/button_passive"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"

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

@@ -32,22 +32,10 @@
             android:id="@+id/ic_title"
             layout="@layout/title"/>
 
-        <Button
-            android:id="@+id/btn_add"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_margin="@dimen/all_margin"
-            android:background="@color/red_guanyu"
-            android:onClick="@{OnClickListener}"
-            android:text="确定"
-            android:textColor="@color/white"
-            android:textSize="@dimen/et_textsize"/>
 
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/btn_add"
             android:layout_below="@+id/ic_title">
 
             <LinearLayout
@@ -680,8 +668,8 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="@dimen/all_padding_left_right"
-                        android:gravity="right"
                         android:layout_weight="2"
+                        android:gravity="right"
                         android:text="个月"
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"/>
@@ -692,6 +680,23 @@
                     android:layout_height="@dimen/all_line_width"
                     android:background="@color/gray1"></View>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:background="@color/white"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:id="@+id/btn_add"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/all_margin"
+                        android:background="@color/red_guanyu"
+                        android:onClick="@{OnClickListener}"
+                        android:text="确定"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/et_textsize"/>
+                </LinearLayout>
+
             </LinearLayout>
         </ScrollView>
 

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_replenishement_detail.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="sumNum"
+            type="String" />
+
+        <variable
+            name="finallyPrice"
+            type="String" />
+
+        <variable
+            name="isShowSupplier"
+            type="Boolean" />
+
+        <variable
+            name="shopOderName"
+            type="String" />
+
+        <variable
+            name="shopName"
+            type="String" />
+
+        <variable
+            name="shopAddress"
+            type="String" />
+
+        <variable
+            name="shopTel"
+            type="String" />
+
+
+        <variable
+            name="supplierName"
+            type="String" />
+
+        <variable
+            name="supplierAddress"
+            type="String" />
+
+        <variable
+            name="supplierTel"
+            type="String" />
+
+        <variable
+            name="date"
+            type="String" />
+
+        <variable
+            name="no"
+            type="String" />
+    </data>
+
+    <android.support.constraint.ConstraintLayout 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"
+        android:splitMotionEvents="false">
+
+        <!--<android.support.v7.widget.CardView-->
+            <!--android:id="@+id/f_left"-->
+            <!--android:layout_width="0dp"-->
+            <!--android:layout_height="0dp"-->
+            <!--android:layout_marginEnd="@dimen/all_padding"-->
+            <!--android:background="@color/white"-->
+            <!--app:cardElevation="@dimen/all_padding"-->
+            <!--app:layout_constraintBottom_toBottomOf="parent"-->
+            <!--app:layout_constraintHorizontal_weight="10"-->
+            <!--app:layout_constraintLeft_toLeftOf="parent"-->
+            <!--app:layout_constraintRight_toLeftOf="@+id/f_right"-->
+            <!--app:layout_constraintTop_toTopOf="parent"-->
+            <!--app:layout_constraintVertical_weight="25">-->
+
+            <!--<android.support.constraint.ConstraintLayout-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="match_parent"-->
+                <!--android:background="@color/white">-->
+
+
+                <!--<TextView-->
+                    <!--android:id="@+id/tv_supplier_title"-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_margin="@dimen/all_margin"-->
+                    <!--android:text="供货方"-->
+                    <!--android:textColor="@color/black"-->
+                    <!--android:textSize="@dimen/all_text_size_big"-->
+                    <!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"-->
+                    <!--app:layout_constraintStart_toStartOf="parent"-->
+                    <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+                <!--<View-->
+                    <!--android:id="@+id/view_line_left_1"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="@dimen/all_slight_line_width"-->
+                    <!--android:layout_margin="@dimen/all_margin"-->
+                    <!--android:background="@color/line"-->
+                    <!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/tv_supplier_title" />-->
+
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_supplier_name"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_margin="@dimen/all_margin"-->
+                    <!--android:gravity="center_vertical"-->
+                    <!--android:orientation="horizontal"-->
+                    <!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"-->
+                    <!--app:layout_constraintEnd_toEndOf="parent"-->
+                    <!--app:layout_constraintStart_toStartOf="parent"-->
+                    <!--app:layout_constraintTop_toTopOf="@id/view_line_left_1">-->
+
+                    <!--<ImageView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:src="@mipmap/icon_stores" />-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{supplierName}"-->
+                        <!--android:textColor="@color/black" />-->
+                <!--</LinearLayout>-->
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_supplier_address"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:gravity="center_vertical"-->
+
+                    <!--android:orientation="horizontal"-->
+                    <!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"-->
+                    <!--app:layout_constraintEnd_toEndOf="@id/ll_supplier_name"-->
+                    <!--app:layout_constraintStart_toStartOf="@id/ll_supplier_name"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/ll_supplier_name">-->
+
+                    <!--<ImageView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:src="@mipmap/icon_address" />-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{supplierAddress}"-->
+                        <!--android:textColor="@color/black" />-->
+                <!--</LinearLayout>-->
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_supplier_phone"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:gravity="center_vertical"-->
+
+                    <!--android:orientation="horizontal"-->
+                    <!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"-->
+                    <!--app:layout_constraintEnd_toEndOf="@id/ll_supplier_name"-->
+                    <!--app:layout_constraintStart_toStartOf="@id/ll_supplier_name"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/ll_supplier_address">-->
+
+                    <!--<ImageView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:src="@mipmap/icon_telephone" />-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{supplierTel}"-->
+                        <!--android:textColor="@color/black" />-->
+                <!--</LinearLayout>-->
+
+
+                <!--<TextView-->
+                    <!--android:id="@+id/tv_shop_title"-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_marginEnd="@dimen/all_margin"-->
+                    <!--android:layout_marginStart="@dimen/all_margin"-->
+                    <!--android:layout_marginTop="@dimen/all_margin_big"-->
+                    <!--android:text="定货方"-->
+                    <!--android:textColor="@color/black"-->
+                    <!--android:textSize="@dimen/all_text_size_big"-->
+                    <!--app:layout_constraintStart_toStartOf="parent"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/ll_supplier_phone"-->
+                    <!--app:layout_goneMarginTop="@dimen/all_margin" />-->
+
+                <!--<View-->
+                    <!--android:id="@+id/view_line_left_2"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="@dimen/all_slight_line_width"-->
+                    <!--android:layout_margin="@dimen/all_margin"-->
+                    <!--android:background="@color/line"-->
+
+                    <!--app:layout_constraintTop_toBottomOf="@id/tv_shop_title" />-->
+
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_shop_name"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_margin="@dimen/all_margin"-->
+                    <!--android:gravity="center_vertical"-->
+                    <!--android:orientation="horizontal"-->
+                    <!--app:layout_constraintEnd_toEndOf="parent"-->
+                    <!--app:layout_constraintStart_toStartOf="parent"-->
+                    <!--app:layout_constraintTop_toTopOf="@id/view_line_left_2">-->
+
+                    <!--<ImageView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:src="@mipmap/icon_stores" />-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{shopName}"-->
+                        <!--android:textColor="@color/black" />-->
+                <!--</LinearLayout>-->
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_shop_address"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+
+                    <!--android:gravity="center_vertical"-->
+                    <!--android:orientation="horizontal"-->
+                    <!--app:layout_constraintEnd_toEndOf="@id/ll_shop_name"-->
+                    <!--app:layout_constraintStart_toStartOf="@id/ll_shop_name"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/ll_shop_name">-->
+
+                    <!--<ImageView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:src="@mipmap/icon_address" />-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{shopAddress}"-->
+                        <!--android:textColor="@color/black" />-->
+                <!--</LinearLayout>-->
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_shop_phone"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+
+                    <!--android:gravity="center_vertical"-->
+                    <!--android:orientation="horizontal"-->
+                    <!--app:layout_constraintEnd_toEndOf="@id/ll_shop_name"-->
+                    <!--app:layout_constraintStart_toStartOf="@id/ll_shop_name"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/ll_shop_address">-->
+
+                    <!--<ImageView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:src="@mipmap/icon_telephone" />-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{shopTel}"-->
+                        <!--android:textColor="@color/black" />-->
+                <!--</LinearLayout>-->
+
+                <!--<View-->
+                    <!--android:id="@+id/view_line_left_3"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="@dimen/all_slight_line_width"-->
+                    <!--android:layout_margin="@dimen/all_margin"-->
+                    <!--android:background="@color/line"-->
+
+                    <!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/ll_shop_phone" />-->
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_date"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_marginTop="@dimen/all_margin"-->
+                    <!--android:gravity="center_vertical"-->
+                    <!--android:orientation="horizontal"-->
+                    <!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"-->
+                    <!--app:layout_constraintEnd_toEndOf="@id/ll_shop_name"-->
+                    <!--app:layout_constraintStart_toStartOf="@id/ll_shop_name"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/view_line_left_3">-->
+
+                    <!--<ImageView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:src="@mipmap/icon_dates_green" />-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{date}"-->
+                        <!--android:textColor="@color/black" />-->
+                <!--</LinearLayout>-->
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_no"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:gravity="center_vertical"-->
+
+                    <!--android:orientation="horizontal"-->
+                    <!--android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"-->
+                    <!--app:layout_constraintEnd_toEndOf="@id/ll_shop_name"-->
+                    <!--app:layout_constraintStart_toStartOf="@id/ll_shop_name"-->
+                    <!--app:layout_constraintTop_toBottomOf="@id/ll_date">-->
+
+                    <!--<ImageView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:src="@mipmap/icon_no_green" />-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{no}"-->
+                        <!--android:textColor="@color/black" />-->
+                <!--</LinearLayout>-->
+
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_result"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_marginBottom="@dimen/all_margin"-->
+                    <!--android:gravity="center"-->
+                    <!--android:orientation="horizontal"-->
+                    <!--app:layout_constraintBottom_toBottomOf="parent"-->
+                    <!--app:layout_constraintEnd_toEndOf="parent"-->
+                    <!--app:layout_constraintHorizontal_weight="1"-->
+                    <!--app:layout_constraintStart_toEndOf="@id/ll_num">-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:gravity="center"-->
+                        <!--android:paddingBottom="@dimen/dp_4"-->
+                        <!--android:paddingLeft="@dimen/all_padding"-->
+                        <!--android:paddingRight="@dimen/all_padding"-->
+                        <!--android:paddingTop="@dimen/dp_4"-->
+                        <!--android:text="@{finallyPrice}"-->
+                        <!--android:textColor="@color/reddeep"-->
+                        <!--android:textSize="@dimen/all_text_size_big" />-->
+                <!--</LinearLayout>-->
+
+
+                <!--<LinearLayout-->
+                    <!--android:id="@+id/ll_num"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:gravity="center"-->
+                    <!--android:orientation="horizontal"-->
+                    <!--app:layout_constraintBottom_toBottomOf="@id/ll_result"-->
+                    <!--app:layout_constraintEnd_toStartOf="@id/ll_result"-->
+                    <!--app:layout_constraintHorizontal_weight="1"-->
+                    <!--app:layout_constraintStart_toStartOf="parent"-->
+                    <!--app:layout_constraintTop_toTopOf="@id/ll_result">-->
+
+                    <!--<TextView-->
+                        <!--android:layout_width="wrap_content"-->
+                        <!--android:layout_height="wrap_content"-->
+                        <!--android:padding="@dimen/dp_4"-->
+                        <!--android:text="@{sumNum}"-->
+                        <!--android:textColor="@color/reddeep"-->
+                        <!--android:textSize="@dimen/all_text_size_big"-->
+                        <!--android:textStyle="bold" />-->
+
+
+                <!--</LinearLayout>-->
+
+                <!--<TextView-->
+                    <!--android:id="@+id/tv_result_hint"-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_margin="@dimen/all_margin"-->
+                    <!--android:text="金额"-->
+                    <!--android:textColor="@color/black"-->
+                    <!--app:layout_constraintBottom_toTopOf="@id/ll_result"-->
+                    <!--app:layout_constraintEnd_toEndOf="@id/ll_result"-->
+                    <!--app:layout_constraintStart_toStartOf="@id/ll_result" />-->
+
+                <!--<TextView-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_margin="@dimen/all_margin"-->
+                    <!--android:text="种类"-->
+                    <!--android:textColor="@color/black"-->
+                    <!--app:layout_constraintBottom_toBottomOf="@id/tv_result_hint"-->
+                    <!--app:layout_constraintEnd_toEndOf="@id/ll_num"-->
+                    <!--app:layout_constraintStart_toStartOf="@id/ll_num"-->
+                    <!--app:layout_constraintTop_toTopOf="@id/tv_result_hint" />-->
+
+                <!--<View-->
+                    <!--android:id="@+id/view_line_left_bottom"-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="@dimen/all_margin"-->
+                    <!--android:layout_marginBottom="100dp"-->
+                    <!--android:background="@color/lyt_main_bg"-->
+                    <!--app:layout_constraintBottom_toBottomOf="parent" />-->
+            <!--</android.support.constraint.ConstraintLayout>-->
+        <!--</android.support.v7.widget.CardView>-->
+
+
+        <!--<android.support.constraint.ConstraintLayout-->
+            <!--android:id="@+id/f_right"-->
+            <!--android:layout_width="0dp"-->
+            <!--android:layout_height="0dp"-->
+            <!--android:background="@color/white"-->
+            <!--android:splitMotionEvents="false"-->
+            <!--app:layout_constraintBottom_toBottomOf="parent"-->
+            <!--app:layout_constraintHorizontal_weight="22"-->
+            <!--app:layout_constraintLeft_toRightOf="@+id/f_left"-->
+            <!--app:layout_constraintRight_toRightOf="parent"-->
+            <!--app:layout_constraintTop_toTopOf="parent"-->
+            <!--app:layout_constraintVertical_weight="25">-->
+
+
+            <!--<EditText-->
+                <!--android:id="@+id/et_keyword"-->
+                <!--style="@style/dialog_edit"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="0dp"-->
+                <!--android:layout_marginEnd="@dimen/all_margin"-->
+                <!--android:drawableEnd="@mipmap/ic_scan"-->
+                <!--android:hint="@string/inventory_add_et_hint"-->
+                <!--android:inputType="number"-->
+                <!--android:maxLength="19"-->
+                <!--android:minWidth="@dimen/fragment_store_et_min_width"-->
+                <!--android:paddingEnd="@dimen/fragment_detail_padding_end"-->
+                <!--android:paddingStart="@dimen/all_margin"-->
+                <!--android:singleLine="true"-->
+                <!--app:layout_constraintBottom_toBottomOf="@id/btn_search"-->
+                <!--app:layout_constraintRight_toRightOf="@id/btn_search"-->
+                <!--app:layout_constraintTop_toTopOf="@id/btn_search" />-->
+
+            <!--<ImageButton-->
+                <!--android:id="@+id/btn_search"-->
+                <!--android:layout_width="@dimen/fragment_store_btn_width"-->
+                <!--android:layout_height="@dimen/fragment_store_et_height"-->
+                <!--android:layout_marginEnd="@dimen/all_margin"-->
+                <!--android:layout_marginTop="@dimen/all_margin"-->
+                <!--android:background="@drawable/shape_store_btn_search_select"-->
+                <!--android:contentDescription="@string/store_search"-->
+                <!--android:scaleType="centerInside"-->
+                <!--android:src="@mipmap/store_search"-->
+                <!--app:layout_constraintEnd_toEndOf="parent"-->
+                <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+            <!--<TextView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_margin="@dimen/all_margin"-->
+                <!--android:text="@string/replenishment_detail_title"-->
+                <!--android:textColor="@color/black"-->
+                <!--android:textSize="@dimen/all_sub_title_size"-->
+                <!--app:layout_constraintBottom_toBottomOf="@id/et_keyword"-->
+                <!--app:layout_constraintStart_toStartOf="parent"-->
+                <!--app:layout_constraintTop_toTopOf="@id/et_keyword" />-->
+
+            <!--<View-->
+                <!--android:id="@+id/view_line"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="@dimen/all_slight_line_width"-->
+                <!--android:layout_marginLeft="@dimen/all_padding"-->
+                <!--android:layout_marginRight="@dimen/all_margin"-->
+                <!--android:layout_marginTop="@dimen/all_padding"-->
+                <!--android:background="@color/line"-->
+
+                <!--app:layout_constraintTop_toBottomOf="@id/et_keyword" />-->
+
+            <!--<android.support.v7.widget.RecyclerView-->
+                <!--android:id="@+id/replenishment_right_recycler"-->
+                <!--android:layout_width="0dp"-->
+                <!--android:layout_height="0dp"-->
+                <!--android:layout_marginTop="@dimen/view_line_L1"-->
+                <!--android:splitMotionEvents="false"-->
+                <!--app:layout_constraintBottom_toTopOf="@id/cl_btn"-->
+                <!--app:layout_constraintEnd_toEndOf="parent"-->
+                <!--app:layout_constraintStart_toStartOf="parent"-->
+                <!--app:layout_constraintTop_toBottomOf="@id/view_line" />-->
+
+            <!--<android.support.constraint.ConstraintLayout-->
+                <!--android:id="@+id/cl_btn"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="100dp"-->
+                <!--app:layout_constraintBottom_toBottomOf="parent"-->
+                <!--app:layout_constraintTop_toBottomOf="@id/replenishment_right_recycler">-->
+
+                <!--<View-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="@dimen/all_slight_line_width"-->
+                    <!--android:layout_marginLeft="@dimen/all_padding"-->
+                    <!--android:layout_marginRight="@dimen/all_margin"-->
+                    <!--android:layout_marginTop="@dimen/view_line_L1"-->
+                    <!--android:background="@color/line"-->
+
+                    <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+                <!--<Button-->
+                    <!--android:id="@+id/btn_end"-->
+                    <!--style="@style/button_positive"-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_marginBottom="@dimen/all_margin"-->
+                    <!--android:layout_marginLeft="@dimen/all_margin"-->
+                    <!--android:layout_marginRight="@dimen/all_margin"-->
+                    <!--android:stateListAnimator="@null"-->
+                    <!--android:text="@string/replenishment_detail_submit"-->
+                    <!--app:layout_constraintBottom_toBottomOf="parent"-->
+                    <!--app:layout_constraintEnd_toEndOf="parent" />-->
+
+                <!--<Button-->
+                    <!--android:id="@+id/btn_print"-->
+                    <!--style="@style/button_positive"-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_marginBottom="@dimen/all_margin"-->
+                    <!--android:layout_marginLeft="@dimen/all_margin"-->
+                    <!--android:layout_marginRight="@dimen/all_margin"-->
+                    <!--android:stateListAnimator="@null"-->
+                    <!--android:text="@string/replenishment_detail_print"-->
+                    <!--android:visibility="gone"-->
+                    <!--app:layout_constraintBottom_toBottomOf="parent"-->
+                    <!--app:layout_constraintStart_toStartOf="parent" />-->
+
+                <!--<Button-->
+                    <!--android:id="@+id/btn_canel"-->
+                    <!--style="@style/button_passive"-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_marginBottom="@dimen/all_margin"-->
+                    <!--android:layout_marginEnd="@dimen/all_margin_big"-->
+                    <!--android:stateListAnimator="@null"-->
+                    <!--android:text="@string/replenishment_detail_cancel"-->
+                    <!--app:layout_constraintBottom_toBottomOf="parent"-->
+                    <!--app:layout_constraintEnd_toStartOf="@id/btn_end"-->
+                    <!--app:layout_goneMarginLeft="@dimen/all_margin"-->
+                    <!--app:layout_goneMarginRight="@dimen/all_margin" />-->
+            <!--</android.support.constraint.ConstraintLayout>-->
+        <!--</android.support.constraint.ConstraintLayout>-->
+
+
+    </android.support.constraint.ConstraintLayout>
+</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_replenishment.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+
+        <variable
+            name="shopName"
+            type="String" />
+
+        <variable
+            name="supplierName"
+            type="String" />
+
+        <variable
+            name="supplierAddress"
+            type="String" />
+
+        <variable
+            name="no"
+            type="String" />
+
+        <variable
+            name="date"
+            type="String" />
+
+        <variable
+            name="amt"
+            type="String" />
+
+        <variable
+            name="num"
+            type="String" />
+
+        <variable
+            name="status"
+            type="String" />
+    </data>
+
+    <android.support.constraint.ConstraintLayout 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="wrap_content"
+        android:padding="@dimen/all_padding"
+        android:background="@color/white">
+
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+        <LinearLayout
+            android:id="@+id/ll_boss"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:padding="@dimen/dp_4"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/icon_stores" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/all_padding"
+                android:text="@{shopName}"
+                android:textColor="@color/black"
+                android:textSize="@dimen/all_text_size" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/all_padding"
+            android:paddingBottom="@dimen/dp_4"
+            android:paddingEnd="@dimen/all_padding"
+            android:paddingStart="@dimen/all_padding"
+            android:paddingTop="@dimen/dp_4"
+            android:text="@{status}"
+            android:textColor="@color/white"
+            app:layout_constraintBottom_toBottomOf="@id/ll_boss"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/ll_boss" />
+
+        <LinearLayout
+            android:id="@+id/ll_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:padding="@dimen/dp_4"
+            app:layout_constraintTop_toBottomOf="@id/ll_boss">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/icon_dates_green" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="@dimen/dp_4"
+                android:paddingStart="@dimen/all_padding"
+                android:paddingTop="@dimen/dp_4"
+                android:text="@{date}"
+                android:textColor="@color/black"
+                android:textSize="@dimen/all_text_size" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_no"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:padding="@dimen/dp_4"
+            app:layout_constraintTop_toBottomOf="@id/ll_date">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/icon_no_green" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/all_padding"
+                android:text="@{no}"
+                android:textColor="@color/black"
+                android:textSize="@dimen/all_text_size" />
+
+
+        </LinearLayout>
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/all_padding"
+            app:cardElevation="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ll_no">
+
+            <android.support.constraint.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/gray_zhouyu"
+                android:padding="@dimen/all_padding">
+
+                <TextView
+                    android:id="@+id/tv_supplier_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="供货方"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/big_text_size"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/view_line_L1"
+                    android:layout_marginTop="@dimen/dp_4"
+                    android:background="@color/line_bg"
+                    android:elevation="@dimen/view_line_L050"
+                    app:layout_constraintEnd_toEndOf="@id/guideline_right"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_supplier_title" />
+
+                <LinearLayout
+                    android:id="@+id/ll_supplier_info"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/all_padding"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    app:layout_constraintEnd_toEndOf="@id/guideline_right"
+                    app:layout_constraintStart_toStartOf="@id/tv_supplier_title"
+                    app:layout_constraintTop_toBottomOf="@id/tv_supplier_title">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/icon_stores" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_4"
+                        android:text="@{supplierName}"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/all_text_size" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    app:layout_constraintEnd_toEndOf="@id/guideline_right"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/ll_supplier_info">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/icon_address" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_4"
+                        android:text="@{supplierAddress}"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/all_text_size" />
+                </LinearLayout>
+
+                <android.support.constraint.Guideline
+                    android:id="@+id/guideline_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintGuide_percent="0.66" />
+
+                <LinearLayout
+                    android:id="@+id/ll_cut"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/all_padding"
+                    android:layout_marginRight="@dimen/all_padding"
+                    android:layout_marginTop="@dimen/all_margin"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@id/guideline_right"
+                    app:layout_constraintTop_toTopOf="@id/tv_supplier_title">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{num}"
+                        android:textColor="@color/reddeep"
+                        android:textSize="@dimen/all_text_size_big" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_4"
+                        android:text="件"
+                        android:textColor="@color/black" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_price"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/all_padding"
+                    android:layout_marginTop="@dimen/all_margin"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    app:layout_constraintEnd_toEndOf="@id/ll_cut"
+                    app:layout_constraintStart_toStartOf="@id/guideline_right"
+                    app:layout_constraintTop_toBottomOf="@id/ll_cut">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_4"
+                        android:text="￥"
+                        android:textColor="@color/reddeep" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{amt}"
+                        android:textColor="@color/reddeep"
+                        android:textSize="@dimen/all_text_size_big" />
+
+
+                </LinearLayout>
+            </android.support.constraint.ConstraintLayout>
+        </android.support.v7.widget.CardView>
+
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+
+    </data>
+
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/all_padding"
+        android:layout_marginEnd="@dimen/all_margin"
+        android:layout_marginStart="@dimen/all_padding"
+        android:layout_marginBottom="@dimen/all_padding"
+        app:cardCornerRadius="@dimen/all_shape_radius"
+        app:cardElevation="1dp">
+
+        <!--<android.support.constraint.ConstraintLayout-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:padding="@dimen/all_padding"-->
+            <!--android:background="@drawable/black_border">-->
+
+            <!--<com.facebook.drawee.view.SimpleDraweeView-->
+                <!--android:id="@+id/img_goods"-->
+                <!--android:layout_width="130dp"-->
+                <!--android:layout_height="130dp"-->
+                <!--app:placeholderImage="@mipmap/icon_goods_default" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_goods_name"-->
+                <!--style="@style/other_select_blacktext_style"-->
+                <!--android:layout_width="0dp"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginEnd="@dimen/all_margin"-->
+                <!--android:layout_marginTop="@dimen/all_margin"-->
+                <!--android:layout_marginStart="@dimen/all_padding"-->
+                <!--android:text="贝斯克莱因和美妖精生日巧克力蛋糕"-->
+                <!--app:layout_constraintEnd_toEndOf="@id/guideline_center"-->
+                <!--app:layout_constraintStart_toEndOf="@id/img_goods"-->
+                <!--app:layout_constraintTop_toTopOf="@id/img_goods" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_goods_code_hint"-->
+                <!--style="@style/other_select_smallstyle"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginTop="@dimen/all_padding"-->
+                <!--android:text="条码："-->
+                <!--app:layout_constraintStart_toStartOf="@id/tv_goods_name"-->
+                <!--app:layout_constraintTop_toBottomOf="@id/tv_goods_name" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_goods_code"-->
+                <!--style="@style/other_select_smallstyle"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="0dp"-->
+                <!--android:text="12783163981789"-->
+                <!--app:layout_constraintBottom_toBottomOf="@id/tv_goods_code_hint"-->
+                <!--app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"-->
+                <!--app:layout_constraintTop_toTopOf="@id/tv_goods_code_hint" />-->
+
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_goods_size"-->
+                <!--style="@style/store_product_size"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:text="规格"-->
+                <!--app:layout_constraintBottom_toBottomOf="@id/tv_goods_price"-->
+                <!--app:layout_constraintStart_toStartOf="@id/tv_goods_name"-->
+                <!--app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_goods_price"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginBottom="@dimen/all_margin"-->
+                <!--android:layout_marginEnd="@dimen/all_margin"-->
+                <!--android:text="999"-->
+                <!--android:textColor="@color/store_product_price"-->
+                <!--android:textSize="@dimen/fragment_store_product_price"-->
+                <!--app:layout_constraintBottom_toBottomOf="@id/img_goods"-->
+                <!--app:layout_constraintEnd_toEndOf="@id/guideline_center" />-->
+
+            <!--<TextView-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginBottom="2dp"-->
+                <!--android:text="@string/money_rmb"-->
+                <!--android:textColor="@color/store_product_price"-->
+                <!--android:textSize="@dimen/item_superpurchase_textsize_big"-->
+                <!--app:layout_constraintBottom_toBottomOf="@id/tv_goods_price"-->
+                <!--app:layout_constraintEnd_toStartOf="@+id/tv_goods_price" />-->
+
+
+            <!--<View-->
+                <!--android:layout_width="@dimen/all_line_width"-->
+                <!--android:layout_height="0dp"-->
+                <!--android:layout_marginBottom="@dimen/all_margin"-->
+                <!--android:layout_marginTop="@dimen/all_margin"-->
+                <!--android:background="@color/lyt_main_bg"-->
+                <!--app:layout_constraintBottom_toBottomOf="@id/img_goods"-->
+                <!--app:layout_constraintEnd_toEndOf="@id/guideline_center"-->
+                <!--app:layout_constraintTop_toTopOf="@id/img_goods" />-->
+
+            <!--<LinearLayout-->
+                <!--android:id="@+id/linearLayout"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="@dimen/dialog_cart_item_button_height"-->
+                <!--android:layout_margin="@dimen/all_margin"-->
+                <!--android:gravity="center"-->
+                <!--android:orientation="horizontal"-->
+
+                <!--app:layout_constraintBottom_toBottomOf="parent"-->
+                <!--app:layout_constraintEnd_toEndOf="parent"-->
+                <!--app:layout_constraintStart_toStartOf="@id/guideline_center">-->
+
+                <!--<ImageButton-->
+                    <!--android:id="@+id/btn_down"-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:layout_marginEnd="@dimen/all_margin"-->
+                    <!--android:layout_weight="1"-->
+                    <!--android:background="@color/white"-->
+                    <!--android:src="@mipmap/but_cut"-->
+                    <!--tools:layout_editor_absoluteX="602dp"-->
+                    <!--tools:layout_editor_absoluteY="97dp" />-->
+
+                <!--<EditText-->
+                    <!--android:id="@+id/et_count"-->
+                    <!--android:layout_width="100dp"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:layout_weight="1"-->
+                    <!--android:background="@drawable/hint_border"-->
+                    <!--android:gravity="center"-->
+                    <!--android:hint="1"-->
+                    <!--android:inputType="number"-->
+                    <!--android:maxLength="4"-->
+                    <!--android:saveEnabled="false"-->
+                    <!--tools:layout_editor_absoluteX="540dp"-->
+                    <!--tools:layout_editor_absoluteY="192dp" />-->
+
+                <!--<ImageButton-->
+                    <!--android:id="@+id/btn_up"-->
+                    <!--android:layout_width="wrap_content"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:layout_marginStart="@dimen/all_margin"-->
+                    <!--android:layout_weight="1"-->
+                    <!--android:background="@color/white"-->
+                    <!--android:src="@mipmap/but_plus"-->
+                    <!--tools:layout_editor_absoluteX="666dp"-->
+                    <!--tools:layout_editor_absoluteY="97dp" />-->
+            <!--</LinearLayout>-->
+
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_stock_hint"-->
+                <!--android:layout_width="0dp"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:gravity="right"-->
+                <!--android:text="库存："-->
+                <!--android:textColor="@color/black"-->
+                <!--android:textSize="@dimen/big_text_size"-->
+                <!--app:layout_constraintBottom_toTopOf="@id/linearLayout"-->
+                <!--app:layout_constraintEnd_toStartOf="@id/tv_stock"-->
+                <!--app:layout_constraintHorizontal_weight="1"-->
+                <!--app:layout_constraintStart_toStartOf="@id/guideline_center"-->
+                <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_stock"-->
+                <!--android:layout_width="0dp"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:text="0个"-->
+                <!--android:textColor="@color/black"-->
+                <!--android:textSize="@dimen/big_text_size"-->
+                <!--app:layout_constraintBottom_toTopOf="@id/linearLayout"-->
+                <!--app:layout_constraintEnd_toStartOf="@id/tv_traffic_hint"-->
+                <!--app:layout_constraintHorizontal_weight="1"-->
+                <!--app:layout_constraintStart_toEndOf="@id/tv_stock_hint"-->
+                <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_traffic_hint"-->
+                <!--android:layout_width="0dp"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:gravity="right"-->
+                <!--android:text="在途："-->
+                <!--android:textColor="@color/black"-->
+                <!--android:textSize="@dimen/big_text_size"-->
+                <!--app:layout_constraintBottom_toTopOf="@id/linearLayout"-->
+                <!--app:layout_constraintEnd_toStartOf="@id/tv_traffic"-->
+                <!--app:layout_constraintHorizontal_weight="1"-->
+                <!--app:layout_constraintStart_toEndOf="@id/tv_stock"-->
+                <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/tv_traffic"-->
+                <!--android:layout_width="0dp"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:text="0个"-->
+                <!--android:textColor="@color/black"-->
+                <!--android:textSize="@dimen/big_text_size"-->
+                <!--app:layout_constraintBottom_toTopOf="@id/linearLayout"-->
+                <!--app:layout_constraintEnd_toEndOf="parent"-->
+                <!--app:layout_constraintHorizontal_weight="1"-->
+                <!--app:layout_constraintStart_toEndOf="@id/tv_traffic_hint"-->
+                <!--app:layout_constraintTop_toTopOf="parent" />-->
+
+
+            <!--<android.support.constraint.Guideline-->
+                <!--android:id="@+id/guideline_center"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:orientation="vertical"-->
+                <!--app:layout_constraintGuide_percent="0.60" />-->
+
+        <!--</android.support.constraint.ConstraintLayout>-->
+    </android.support.v7.widget.CardView>
+
+
+</layout>
\ No newline at end of file

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

@@ -28,7 +28,7 @@
                 android:layout_weight="2.3">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@mipmap/return_ticket_one"/>
 
@@ -97,7 +97,7 @@
                 android:layout_weight="1">
 
                 <ImageView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@mipmap/return_ticket_two"
                     />

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>
@@ -637,6 +637,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>
@@ -659,6 +661,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>