库存清点

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

@@ -12,6 +12,7 @@ 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;
@@ -22,7 +23,7 @@ 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 InventoryAddFragment mInventoryAddFragment = new InventoryAddFragment();
     //    private InventoryDetailDialog mInventoryDetailDialog = new InventoryDetailDialog();
     LoadingDialog mLoadingDialog = new LoadingDialog();
 
@@ -108,9 +109,8 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
 
     @Override
     public void openInventoryAddFragment(Cs cs) {
-//        mInventoryFragment.isShowLoading(false);
-//        mInventoryAddFragment.setCs(cs);
-//        start(mInventoryAddFragment);
+        mInventoryAddFragment.setCs(cs);
+        start(mInventoryAddFragment);
     }
 
 

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

@@ -5,13 +5,22 @@ 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 {
 
@@ -46,7 +55,8 @@ public class InventoryPresenter extends InventoryContract.Presenter {
         } else {
             csDetail.setCsResultFlag(2);
         }
-        ApiFactory.CsDetail.addCsDetail(csDetail)
+        mView.isShowLoading(true);
+        ApiFactory.CsDetail.addCsDetail(csDetail).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(detail -> {
                     mView.addInventoryDetailItem(detail, sssku);
                 }, throwable -> {
@@ -55,11 +65,40 @@ public class InventoryPresenter extends InventoryContract.Presenter {
 
     }
 
-    @Override
+    /**
+     * 根据条形码获取商品
+     *
+     * @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) {
@@ -75,7 +114,8 @@ public class InventoryPresenter extends InventoryContract.Presenter {
 
     @Override
     public void delInventoryItem(Cs cs) {
-        ApiFactory.Cs.delCsDetail(cs.getId(), cs.getCsNo())
+        mView.isShowLoading(true);
+        ApiFactory.Cs.delCsDetail(cs.getId(), cs.getCsNo()).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(object -> {
 
                 }, throwable -> {
@@ -90,8 +130,8 @@ public class InventoryPresenter extends InventoryContract.Presenter {
 
     @Override
     public void cancelInventoryAdd(Cs cs) {
-
-        ApiFactory.Cs.delCsDetail(cs.getId(), cs.getCsNo())
+        mView.isShowLoading(true);
+        ApiFactory.Cs.delCsDetail(cs.getId(), cs.getCsNo()).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(object -> {
                     mView.disInventoryDetailFragment(false);
                 }, throwable -> {
@@ -136,8 +176,8 @@ public class InventoryPresenter extends InventoryContract.Presenter {
 
     @Override
     public void getInventoryList(int pageNum, long start, long end) {
-
-        ApiFactory.Cs.querCsList(pageNum, nowPageSize, start, end)
+        mView.isShowLoading(true);
+        ApiFactory.Cs.querCsList(pageNum, nowPageSize, start, end).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(csPager -> {
                     //判断是否能加载更多
                     mView.loadCs(csPager, start, end);
@@ -160,7 +200,8 @@ public class InventoryPresenter extends InventoryContract.Presenter {
 
     @Override
     public void getInventoryList(int PageNumber) {
-        ApiFactory.Cs.querCsList(PageNumber, nowPageSize)
+        mView.isShowLoading(true);
+        ApiFactory.Cs.querCsList(PageNumber, nowPageSize).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(csPager -> {
                     //判断是否能加载更多
                     mView.loadCs(csPager);

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.zzdhd.R;
-//import com.xingdata.zzdhd.base.BaseAdapter;
-//import com.xingdata.zzdhd.base.BaseViewHolder;
-//import com.xingdata.zzdhd.databinding.ItemInventoryGoodsBinding;
-//import com.xingdata.zzdhd.model.Sssku;
-//import com.xingdata.zzdhd.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_num, 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);
-//    }
-//
-//
-//}
+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/fragment/InventoryFragment.java

@@ -45,7 +45,7 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
     private Long start;
     private Long end;
 
-    LoadingDialog mLoadingDialog = new LoadingDialog();
+
 
     @Override
     public int getLayoutId() {
@@ -57,19 +57,11 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         start = null;
         end = null;
         pageNum = 1;
-        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() {
+        initTitle();
+        mViewBinding.btnAdd.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
-                getActivity().finish();
+                mPresenter.clickStartInventory();
             }
         });
         mViewBinding.recyclerInventory.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -84,7 +76,6 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         mViewBinding.btnAdd.setOnClickListener(new OnClickListener() {
                                                    @Override
                                                    protected void myOnClickListener(View v) {
-                                                       isShowLoading(true);
                                                        mPresenter.clickStartInventory();
                                                    }
                                                }
@@ -103,13 +94,31 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         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);
+        mViewBinding.tvCount.setText(count);
     }
 
     private void onRefresh() {
@@ -158,16 +167,7 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
     }
 
 
-    public void isShowLoading(Boolean is) {
-        if (is) {
-            mLoadingDialog.show((BaseActivity) mContext);
-        } else {
-            if (mLoadingDialog.isShowing) {
-                mLoadingDialog.dismiss();
-            }
-        }
 
-    }
 
     public void setDate(long start, long end) {
         this.start = start;

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" />
+    </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: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_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_rmb"
+            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="2dp"
+            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"
+            app:layout_constraintTop_toTopOf="@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: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/tv_settle"
+            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/strings.xml

@@ -673,5 +673,8 @@
     <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>
+
 
 </resources>