Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -114,6 +114,10 @@
             android:name=".ui.manage.sssku.SsskuActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity
+            android:name=".ui.manage.inventory.InventoryActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -758,6 +758,21 @@ public final class ApiFactory {
                     ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
         }
+
+        /**
+         * 库存盘点记录查询接口
+         *
+         * @param pageNulmber
+         * @param pageSize
+         * @return
+         */
+        public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber,
+                                                                                 int pageSize
+) {
+            return Api.getInstance().service.querCsList(pageNulmber, pageSize).onErrorReturn(new
+                    ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread());
+        }
     }
 
     public static class Notice {

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -181,6 +181,10 @@ interface ApiService {
             ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
                                                           endDate);
 
+    @POST(C.URL.CS.query)
+    Observable<HttpMessage<Pager<Cs>>> querCsList(@Query("pageNumber") int pageNum, @Query
+            ("pageSize") int pageSize);
+
     @POST(C.URL.NOTICE.query)
     Observable<HttpMessage<Pager<Notice>>> queryNotice(@Query("pageNumber") int pageNum, @Query
             ("pageSize") int pageSize);

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

@@ -4,6 +4,7 @@ import com.xingdata.api.print.entity.BaseGoodPrint;
 import com.xingdata.api.print.entity.BaseOrderPrint;
 import com.xingdata.zzdpos.db.DB;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
+import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -255,6 +256,14 @@ public class Cs implements BaseOrderPrint {
         return baseGoodPrints;
     }
 
+    public String getOperName() {
+        if (operName == null) {
+            operName = DB.getInstance().get(MainPresenter.class).where(Oper.class)
+                    .equalTo("operId", getCreateOperId())
+                    .findFirst().getOperName();
+        }
+        return operName;
+    }
     @Override
     public String getDRAW_URL() {
         return null;

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java

+package com.xingdata.zzdpos.ui.manage.inventory;
+
+import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.FragmentUtils;
+import com.blankj.utilcode.util.KeyboardUtils;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.databinding.ActivityInventoryBinding;
+import com.xingdata.zzdpos.model.Cs;
+import com.xingdata.zzdpos.model.CsDetail;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Sssku;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+
+import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryAddFragment;
+import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryFragment;
+import com.xingdata.zzdpos.ui.manage.manageMenu.ManageDateFragment;
+import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment;
+
+import java.util.List;
+
+
+public class InventoryActivity extends BaseActivity<InventoryPresenter, ActivityInventoryBinding> implements InventoryContract.View {
+    private InventoryFragment mInventoryFragment = new InventoryFragment();
+    private ManageDateFragment mManageDateFragment = new ManageDateFragment();
+    private InventoryAddFragment mInventoryAddFragment = new InventoryAddFragment();
+    //    private InventoryDetailDialog mInventoryDetailDialog = new InventoryDetailDialog();
+    LoadingDialog mLoadingDialog = new LoadingDialog();
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_inventory;
+    }
+
+    @Override
+    public void initView() {
+        loadRootFragment(R.id.f_bottom, mInventoryFragment, true, false);
+
+    }
+
+
+    @Override
+    public void showDateFragment() {
+        start(mManageDateFragment);
+    }
+
+    @Override
+    public void addInventoryDetailItem(CsDetail csDetail, Sssku sssku) {
+        mInventoryAddFragment.addInventoryDetailItem(csDetail, sssku);
+    }
+
+    @Override
+    public void addInventoryGoodsItem(List<Sssku> ssskuList) {
+        mInventoryAddFragment.addInventoryGoodsItem(ssskuList);
+    }
+
+    @Override
+    public void addInventoryGoodsItem(Sssku sssku) {
+        mInventoryAddFragment.addInventoryGoodsItem(sssku);
+    }
+
+    @Override
+    public void showInventoryDetailDialog(Cs cs) {
+
+//        mInventoryDetailDialog.setData(cs).show(this);
+    }
+
+    @Override
+    public void loadCs(Pager<Cs> csList) {
+        mInventoryFragment.setData(csList, csList.isFirstPage());
+    }
+
+    @Override
+    public void loadCs(Pager<Cs> csList, long start, long end) {
+        if (mManageDateFragment.isAdded()) {
+            mManageDateFragment.pop();
+        }
+        mInventoryFragment.setDate(start, end);
+        mInventoryFragment.setData(csList, csList.isFirstPage());
+    }
+
+    @Override
+    public void disInventoryDetailFragment(Boolean idChange) {
+        if (idChange) {
+//            mInventoryAddFragment.pop();
+//            mPresenter.refreshCs();
+        } else {
+//            mInventoryAddFragment.pop();
+        }
+
+    }
+
+
+    @Override
+    public void setInventoryCount(int count) {
+        mInventoryFragment.setCount(count);
+    }
+
+    @Override
+    public void setInventoryCount(String s) {
+        mInventoryFragment.setCount(s);
+    }
+
+    @Override
+    public void openInventoryAddFragment(Cs cs) {
+        mInventoryAddFragment.setCs(cs);
+        start(mInventoryAddFragment);
+    }
+
+
+    @Override
+    public void showDateAlert(Boolean f) {
+//        mInventoryFragment.showDateAlert(f);
+    }
+
+    @Override
+    protected void onPause() {
+        KeyboardUtils.hideSoftInput(this);
+        super.onPause();
+    }
+
+    @Override
+    public void searchGoodsSuc() {
+//      mInventoryAddFragment.searchGoodsSuc();
+    }
+
+    @Override
+    public void isShowLoading(Boolean is) {
+        if (is) {
+            mLoadingDialog.show((BaseActivity) mContext);
+        } else {
+            if (mLoadingDialog.isShowing) {
+                mLoadingDialog.dismiss();
+            }
+        }
+    }
+}
+
+

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryContract.java

+package com.xingdata.zzdpos.ui.manage.inventory;
+
+
+import com.xingdata.zzdpos.base.BasePresenter;
+import com.xingdata.zzdpos.base.BaseView;
+import com.xingdata.zzdpos.model.Cs;
+import com.xingdata.zzdpos.model.CsDetail;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.model.Sssku;
+
+import java.util.List;
+
+/**
+ * Created by Eurus on 2017/11/23.
+ */
+
+public interface InventoryContract {
+
+    interface View extends BaseView {
+        /**
+         * 添加盘库   搜索商品成功
+         */
+        void searchGoodsSuc();
+
+        void isShowLoading(Boolean is);
+
+        /**
+         * 跳转日期搜索
+         */
+        void showDateFragment();
+
+        /**
+         * 设置盘库记录条目数量
+         */
+        void setInventoryCount(int count);
+
+        /**
+         * 设置盘库记录条目数量
+         */
+        void setInventoryCount(String s);
+
+        /**
+         * 关闭添加盘库详情界面
+         */
+        void disInventoryDetailFragment(Boolean isChange);
+
+        /**
+         * 添加左侧详情商品条目
+         */
+        void addInventoryDetailItem(CsDetail csDetail, Sssku sssku);
+
+        /**
+         * 添加商品条目
+         */
+        void addInventoryGoodsItem(List<Sssku> ssskuList);
+
+        void addInventoryGoodsItem(Sssku sssku);
+//________________________________________
+
+        /**
+         * 展示记录详情Dialog
+         */
+
+        void showInventoryDetailDialog(Cs csDetailList);
+
+        /**
+         * 加载列表
+         */
+        void loadCs(Pager<Cs> csList);
+
+        /**
+         * 加载列表
+         */
+        void loadCs(Pager<Cs> csList, long start, long end);
+
+
+        /**
+         * 跳转盘库页
+         */
+        void openInventoryAddFragment(Cs cs);
+
+
+        /**
+         * 盘库页面-展示日期警告
+         */
+        void showDateAlert(Boolean f);
+    }
+
+    abstract class Presenter extends BasePresenter<View> {
+        /**
+         * 跳转日期搜索
+         */
+        public abstract void clickDate();
+
+        /**
+         * 盘库添加页面 - 取消退出这次盘库的记录
+         *
+         * @param cs 盘库记录
+         */
+        public abstract void cancelInventoryAdd(Cs cs);
+
+        /**
+         * 盘库添加页面 - 结束盘库记录
+         */
+        public abstract void exitInventoryAdd();
+
+
+        /**
+         * 盘库添加页面-确认盘库明细
+         */
+        public abstract void clickOkCsDetail(Sssku ssku, Cs cs);
+
+        /**
+         * 根据条形码获取商品
+         *
+         * @param barcode 条形码
+         */
+        public abstract void getProductByBarcode(String barcode);
+
+        /**
+         * 盘库列表页面 - 删除列表里的记录
+         *
+         * @param cs 盘库记录
+         */
+        public abstract void delInventoryItem(Cs cs);
+
+
+        /**
+         * 盘库列表页面 - 点击列表里的记录
+         *
+         * @param cs 盘库记录
+         */
+        public abstract void clickInventoryItem(Cs cs);
+
+        /**
+         * 盘库列表页面-检查日期合法性
+         *
+         * @param dateStart 起始时间
+         * @param dateEnd   终止时间
+         */
+        public abstract void inspectDate(String dateStart, String dateEnd);
+
+        /**
+         * 盘库列表页面-点击开始盘库
+         */
+        public abstract void clickStartInventory();
+
+        /**
+         * 获取盘库列表
+         */
+        public abstract void getInventoryList(int pageNum, long start, long end);
+
+
+        /**
+         * 获取盘库列表
+         */
+        public abstract void getInventoryList(long start, long end, int PageNumber, int pageSize);
+
+
+        /**
+         * 获取盘库列表
+         */
+        public abstract void getInventoryList(int PageNumber);
+
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryPresenter.java

+package com.xingdata.zzdpos.ui.manage.inventory;
+
+
+import com.blankj.utilcode.util.TimeUtils;
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.api.ApiFactory;
+
+import com.xingdata.zzdpos.db.DB;
+import com.xingdata.zzdpos.db.DBFactory;
+import com.xingdata.zzdpos.model.Cs;
+import com.xingdata.zzdpos.model.CsDetail;
+import com.xingdata.zzdpos.model.Sssku;
+import com.xingdata.zzdpos.ui.main.MainPresenter;
+import com.xingdata.zzdpos.util.StringUtil;
+
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import io.reactivex.Observable;
+import io.realm.RealmQuery;
+
+import static com.xingdata.zzdpos.db.DBFactory.getList;
+
+public class InventoryPresenter extends InventoryContract.Presenter {
+
+    private int nowPageSize = 20;
+    private long start;
+    private long end;
+
+
+    @Override
+    public void onAttached() {
+
+    }
+
+
+    @Override
+    public void clickOkCsDetail(Sssku sssku, Cs mCs) {
+        CsDetail csDetail = new CsDetail();
+        csDetail.setSpuName(sssku.getSpuName());
+        csDetail.setSkuId(sssku.getSkuId());
+        csDetail.setSpuBarcode(sssku.getSpuBarcode());
+        csDetail.setSkuCnt(sssku.getSkuStock());
+        csDetail.setSpuUnitName(sssku.getSpuUnitName());
+        csDetail.setCsCnt((long) sssku.getInventoryCut());
+        csDetail.setChannelMapId(mCs.getChannelMapId().longValue());
+        csDetail.setCsNo(mCs.getCsNo());
+        csDetail.setSkuId(sssku.getSkuId());
+        csDetail.setOpMapId(mCs.getOpMapId().longValue());
+        if (csDetail.getCsCnt() == csDetail.getSkuCnt()) {
+            csDetail.setCsResultFlag(0);
+        } else if (csDetail.getCsCnt() > csDetail.getSkuCnt()) {
+            csDetail.setCsResultFlag(1);
+        } else {
+            csDetail.setCsResultFlag(2);
+        }
+        mView.isShowLoading(true);
+        ApiFactory.CsDetail.addCsDetail(csDetail).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(detail -> {
+                    mView.addInventoryDetailItem(detail, sssku);
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+
+    }
+
+    /**
+     * 根据条形码获取商品
+     *
+     * @param barcode 条形码
+     */
+    public void getProductByBarcode(String barcode) {
+        mView.isShowLoading(true);
+        mCompositeDisposable.add(
+                queryProductsByScan(barcode).subscribe(ssskus -> {
+                    mView.isShowLoading(false);
+                    mView.searchGoodsSuc();
+                    if (ssskus.size() > 1) {
+                        mView.addInventoryGoodsItem(ssskus);
+                    } else if (ssskus.size() == 1) {
+                        mView.addInventoryGoodsItem(ssskus.get(0));
+                    } else {
+                        ToastUtils.showShort("没有此商品");
+                    }
+                })
+        );
+    }
+
+    /**
+     * 扫码查询商品
+     *
+     * @param barcode 扫描出的条形码
+     * @return 商品信息
+     */
+    public static Observable<List<Sssku>> queryProductsByScan(String barcode) {
+        RealmQuery<Sssku> query = DB.getInstance().get(MainPresenter.class).where(Sssku.class);
+        query.equalTo("spuBarcode", StringUtil.strToLong(barcode)).equalTo("skuStatus", 0);
+        return Observable.just(query.findAll())
+                .flatMap(ssskus -> Observable.just(getList(ssskus)));
+    }
+
+    @Override
+    public void clickInventoryItem(Cs cs) {
+        mView.isShowLoading(true);
+        ApiFactory.Cs.getCsDetail(cs.getId()).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(cslist -> {
+                    mView.showInventoryDetailDialog(cslist);
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+
+    }
+
+    @Override
+    public void delInventoryItem(Cs cs) {
+        mView.isShowLoading(true);
+        ApiFactory.Cs.delCsDetail(cs.getId(), cs.getCsNo()).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(object -> {
+
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
+    @Override
+    public void clickDate() {
+        mView.showDateFragment();
+    }
+
+    @Override
+    public void cancelInventoryAdd(Cs cs) {
+        mView.isShowLoading(true);
+        ApiFactory.Cs.delCsDetail(cs.getId(), cs.getCsNo()).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(object -> {
+                    mView.disInventoryDetailFragment(false);
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
+    @Override
+    public void exitInventoryAdd() {
+        mView.disInventoryDetailFragment(true);
+    }
+
+    @Override
+    public void inspectDate(String dateStart, String dateEnd) {
+        long longStart = TimeUtils.string2Millis(dateStart, new SimpleDateFormat(StringUtil.defaultDatePattern));
+        long longEnd = TimeUtils.string2Millis(dateEnd, new SimpleDateFormat(StringUtil.defaultDatePattern)) + 86400000L;
+        if (longStart > longEnd) {
+            ToastUtils.showShort("日期不符合区间");
+            mView.showDateAlert(true);
+        } else {
+            mView.showDateAlert(false);
+            getInventoryList(longStart, longEnd, 1, nowPageSize);
+        }
+
+    }
+
+    @Override
+    public void clickStartInventory() {
+        mView.isShowLoading(true);
+        ApiFactory.Cs.addCs().doFinally(() -> {
+            mView.isShowLoading(false);
+        }).subscribe(cs -> {
+            if (cs.getCreateTime() == null) {
+                cs.setCreateTime(System.currentTimeMillis());
+            }
+            mView.openInventoryAddFragment(cs);
+        }, throwable -> {
+            ToastUtils.showShort(throwable.getMessage());
+        });
+
+    }
+
+    @Override
+    public void getInventoryList(int pageNum, long start, long end) {
+        mView.isShowLoading(true);
+        ApiFactory.Cs.querCsList(pageNum, nowPageSize, start, end).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(csPager -> {
+                    //判断是否能加载更多
+                    mView.loadCs(csPager, start, end);
+                    mView.setInventoryCount(com.blankj.utilcode.util.TimeUtils.millis2String(start, new SimpleDateFormat(StringUtil.defaultDatePattern)) + " ~ " +
+                            com.blankj.utilcode.util.TimeUtils.millis2String(end, new SimpleDateFormat(StringUtil.defaultDatePattern)));
+
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+
+    }
+
+    @Override
+    public void getInventoryList(long startdate, long enddate, int pageNumber, int pageSize) {
+        this.start = startdate;
+        this.end = enddate;
+        this.nowPageSize = pageSize;
+        getInventoryList(pageNumber, start, end);
+    }
+
+    @Override
+    public void getInventoryList(int PageNumber) {
+        mView.isShowLoading(true);
+        ApiFactory.Cs.querCsList(PageNumber, nowPageSize).doFinally(() -> mView.isShowLoading(false))
+                .subscribe(csPager -> {
+                    //判断是否能加载更多
+                    mView.loadCs(csPager);
+                    mView.setInventoryCount(csPager.getTotalRow());
+                }, throwable -> {
+                    ToastUtils.showShort(throwable.getMessage());
+                });
+    }
+
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryAdapter.java

+package com.xingdata.zzdpos.ui.manage.inventory.adpter;
+
+
+import android.graphics.drawable.Drawable;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.blankj.utilcode.util.TimeUtils;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemInventoryBinding;
+import com.xingdata.zzdpos.model.Cs;
+
+import java.util.List;
+
+
+public class InventoryAdapter extends BaseAdapter<Cs, ItemInventoryBinding> {
+
+
+    public InventoryAdapter(@Nullable List<Cs> data) {
+        super(R.layout.item_inventory, data);
+
+    }
+
+
+    @Override
+    protected void convert(ItemInventoryBinding mViewBinding, Cs item) {
+        Drawable drawable = mContext.getResources().getDrawable(R.mipmap.icon_time);
+        drawable.setBounds(0, 0, (int) mViewBinding.tvDate.getTextSize(), (int) mViewBinding.tvDate.getTextSize());
+
+        mViewBinding.tvDate.setCompoundDrawablesRelative(drawable, null, null, null);
+        mViewBinding.tvDate.setCompoundDrawablePadding(10);
+        mViewBinding.tvName.setText(item.getOperName());
+        mViewBinding.tvPhone.setText(item.getOper_mobile());
+        mViewBinding.tvDate.setText(TimeUtils.millis2String(item.getCreateTime()) + "");
+        mViewBinding.tvNum.setText(item.getCount() + "");
+        switch (item.getCsResultFlag()) {
+            case 0:
+                mViewBinding.tvResult.setText("相符");
+                mViewBinding.imgInventory.setImageResource(R.mipmap.ic_consistent);
+                break;
+            case 1:
+                mViewBinding.tvResult.setText("不相符");
+                mViewBinding.imgInventory.setImageResource(R.mipmap.ic_not_consistent);
+                break;
+        }
+
+
+    }
+
+    @Override
+    protected View getItemView(int layoutResId, ViewGroup parent) {
+        return super.getItemView(layoutResId, parent);
+    }
+
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryCartAdapter.java

+package com.xingdata.zzdpos.ui.manage.inventory.adpter;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.base.BaseViewHolder;
+import com.xingdata.zzdpos.databinding.ItemInventoryCartBinding;
+import com.xingdata.zzdpos.databinding.ItemStoreSaledetailBinding;
+import com.xingdata.zzdpos.model.CsDetail;
+import com.xingdata.zzdpos.model.Saledetail;
+import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+import java.util.List;
+
+public class InventoryCartAdapter extends BaseAdapter<CsDetail, ItemInventoryCartBinding> {
+
+    public InventoryCartAdapter(List<CsDetail> csDetailList) {
+        super(R.layout.item_inventory_cart, csDetailList);
+    }
+
+    private CartDialog.OnCountChangeListener mOnCountChangeListener;
+
+    public void setOnCountChangeListener(CartDialog.OnCountChangeListener onCountChangeListener) {
+        this.mOnCountChangeListener = onCountChangeListener;
+    }
+
+
+    @Override
+    protected void convert(ItemInventoryCartBinding mViewBinding, CsDetail item) {
+        mViewBinding.tvName.setText(item.getSpuName());
+
+
+
+
+        mViewBinding.setCount(item.getCsCnt());
+
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, CsDetail item) {
+        super.convert(helper, item);
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryDetailAdapter.java

+//package com.xingdata.zzdpos.ui.manage.inventory.adpter;
+//
+//
+//import android.support.annotation.Nullable;
+//import android.view.View;
+//import android.view.ViewGroup;
+//
+//
+//import java.util.List;
+//
+//public class InventoryDetailAdapter extends BaseAdapter<CsDetail, ItemInventoryLeftBinding> {
+//    private int count = 1;
+//
+//    public InventoryDetailAdapter(@Nullable List<CsDetail> data) {
+//        super(R.layout.item_inventory_left, data);
+//
+//    }
+//
+//
+//    @Override
+//    protected void convert(ItemInventoryLeftBinding mViewBinding, CsDetail item) {
+//
+//        mViewBinding.tvName.setText(item.getSpuName());
+//        mViewBinding.tvStockCount.setText(item.getSkuCnt() + "");
+//        mViewBinding.tvResultCount.setText(item.getCsCnt() + "");
+//        switch (item.getCsResultFlag()) {
+//            case 0://相等
+//                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_equal);
+//                break;
+//            case 1://盘多
+//                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_offer_more);
+//                break;
+//            case 2://盘少
+//                mViewBinding.imgResult.setImageResource(R.mipmap.icon_mark_offer_less);
+//                break;
+//        }
+//    }
+//
+//    @Override
+//    protected View getItemView(int layoutResId, ViewGroup parent) {
+//        return super.getItemView(layoutResId, parent);
+//    }
+//
+//
+//}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryGoodsAdapter.java

+package com.xingdata.zzdpos.ui.manage.inventory.adpter;
+
+
+import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.base.BaseViewHolder;
+import com.xingdata.zzdpos.databinding.ItemInventoryGoodsBinding;
+import com.xingdata.zzdpos.model.Sssku;
+import com.xingdata.zzdpos.util.ConvertUtil;
+
+
+import java.util.List;
+
+public class InventoryGoodsAdapter extends BaseAdapter<Sssku, ItemInventoryGoodsBinding> {
+    private int count ;
+
+    public InventoryGoodsAdapter(@Nullable List<Sssku> data) {
+        super(R.layout.item_inventory_goods, data);
+
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, Sssku item) {
+        if (item.getInventoryCut() == 0) {
+            item.setInventoryCut(1);
+        }
+        count=item.getInventoryCut();
+        helper.setText(R.id.et_count, item.getInventoryCut() + "");
+        helper.setText(R.id.tv_goods_name, item.getSpuName())
+                .setText(R.id.tv_goods_code, item.getSpuBarcode() + "")
+                .setText(R.id.tv_goods_size, "规格/" + item.getSpuUnitName())
+                .setText(R.id.tv_goods_price, ConvertUtil.fenToYuan(item.getSkuRetailPrice1(), false))
+                .setText(R.id.tv_stock, item.getSkuStock() + "");
+
+        ((SimpleDraweeView) helper.getView(R.id.img_goods)).setImageURI(item.getSpuImg());
+        helper.getView(R.id.btn_up).setOnClickListener(v -> {
+            if (count > 0 && count < 9999) {
+                helper.setText(R.id.et_count, String.valueOf(++count));
+                item.setInventoryCut(count);
+            }
+        });
+        helper.getView(R.id.btn_down).setOnClickListener(v -> {
+            if (count == 1) {
+                item.setInventoryCut(count);
+
+
+                return;
+            }
+            if (count > 1 && count < 100) {
+                helper.setText(R.id.et_count, String.valueOf(--count));
+                item.setInventoryCut(count);
+            }
+        });
+        ((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) {
+                count = ((EditText) helper.getView(R.id.et_count)).getText().toString().length() == 0 ? 1 : Integer.valueOf(((EditText) helper.getView(R.id.et_count)).getText().toString());
+                item.setInventoryCut(count);
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+            }
+        }));
+        helper.addOnClickListener(R.id.btn_ok);
+
+        super.convert(helper, item);
+    }
+
+    @Override
+    protected void convert(ItemInventoryGoodsBinding mViewBinding, Sssku item) {
+
+    }
+
+    @Override
+    protected View getItemView(int layoutResId, ViewGroup parent) {
+        return super.getItemView(layoutResId, parent);
+    }
+
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/CsCartDialog.java

+package com.xingdata.zzdpos.ui.manage.inventory.dialog;
+
+import android.support.design.widget.BottomSheetBehavior;
+import android.support.v7.widget.LinearLayoutManager;
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseSheetDialog;
+import com.xingdata.zzdpos.databinding.DialogStoreCartBinding;
+import com.xingdata.zzdpos.model.CsDetail;
+import com.xingdata.zzdpos.model.Saledetail;
+import com.xingdata.zzdpos.model.Saleorder;
+import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryCartAdapter;
+import com.xingdata.zzdpos.ui.store.StorePresenter;
+import com.xingdata.zzdpos.ui.store.adapter.SaledetailAdapter;
+
+import java.util.List;
+
+
+public class CsCartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartBinding> {
+
+
+    private List<CsDetail> mCsDetails;
+
+    public interface OnCountChangeListener {
+        void onCountChange(Saledetail saledetail, int value);
+    }
+
+    @Override
+    protected boolean isTransparentBackground() {
+        return true;
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_store_cart;
+    }
+
+    @Override
+    public void initView() {
+        ;
+
+        // init C
+        InventoryCartAdapter mInventoryCartAdapter = new InventoryCartAdapter(mCsDetails);
+        mViewBinding.rlCart.setAdapter(mInventoryCartAdapter);
+        mViewBinding.rlCart.setLayoutManager(new LinearLayoutManager(mContext));
+
+
+        // set Other listener
+        mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle());
+        mViewBinding.tvClear.setOnClickListener(view -> mPresenter.clearCart());
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        //默认全屏展开
+        mBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+    }
+
+
+    public CsCartDialog setSaledetails(List<CsDetail> csDetailList) {
+        this.mCsDetails = csDetailList;
+        return this;
+    }
+
+    @Override
+    public void onDestroyView() {
+        mPresenter.exitCartDialog();
+        super.onDestroyView();
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/InventoryDetailDialog.java

+//package com.xingdata.zzdpos.ui.manage.inventory.dialog;
+//
+//import android.support.v7.widget.LinearLayoutManager;
+//import android.view.View;
+//
+//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.BaseDialog;
+//import com.xingdata.zzdhd.databinding.DialogInventoryDetailBinding;
+//import com.xingdata.zzdhd.model.Cs;
+//import com.xingdata.zzdhd.model.CsDetail;
+//import com.xingdata.zzdhd.ui.manager.inventory.InventoryPresenter;
+//import com.xingdata.zzdhd.ui.manager.inventory.adpter.InventoryDetailAdapter;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * Created by Administrator on 2017/12/4.
+// */
+//
+//public class InventoryDetailDialog extends BaseDialog<InventoryPresenter, DialogInventoryDetailBinding> {
+//    private InventoryDetailAdapter mInventoryDetailAdapter;
+//    private List<CsDetail> csDetails = new ArrayList<>();
+//    private Cs cs;
+//    private long mExitTime=0;
+//
+//
+//    @Override
+//    public int getLayoutId() {
+//        return R.layout.dialog_inventory_detail;
+//    }
+//
+//    @Override
+//    public void initView() {
+//        initLeftRecycler();
+//        if (cs == null) {
+//            ToastUtils.showShort("未获取到相关数据");
+//            return;
+//        }
+//        setBtnName("取消", "打印清单");
+//        mViewBinding.setOperName(cs.getOperName());
+//        mViewBinding.setDate(TimeUtils.millis2String(cs.getCreateTime()));
+//        mViewBinding.setSumNum(cs.getCount() + "");
+//        switch (cs.getCsResultFlag()) {
+//            case 0:
+//                mViewBinding.setFinallyResult("相符");
+//                break;
+//            case 1:
+//                mViewBinding.setFinallyResult("不相符");
+//                break;
+//        }
+//        csDetails.clear();
+//        csDetails.addAll(cs.getCsdetailList());
+//        mInventoryDetailAdapter.notifyDataSetChanged();
+//        getDialog().setCanceledOnTouchOutside(false);
+//
+//    }
+//
+//    @Override
+//    protected boolean isShowTitle() {
+//        return false;
+//    }
+//
+//    public InventoryDetailDialog setData(Cs csDetailList) {
+//        this.cs = csDetailList;
+//        return this;
+//    }
+//
+//    private void initLeftRecycler() {
+//        mViewBinding.replenishmentLeftRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+//        mInventoryDetailAdapter = new InventoryDetailAdapter(csDetails);
+//        mViewBinding.replenishmentLeftRecycler.setAdapter(mInventoryDetailAdapter);
+//    }
+//
+//    @Override
+//    public void onConfirmClick(View view) {
+//        if ((System.currentTimeMillis() - mExitTime) > 2000) {
+//            ZX_PrintPOS.getInstance(mContext).printInventory(1,cs);
+//        } else {
+//
+//        }
+//        super.onConfirmClick(view);
+//    }
+//}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java

+package com.xingdata.zzdpos.ui.manage.inventory.fragment;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+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.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentInventoryAddBinding;
+import com.xingdata.zzdpos.model.Cs;
+import com.xingdata.zzdpos.model.CsDetail;
+import com.xingdata.zzdpos.model.Saledetail;
+import com.xingdata.zzdpos.model.Sssku;
+import com.xingdata.zzdpos.ui.dialog.PromptDialog;
+import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
+import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryGoodsAdapter;
+import com.xingdata.zzdpos.ui.manage.inventory.dialog.CsCartDialog;
+import com.xingdata.zzdpos.util.OnClickListener;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Created by Administrator on 2017/11/24.
+ */
+
+public class InventoryAddFragment extends BaseFragment<InventoryPresenter, FragmentInventoryAddBinding> {
+
+    private List<Sssku> topCsList = new ArrayList<>();
+    private InventoryGoodsAdapter mInventoryGoodsAdapter;
+    private CsCartDialog mCartDialog = new CsCartDialog();
+    /**
+     * 当前购物车信息
+     */
+    private List<CsDetail> bottomCsList = new ArrayList<>();
+    //    private InventoryDetailAdapter mInventoryDetailAdapter;
+    private Cs mCs;
+    private boolean isResult = true;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_inventory_add;
+    }
+
+    @Override
+    public void initView() {
+
+        initRecycler();
+        mViewBinding.setCartCount(0);
+
+        mViewBinding.icTitle.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                if (i == EditorInfo.IME_ACTION_SEARCH) {
+                    mPresenter.getProductByBarcode(mViewBinding.icTitle.edTitle.getText().toString());
+                    hideSoftInput();
+                }
+                return false;
+            }
+        });
+        mViewBinding.ivCart.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                if (bottomCsList.size() == 0) {
+                    return;
+                }
+                mCartDialog.setSaledetails(bottomCsList).show((BaseActivity) getActivity());
+            }
+        });
+//        mViewBinding.btnEnd.setOnClickListener(view -> {
+//            mPresenter.exitInventoryAdd();
+//        });
+//        mViewBinding.btnDel.setOnClickListener(view -> {
+//            {
+//                PromptDialog promptDialog = new PromptDialog();
+//                promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "请确认删除本次盘库记录").setClick(view1 -> {
+//                    mPresenter.cancelInventoryAdd(mCs);
+//                    promptDialog.dismiss();
+//                }, view1 -> {
+//                    promptDialog.dismiss();
+//                }).setCancelables(false).show((BaseActivity) mContext);
+//
+//            }
+//
+//        });
+//        mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
+//            @Override
+//            protected void myOnClickListener(View v) {
+//                ZX_PrintPOS.getInstance(mContext).printInventory(1, mCs);
+//            }
+//        });
+
+    }
+
+
+    private void initRecycler() {
+        mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mInventoryGoodsAdapter = new InventoryGoodsAdapter(topCsList);
+        mInventoryGoodsAdapter.setOnItemLongClickListener((adapter, view, position) -> {
+            PromptDialog delDialog = new PromptDialog();
+            delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    adapter.getData().remove(position);
+                    adapter.notifyDataSetChanged();
+                    delDialog.dismiss();
+                }
+            }, new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    delDialog.dismiss();
+                }
+            }).setCancelables(false).show((BaseActivity) mContext);
+            return false;
+        });
+        mInventoryGoodsAdapter.setOnItemChildClickListener((adapter, view, position) -> {
+            switch (view.getId()) {
+                case R.id.btn_ok:
+                    PromptDialog promptDialog = new PromptDialog();
+                    promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "请确认添加记录").setClick(view1 -> {
+                        mPresenter.clickOkCsDetail(mInventoryGoodsAdapter.getData().get(position), mCs);
+                        promptDialog.dismiss();
+                    }, view1 -> {
+                        promptDialog.dismiss();
+                    }).setCancelables(false).show((BaseActivity) mContext);
+
+                    break;
+
+            }
+
+        });
+        mViewBinding.recyclerView.setAdapter(mInventoryGoodsAdapter);
+
+    }
+
+
+    public void addInventoryGoodsItem(List<Sssku> list) {
+        for (Sssku s : list) {
+            if (topCsList.contains(s)) {
+                ToastUtils.showShort("商品已存在");
+            } else {
+                if (bottomCsList.contains(s)) {
+                    ToastUtils.showShort("商品已盘点");
+                } else {
+                    topCsList.add(s);
+                }
+            }
+        }
+        mInventoryGoodsAdapter.notifyDataSetChanged();
+    }
+
+
+    public void addInventoryGoodsItem(Sssku sssku) {
+        if (!topCsList.contains(sssku)) {
+            if (bottomCsList.contains(sssku)) {
+                ToastUtils.showShort("商品已盘点");
+            } else {
+                topCsList.add(sssku);
+            }
+
+        } else {
+            ToastUtils.showShort("商品已存在");
+
+        }
+
+        mInventoryGoodsAdapter.notifyDataSetChanged();
+    }
+
+    public void addInventoryDetailItem(CsDetail csDetail, Sssku sssku) {
+        if (csDetail.getCsResultFlag() != 0) {
+            isResult = false;
+        }
+        bottomCsList.add(csDetail);
+
+        mViewBinding.setCartCount(getSumNum());
+        topCsList.remove(sssku);
+        mInventoryGoodsAdapter.notifyDataSetChanged();
+        if (isResult) {
+            mViewBinding.setResult("相符");
+        } else {
+            mViewBinding.setResult("不相符");
+        }
+    }
+
+    private int getSumNum() {
+        long i = 0;
+        for (CsDetail csDetail : bottomCsList) {
+            i = i + csDetail.getCsCnt();
+        }
+        return (int) i;
+    }
+
+    public void setCs(Cs cs) {
+        mCs = cs;
+        mCs.setCsdetailList(bottomCsList);
+    }
+
+
+    public void searchGoodsSuc() {
+//        mViewBinding.etKeyword.setText("");
+//        KeyboardUtils.hideSoftInput(getActivity());
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryFragment.java

+package com.xingdata.zzdpos.ui.manage.inventory.fragment;
+
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.ColorDrawable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.text.Html;
+import android.util.TimeUtils;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.DatePicker;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentInventoryBinding;
+import com.xingdata.zzdpos.model.Cs;
+import com.xingdata.zzdpos.model.Ossku;
+import com.xingdata.zzdpos.model.Pager;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.dialog.PromptDialog;
+import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
+import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryAdapter;
+import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.StringUtil;
+
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Created by Administrator on 2017/11/24.
+ */
+
+public class InventoryFragment extends BaseFragment<InventoryPresenter, FragmentInventoryBinding> {
+    private InventoryAdapter mInventoryAdapter;
+    private int pageNum;
+    private Long start;
+    private Long end;
+
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_inventory;
+    }
+
+    @Override
+    public void initView() {
+        start = null;
+        end = null;
+        pageNum = 1;
+        initTitle();
+        mViewBinding.btnAdd.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                mPresenter.clickStartInventory();
+            }
+        });
+        mViewBinding.recyclerInventory.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mInventoryAdapter = new InventoryAdapter(new ArrayList<>());
+        mInventoryAdapter.setEmptyView(getEmptyView());
+        mViewBinding.recyclerInventory.setAdapter(mInventoryAdapter);
+        mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
+        mInventoryAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.recyclerInventory);
+        mInventoryAdapter.setOnItemClickListener((adapter, view, position) -> {
+            mPresenter.clickInventoryItem(mInventoryAdapter.getData().get(position));
+        });
+        mViewBinding.btnAdd.setOnClickListener(new OnClickListener() {
+                                                   @Override
+                                                   protected void myOnClickListener(View v) {
+                                                       mPresenter.clickStartInventory();
+                                                   }
+                                               }
+        );
+        mInventoryAdapter.setOnItemLongClickListener((adapter, view, position) -> {
+            PromptDialog promptDialog = new PromptDialog();
+            promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "请确认删除此记录").setClick(view1 -> {
+                mPresenter.delInventoryItem(mInventoryAdapter.getData().get(position));
+                promptDialog.dismiss();
+            }, view1 -> {
+                promptDialog.dismiss();
+            }).setCancelables(false).show((BaseActivity) mContext);
+            return false;
+        });
+
+        mPresenter.getInventoryList(pageNum);
+    }
+
+    private void initTitle() {
+        mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
+        mViewBinding.icTitle.tvTitle.setText("盘库记录");
+        mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
+        mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                mPresenter.clickDate();
+            }
+        });
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                getActivity().finish();
+            }
+        });
+    }
+
+    //
+    public void setCount(int count) {
+        mViewBinding.tvCount.setText("共" + count + "人次盘库记录");
+    }
+
+    public void setCount(String count) {
+        mViewBinding.tvCount.setText(count);
+    }
+
+    private void onRefresh() {
+        start = null;
+        end = null;
+        pageNum = 1;
+        mPresenter.getInventoryList(pageNum);
+    }
+
+    private void onLoadMore() {
+        pageNum++;
+        if (start != null) {
+            mPresenter.getInventoryList(pageNum, start, end);
+        } else {
+            mPresenter.getInventoryList(pageNum);
+        }
+
+    }
+
+
+    /**
+     * 设置数据
+     *
+     * @param pager     数据
+     * @param isRefresh 是否刷新
+     */
+    public void setData(Pager<Cs> pager, boolean isRefresh) {
+        if (isRefresh) {
+            mInventoryAdapter.setEnableLoadMore(true);
+            mViewBinding.srlProduct.setRefreshing(false);
+            pageNum = 1;
+        }
+        if (isRefresh) mInventoryAdapter.setNewData(pager.getList());
+        else if (pager.getList().size() > 0) mInventoryAdapter.addData(pager.getList());
+        if (pager.isLastPage()) mInventoryAdapter.loadMoreEnd(isRefresh);
+        else mInventoryAdapter.loadMoreComplete();
+
+    }
+
+
+    private View getEmptyView() {
+        View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        TextView textView = view.findViewById(R.id.tv_empty);
+        textView.setText(R.string.inventory_empty_hint);
+        return view;
+    }
+
+
+
+
+    public void setDate(long start, long end) {
+        this.start = start;
+        this.end = end;
+
+    }
+}

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

