库存清点

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

@@ -82,10 +82,10 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     @Override
     public void disInventoryDetailFragment(Boolean idChange) {
         if (idChange) {
-//            mInventoryAddFragment.pop();
-//            mPresenter.refreshCs();
+            mInventoryAddFragment.pop();
+            mInventoryFragment.onRefresh();
         } else {
-//            mInventoryAddFragment.pop();
+            mInventoryAddFragment.pop();
         }
 
     }

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

@@ -26,15 +26,10 @@ public class InventoryAdapter extends BaseAdapter<Cs, ItemInventoryBinding> {
 
     @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() + "");
+        mViewBinding.tvNum.setText(item.getCsdetailCount() + "");
         switch (item.getCsResultFlag()) {
             case 0:
                 mViewBinding.tvResult.setText("相符");

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

@@ -4,11 +4,8 @@ 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;
 
@@ -18,21 +15,11 @@ public class InventoryCartAdapter extends BaseAdapter<CsDetail, ItemInventoryCar
         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());
+        mViewBinding.setCount(item.getCsCnt() + item.getSpuUnitName());
 
     }
 

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

@@ -5,25 +5,22 @@ 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.databinding.DialogInventoryCartBinding;
+
 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.InventoryPresenter;
 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> {
+public class CsCartDialog extends BaseSheetDialog<InventoryPresenter, DialogInventoryCartBinding> {
 
 
     private List<CsDetail> mCsDetails;
+    private String result;
 
-    public interface OnCountChangeListener {
-        void onCountChange(Saledetail saledetail, int value);
-    }
 
     @Override
     protected boolean isTransparentBackground() {
@@ -32,22 +29,35 @@ public class CsCartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCar
 
     @Override
     public int getLayoutId() {
-        return R.layout.dialog_store_cart;
+        return R.layout.dialog_inventory_cart;
     }
 
     @Override
     public void initView() {
-        ;
+
 
         // init C
         InventoryCartAdapter mInventoryCartAdapter = new InventoryCartAdapter(mCsDetails);
         mViewBinding.rlCart.setAdapter(mInventoryCartAdapter);
         mViewBinding.rlCart.setLayoutManager(new LinearLayoutManager(mContext));
-
+        mViewBinding.setCartCount(getCount());
+        mViewBinding.setResult(result);
 
         // set Other listener
-        mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle());
-        mViewBinding.tvClear.setOnClickListener(view -> mPresenter.clearCart());
+        mViewBinding.tvOk.setOnClickListener(view -> mPresenter.exitInventoryAdd());
+
+    }
+
+    public void setResult(String s) {
+        result = s;
+    }
+
+    private int getCount() {
+        long i = 0;
+        for (CsDetail csDetail : mCsDetails) {
+            i = i + csDetail.getCsCnt();
+        }
+        return (int) i;
     }
 
     @Override
@@ -58,14 +68,13 @@ public class CsCartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCar
     }
 
 
-    public CsCartDialog setSaledetails(List<CsDetail> csDetailList) {
+    public CsCartDialog setCsDetails(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/fragment/InventoryAddFragment.java

@@ -73,25 +73,24 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
                 if (bottomCsList.size() == 0) {
                     return;
                 }
-                mCartDialog.setSaledetails(bottomCsList).show((BaseActivity) getActivity());
+                mCartDialog.setCsDetails(bottomCsList).show((BaseActivity) getActivity());
+            }
+        });
+        mViewBinding.btnEnd.setOnClickListener(view -> {
+            mPresenter.exitInventoryAdd();
+        });
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                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.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) {
@@ -186,8 +185,10 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
         mInventoryGoodsAdapter.notifyDataSetChanged();
         if (isResult) {
             mViewBinding.setResult("相符");
+            mCartDialog.setResult("相符");
         } else {
             mViewBinding.setResult("不相符");
+            mCartDialog.setResult("不相符");
         }
     }
 
@@ -204,6 +205,20 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
         mCs.setCsdetailList(bottomCsList);
     }
 
+    @Override
+    public boolean onBackPressedSupport() {
+        PromptDialog promptDialog = new PromptDialog();
+        promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "退出前是否删除本次盘库记录").setClick(view1 -> {
+            mPresenter.cancelInventoryAdd(mCs);
+            promptDialog.dismiss();
+
+        }, view1 -> {
+            promptDialog.dismiss();
+            pop();
+
+        }).setCancelables(false).show((BaseActivity) mContext);
+        return true;
+    }
 
     public void searchGoodsSuc() {
 //        mViewBinding.etKeyword.setText("");

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

@@ -121,7 +121,7 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         mViewBinding.tvCount.setText(count);
     }
 
-    private void onRefresh() {
+    public void onRefresh() {
         start = null;
         end = null;
         pageNum = 1;

app/src/main/res/layout/dialog_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>
+
+
+        <variable
+            name="cartCount"
+            type="int" />
+
+        <variable
+            name="result"
+            type="String" />
+
+    </data>
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <View
+            android:id="@+id/ll_title"
+            android:layout_width="0dp"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginTop="@dimen/all_margin"
+            android:background="@color/white_caocao"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+
+        </View>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toTopOf="@id/rl_cart" />
+
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rl_cart"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white_caocao"
+            app:layout_constraintBottom_toTopOf="@id/ll_info"
+            app:layout_constraintTop_toBottomOf="@id/ll_title" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toTopOf="@id/ll_info" />
+
+        <LinearLayout
+            android:id="@+id/ll_info"
+            android:layout_width="0dp"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/white_caocao"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingEnd="@dimen/all_margin"
+            android:paddingStart="@dimen/all_margin"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent">
+
+            <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:text='@{result}'
+                android:textColor="@color/red_guanyu"
+                android:textSize="@dimen/all_sub_title_size"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_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/inventory_add_btn_end"
+                android:textColor="@color/white_caocao" />
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:id="@+id/fl_logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/all_margin"
+            android:layout_marginStart="@dimen/all_margin"
+            android:animateLayoutChanges="true"
+            app:layout_constraintBottom_toBottomOf="@id/ll_title"
+            app:layout_constraintLeft_toLeftOf="parent">
+
+
+            <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="@{cartCount &lt; 100?@dimen/all_caption_size:@dimen/all_tiny_size}"
+                android:textStyle="bold" />
+        </FrameLayout>
+
+
+    </android.support.constraint.ConstraintLayout>
+</layout>
\ No newline at end of file

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

@@ -89,7 +89,7 @@
         </LinearLayout>
 
         <TextView
-            android:id="@+id/tv_settle"
+            android:id="@+id/btn_end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_margin"
@@ -112,7 +112,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_margin_big"
             android:animateLayoutChanges="true"
-            app:layout_constraintBottom_toBottomOf="@id/tv_settle"
+            app:layout_constraintBottom_toBottomOf="@id/btn_end"
             app:layout_constraintLeft_toLeftOf="@id/fl_cart">
 
 

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

@@ -71,10 +71,7 @@
             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:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_low"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/tv_unit"
@@ -90,7 +87,7 @@
             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_constraintEnd_toStartOf="@id/tv_num"
             app:layout_constraintStart_toStartOf="parent" />
 
 

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

@@ -8,7 +8,7 @@
 
         <variable
             name="count"
-            type="long" />
+            type="String" />
 
     </data>
 
@@ -41,6 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:text="@{count}"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_text_size" />