+package com.xingdata.zzdpos.ui.manage.manageMenu;
+
+
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.DatePicker;
+import android.widget.TextView;
+
+import com.blankj.utilcode.util.TimeUtils;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentStatisticsDateBinding;
+import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
+import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
+import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.StringUtil;
+
+import java.text.SimpleDateFormat;
+
+
+public class ManageDateFragment extends BaseFragment<InventoryPresenter, FragmentStatisticsDateBinding> {
+    private float textSize;
+    private View.OnFocusChangeListener mOnFocusChangeListener;
+    private View.OnClickListener mOnClickListener;
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_statistics_date;
+    }
+
+    @Override
+    public void initView() {
+        initListener();
+        textSize = mViewBinding.editStart.getTextSize();
+
+        mViewBinding.editStart.setOnFocusChangeListener(mOnFocusChangeListener);
+        mViewBinding.editEnd.setOnFocusChangeListener(mOnFocusChangeListener);
+        mViewBinding.editStart.setOnClickListener(mOnClickListener);
+        mViewBinding.editEnd.setOnClickListener(mOnClickListener);
+
+        String startAll = StringUtil.monthStart();
+        String[] stringsStart = startAll.split("-");
+        mViewBinding.datePickerStart.setMaxDate(System.currentTimeMillis());
+        mViewBinding.datePickerStart.init(2000, 0, 0, new DatePicker.OnDateChangedListener() {
+            @Override
+            public void onDateChanged(DatePicker datePicker, int i, int i1, int i2) {
+                String month = String.valueOf(i1 + 1).length() >= 2 ? String.valueOf(i1 + 1) : "0" + String.valueOf(i1 + 1);
+                String day = String.valueOf(i2).length() >= 2 ? String.valueOf(i2) : "0" + String.valueOf(i2);
+                mViewBinding.editStart.setText(i + "-" + month + "-" + day);
+            }
+        });
+        String endAll = TimeUtils.millis2String(System.currentTimeMillis(), new SimpleDateFormat(StringUtil.defaultDatePattern));
+        String[] stringsEnd = endAll.split("-");
+        mViewBinding.datePickerEnd.setMaxDate(System.currentTimeMillis());
+        mViewBinding.datePickerEnd.init(2000, 0, 0, new DatePicker.OnDateChangedListener() {
+            @Override
+            public void onDateChanged(DatePicker datePicker, int i, int i1, int i2) {
+                String month = String.valueOf(i1 + 1).length() >= 2 ? String.valueOf(i1 + 1) : "0" + String.valueOf(i1 + 1);
+                String day = String.valueOf(i2).length() >= 2 ? String.valueOf(i2) : "0" + String.valueOf(i2);
+                mViewBinding.editEnd.setText(i + "-" + month + "-" + day);
+            }
+        });
+        mViewBinding.tvOk.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                mPresenter.inspectDate(mViewBinding.editStart.getText().toString(), mViewBinding.editEnd.getText().toString());
+            }
+        });
+
+        mViewBinding.tvCancel.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                pop();
+            }
+        });
+
+
+        new android.os.Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mViewBinding.datePickerStart.updateDate(Integer.valueOf(stringsStart[0]), Integer.valueOf(stringsStart[1]) - 1, Integer.valueOf(stringsStart[2]));
+                mViewBinding.datePickerEnd.updateDate(Integer.valueOf(stringsEnd[0]), Integer.valueOf(stringsEnd[1]) - 1, Integer.valueOf(stringsEnd[2]));
+                mViewBinding.editStart.performClick();
+                mViewBinding.editStart.setText(startAll);
+                mViewBinding.editEnd.setText(endAll);
+            }
+        }, 10);
+    }
+
+    public void showDateAlert(Boolean f) {
+        if (f) {
+            mViewBinding.imgAlert.setVisibility(View.VISIBLE);
+        } else {
+            mViewBinding.imgAlert.setVisibility(View.GONE);
+        }
+    }
+
+    private void initListener() {
+        mOnFocusChangeListener = new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View view, boolean b) {
+                if (b) {
+                    ((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize + 5);
+                    ((TextView) view).setTextColor(getResources().getColor(R.color.red_guanyu));
+                    String[] strings = ((TextView) view).getText().toString().split("-");
+                    if (mViewBinding.datePickerStart.getVisibility() == View.GONE) {
+                        mViewBinding.datePickerStart.setVisibility(View.VISIBLE);
+                        mViewBinding.datePickerEnd.setVisibility(View.GONE);
+                    } else {
+                        mViewBinding.datePickerStart.setVisibility(View.GONE);
+                        mViewBinding.datePickerEnd.setVisibility(View.VISIBLE);
+                    }
+                } else {
+                    ((TextView) view).setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+                    ((TextView) view).setTextColor(getResources().getColor(R.color.gray_kongming));
+                }
+            }
+        };
+        mOnClickListener = new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                if (v.isFocused()) {
+
+                } else {
+                    v.setFocusable(true);
+                    v.setFocusableInTouchMode(true);
+                    v.requestFocus();
+                }
+            }
+        };
+    }
+
+}

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.inventory.InventoryActivity;
 import com.xingdata.zzdpos.ui.manage.otherselect.OtherSelectActivity;
 import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
@@ -76,7 +77,7 @@ public class ManageMenuActivity extends AppCompatActivity {
                     }
                     break;
                     case C.MENU.MENU_MANAGER_INVENTORY: {
-
+                        ActivityUtils.startActivity(ManageMenuActivity.this, InventoryActivity.class);
                     }
                     break;
                     default: {

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

@@ -37,7 +37,6 @@ public class ReplenishmentPresenter extends ReplenishmentContract.Presenter {
                     } else {
                         mView.openReplenishmentDetailFragment(ssskuPager.getList());
                     }
-
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
                 });

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

@@ -54,6 +54,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
     @Override
     public void initView() {
         mViewBinding.lyTitle.edTitle.setHint(R.string.inventory_add_et_hint);
+        mViewBinding.lyTitle.edTitle.setText("");
         Drawable drawableTop = getResources().getDrawable(R.mipmap.but_up);
         Drawable drawableBottom = getResources().getDrawable(R.mipmap.but_unfurled);
         drawableTop.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10);

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

@@ -121,7 +121,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
     @Override
     public void showCartDialog(Saleorder saleorder, List<Saledetail> saledetails) {
         mCartDialog.setSaleorder(saleorder).setSaledetails(saledetails).show(this);
-    }
+}
 
     @Override
     public void showMsDialog(List<Ms> mss) {

app/src/main/res/layout/activity_inventory.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">
+
+
+        <FrameLayout
+            android:id="@+id/f_bottom"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+        </FrameLayout>
+
+
+    </android.support.constraint.ConstraintLayout>
+
+</layout>
\ No newline at end of file

app/src/main/res/layout/fragment_inventory.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:id="@+id/btn_add"
+            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_inventory_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" />
+
+
+        <TextView
+            android:id="@+id/tv_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/gray_zhouyu"
+            android:paddingBottom="@dimen/all_padding"
+            android:paddingStart="@dimen/all_padding_left_right"
+            android:paddingTop="@dimen/all_padding"
+            android:text="共0人次盘库记录"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size_low"
+            android:textStyle="bold" />
+
+        <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_inventory"
+                android:background="@color/gray_zhouyu"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            </android.support.v7.widget.RecyclerView>
+        </android.support.v4.widget.SwipeRefreshLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file

app/src/main/res/layout/fragment_inventory_add.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>
+
+        <variable
+            name="cartCount"
+            type="int" />
+
+        <variable
+            name="result"
+            type="String" />
+    </data>
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/ic_title"
+            layout="@layout/title_order"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_title_small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/gray_zhouyu"
+            android:paddingBottom="@dimen/all_padding"
+            android:paddingStart="@dimen/all_padding_left_right"
+            android:paddingTop="@dimen/all_padding"
+            android:text="@string/manage_inventory_add_title"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size_small_title"
+            android:textStyle="bold"
+            app:layout_constraintTop_toBottomOf="@id/ic_title" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toTopOf="@id/fl_cart"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_small">
+
+        </android.support.v7.widget.RecyclerView>
+
+        <FrameLayout
+            android:id="@+id/fl_cart"
+            android:layout_width="0dp"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/white_caocao"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
+
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/all_spacing"
+            android:animateLayoutChanges="true"
+            app:layout_constraintBottom_toTopOf="@id/fl_cart"
+            app:layout_constraintLeft_toRightOf="@id/fl_logo"
+            app:layout_constraintTop_toBottomOf="@id/fl_cart">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="结果："
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/all_text_size" />
+
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textColor="@color/red_guanyu"
+                android:text="@{result}"
+                android:textSize="@dimen/all_sub_title_size"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_settle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:background="@drawable/shape_red_round_rectangle_more_round"
+            android:foreground="?android:attr/actionBarItemBackground"
+            android:paddingBottom="@dimen/all_spacing"
+            android:paddingEnd="@dimen/all_margin_big"
+            android:paddingStart="@dimen/all_margin_big"
+            android:paddingTop="@dimen/all_spacing"
+            android:text="@string/manage_inventory_add_end"
+            android:textColor="@color/white_caocao"
+            app:layout_constraintBottom_toTopOf="@id/fl_cart"
+            app:layout_constraintRight_toRightOf="@id/fl_cart"
+            app:layout_constraintTop_toBottomOf="@id/fl_cart" />
+
+
+        <FrameLayout
+            android:id="@+id/fl_logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/all_margin_big"
+            android:animateLayoutChanges="true"
+            app:layout_constraintBottom_toBottomOf="@id/tv_settle"
+            app:layout_constraintLeft_toLeftOf="@id/fl_cart">
+
+
+            <ImageView
+                android:id="@+id/iv_cart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/all_spacing"
+                android:contentDescription="@string/store_cart"
+                android:foreground="?attr/actionBarItemBackground"
+                android:src="@mipmap/shopping_cart" />
+
+            <TextView
+                android:layout_width="@dimen/store_cart_count"
+                android:layout_height="@dimen/store_cart_count"
+                android:layout_gravity="end"
+                android:background="@drawable/shape_white_oval"
+                android:gravity="center"
+                android:text='@{cartCount+""}'
+                android:textColor="@color/red_guanyu"
+                android:textSize="@dimen/all_caption_size"
+                android:textStyle="bold" />
+        </FrameLayout>
+
+
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file

app/src/main/res/layout/item_inventory.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">
+
+    <data>
+
+
+    </data>
+
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/all_padding_left_right"
+        android:background="@color/white_caocao"
+        android:padding="@dimen/all_padding_left_right">
+
+        <ImageView
+            android:id="@+id/img"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:src="@mipmap/img_boss"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/all_padding_left_right"
+            android:text=""
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size"
+            app:layout_constraintBottom_toBottomOf="@id/img"
+            app:layout_constraintStart_toEndOf="@id/img"
+            app:layout_constraintTop_toTopOf="@id/img" />
+
+        <TextView
+            android:id="@+id/tv_phone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/all_padding_left_right"
+            android:text=""
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size_low"
+            app:layout_constraintBottom_toBottomOf="@id/tv_name"
+            app:layout_constraintStart_toEndOf="@id/tv_name" />
+
+
+        <View
+            android:id="@+id/view_line"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_marginTop="@dimen/all_padding_left_right"
+            android:background="@color/gray_kongming"
+            app:layout_constraintTop_toBottomOf="@id/img" />
+
+        <TextView
+            android:id="@+id/tv_unit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/singleline_white_gray"
+            android:padding="@dimen/all_padding"
+            android:text="件"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/view_line" />
+
+        <TextView
+            android:id="@+id/tv_num"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="0dp"
+            android:paddingEnd="@dimen/all_padding"
+            android:text=""
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size_low"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/tv_unit"
+            app:layout_constraintEnd_toStartOf="@id/tv_unit"
+            app:layout_constraintTop_toTopOf="@id/tv_unit" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/singleline_white_gray"
+            android:padding="@dimen/all_padding"
+            android:text="盘点件数："
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size_low"
+            app:layout_constraintBottom_toBottomOf="@id/tv_unit"
+            app:layout_constraintEnd_toStartOf="@id/tv_unit"
+            app:layout_constraintStart_toStartOf="parent" />
+
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/singleline_white_gray"
+            android:padding="@dimen/all_padding"
+            android:text="盘点结果："
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size_low"
+            app:layout_constraintEnd_toStartOf="@id/tv_result"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_unit" />
+
+        <TextView
+            android:id="@+id/tv_result"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/singleline_white_gray"
+            android:padding="@dimen/all_padding"
+            android:paddingEnd="@dimen/all_margin"
+            android:text="不相符"
+            android:textColor="@color/black"
+            android:textSize="@dimen/all_text_size_low"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_unit" />
+
+
+        <TextView
+            android:id="@+id/tv_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/all_padding"
+            android:text="2017-10-01 12:25"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size_low"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_result" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/all_padding"
+            android:text="盘点时间"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size_low"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_result" />
+
+        <ImageView
+            android:id="@+id/img_inventory"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/ic_not_consistent"
+            app:layout_constraintBottom_toBottomOf="@id/tv_result"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_result" />
+    </android.support.constraint.ConstraintLayout>
+
+
+</layout>
\ No newline at end of file

app/src/main/res/layout/item_inventory_cart.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">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="count"
+            type="long" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/white_caocao"
+            android:gravity="center"
+            android:paddingEnd="@dimen/all_margin"
+            android:paddingStart="@dimen/all_margin">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:singleLine="true"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/all_text_size" />
+
+
+            <TextView
+                android:id="@+id/tv_price"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@color/black_baozheng"
+                android:textSize="@dimen/all_text_size" />
+
+
+
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:layout_marginEnd="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:background="@color/gray_kongming" />
+    </LinearLayout>
+
+</layout>
+
+

app/src/main/res/layout/item_inventory_goods.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.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/all_padding_left_right"
+        android:background="@drawable/singleline_white_gray"
+        android:padding="@dimen/all_padding">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/img_goods"
+            android:layout_width="65dp"
+            android:layout_height="65dp"
+            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_padding_left_right"
+            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
+            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="28dp"
+            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"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/frame_frame_zhouyu_bg"
+            android:padding="@dimen/dp_4"
+            android:text="规格"
+            android:textSize="@dimen/all_text_size_small"
+            app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
+
+        <TextView
+            android:id="@+id/tv_goods_price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="999"
+            android:textColor="@color/store_product_price"
+            android:textSize="@dimen/big_text_size"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
+            app:layout_constraintStart_toEndOf="@id/tv_rmb"
+            app:layout_constraintTop_toTopOf="@id/tv_price_hint"
+            />
+
+        <TextView
+            android:id="@+id/tv_rmb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_4"
+            android:text="@string/money_rmb"
+            android:textColor="@color/store_product_price"
+            android:textSize="@dimen/all_text_size_small"
+            app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
+            app:layout_constraintStart_toEndOf="@+id/tv_price_hint"
+        />
+
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dialog_cart_item_button_height"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_num_hint">
+
+            <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_reduce" />
+
+            <EditText
+                android:id="@+id/et_count"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="@dimen/dp_4"
+                android:layout_marginTop="@dimen/dp_4"
+                android:layout_weight="1"
+                android:background="@drawable/selector_edit_frame_blue_background"
+                android:gravity="center"
+                android:hint="1"
+                android:inputType="number"
+                android:maxLength="4"
+                android:saveEnabled="false"
+                android:textSize="@dimen/all_text_size_low" />
+
+            <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_add"
+                tools:layout_editor_absoluteX="666dp"
+                tools:layout_editor_absoluteY="97dp" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_num_hint"
+            style="@style/other_select_smallstyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/all_padding"
+            android:text="构成数量："
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_goods_price" />
+
+        <TextView
+            android:id="@+id/tv_stock_hint"
+            style="@style/other_select_smallstyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/all_padding"
+            android:layout_marginStart="@dimen/all_padding_left_right"
+            android:text="系统库存："
+            android:textStyle="bold"
+            app:layout_constraintStart_toEndOf="@id/tv_goods_price"
+            app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
+
+        <TextView
+            android:id="@+id/tv_stock"
+            style="@style/other_select_smallstyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0个"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/tv_stock_hint"
+            app:layout_constraintStart_toEndOf="@id/tv_stock_hint"
+            app:layout_constraintTop_toTopOf="@id/tv_stock_hint" />
+
+
+        <TextView
+            android:id="@+id/tv_price_hint"
+            style="@style/other_select_smallstyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/all_padding"
+            android:text="进价："
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
+            app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
+
+        <TextView
+            android:id="@+id/btn_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_red_round_rectangle_more_round"
+            android:foreground="?android:attr/actionBarItemBackground"
+            android:paddingBottom="@dimen/all_spacing"
+            android:paddingEnd="@dimen/all_margin_big"
+            android:paddingStart="@dimen/all_margin_big"
+            android:paddingTop="@dimen/all_spacing"
+            android:text="@string/all_confirm"
+            android:textColor="@color/white_caocao"
+            app:layout_constraintBottom_toBottomOf="@id/linearLayout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/linearLayout" />
+
+    </android.support.constraint.ConstraintLayout>
+
+
+</layout>
\ No newline at end of file

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

@@ -22,7 +22,7 @@
     <dimen name="all_tiny_size">9sp</dimen>
     <dimen name="all_title_size">26sp</dimen>
     <dimen name="all_padding">10dp</dimen>
-    <dimen name="all_padding_left_right">15dp</dimen>
+    <dimen name="all_padding_left_right">16dp</dimen>
     <dimen name="all_text_size_big">22sp</dimen>
     <dimen name="all_text_size_big_big">30sp</dimen>
     <dimen name="all_text_size_super_big">25sp</dimen>

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

@@ -262,8 +262,8 @@
     <string name="title_activity_splash">SplashActivity</string>
 
 
-    <!--临库查询界面-->
-    <string name="other_selcet_meun">临库查询</string>
+    <!--邻库查询界面-->
+    <string name="other_selcet_meun">邻库查询</string>
     <string name="other_selcet_edit_hint">商品名称/商品条码/商品助记码</string>
     <string name="other_selcet_shop">共%s个门店库存</string>
 
@@ -500,7 +500,7 @@
     <string name="menu_manager_goods">商品维护</string>
     <string name="menu_manager_bale">商品组合</string>
     <string name="menu_manager_replenishment">补货订货</string>
-    <string name="menu_manager_other">临库查询</string>
+    <string name="menu_manager_other">邻库查询</string>
     <string name="menu_manager_inventory">库存盘点</string>
 
     <string name="menu_announcement">公告通知</string>
@@ -676,6 +676,9 @@
     <string name="manage_replenishment_unConfirmed">待确认</string>
     <string name="manage_replenishment_unReceive">待收货</string>
     <string name="manage_replenishment_finished">已入库</string>
+    <string name="manage_inventory_add">开始盘库</string>
+    <string name="manage_inventory_add_title">商品盘点</string>
+    <string name="manage_inventory_add_end">盘库结束</string>
 
     <!--商品维护-->
     <string name="sku_size">规格/</string>