一键补货

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

@@ -5,17 +5,19 @@ import com.blankj.utilcode.util.KeyboardUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityReplenishmentBinding;
+import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Psb;
 import com.xingdata.zzdpos.model.Sssku;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 
+import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentDetailFragment;
 import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentFragment;
 
 import java.util.List;
 
 public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ActivityReplenishmentBinding> implements ReplenishmentContract.View {
     private ReplenishmentFragment mReplenishmentFragment = new ReplenishmentFragment();
-//    private ReplenishmentDetailFragment mReplenishmentDetailFragment = new ReplenishmentDetailFragment();
+        private ReplenishmentDetailFragment mReplenishmentDetailFragment = new ReplenishmentDetailFragment();
     private boolean isAllowFragment = true;
     LoadingDialog mLoadingDialog = new LoadingDialog();
 
@@ -26,7 +28,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
 
     @Override
     public void initView() {
-        loadRootFragment(R.id.f_bottom, mReplenishmentFragment, true, false);
+        mPresenter.queryPsbList();
 
     }
 
@@ -39,16 +41,22 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
 
     @Override
     public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C) {
-             mReplenishmentFragment.showReplenishmentList(A, B, C);
+        if (mReplenishmentFragment.isAdded()){
+            mReplenishmentFragment.showReplenishmentList(A, B, C,false);
+        }else {
+            mReplenishmentFragment.showReplenishmentList(A, B, C,true);
+            loadRootFragment(R.id.f_bottom, mReplenishmentFragment, true, false);
+        }
+
     }
 
     @Override
     public void openReplenishmentDetailFragment(List<Sssku> ssskuList) {
-//        if (isAllowFragment) {
-//            isAllowFragment = false;
-//            mReplenishmentDetailFragment.setSsskuList(ssskuList);
-//            start(mReplenishmentDetailFragment);
-//        }
+        if (isAllowFragment) {
+            isAllowFragment = false;
+            mReplenishmentDetailFragment.setSsskuList(ssskuList);
+            start(mReplenishmentDetailFragment);
+        }
 
     }
 
@@ -84,4 +92,6 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
     public void isAllowFragment(Boolean is) {
         isAllowFragment = is;
     }
+
+
 }

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

@@ -24,8 +24,6 @@ public class ReplenishmentPresenter extends ReplenishmentContract.Presenter {
     }
 
 
-
-
     @Override
     public void clickAdd() {
         mView.isShowLoading(true);
@@ -42,10 +40,12 @@ public class ReplenishmentPresenter extends ReplenishmentContract.Presenter {
 
     @Override
     public void queryPsbList() {
+        mView.isShowLoading(true);
         unConfirmedPsbList.clear();
         unReceivePsbList.clear();
         finishedPsbList.clear();
         ApiFactory.Psb.queryPsb(1, 200).doFinally(() -> {
+            mView.isShowLoading(false);
 
         })
                 .subscribe(psbPager -> {

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

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

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

@@ -19,6 +19,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
 import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentPresenter;
 import com.xingdata.zzdpos.ui.manage.replenishment.adpter.ReplenishmentAdapter;
+import com.xingdata.zzdpos.util.OnClickListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,6 +40,9 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
     private int[] titleInts = {R.string.manage_replenishment_unConfirmed, R.string.manage_replenishment_unReceive, R.string.manage_replenishment_finished};
     private FragmentViewAdapter mFragmentPagerAdapter;
     private List<BaseFragment> fragments;
+    private List<Psb> psbA;
+    private List<Psb> psbB;
+    private List<Psb> psbC;
 
 
     @Override
@@ -50,14 +54,24 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
     public void initView() {
         initData();
         initTab();
-        mPresenter.queryPsbList();
+
+
+        ((ReplenishmentListFragment) fragments.get(0)).setData(psbA);
+        ((ReplenishmentListFragment) fragments.get(1)).setData(psbB);
+        ((ReplenishmentListFragment) fragments.get(2)).setData(psbC);
 
 
         mViewBinding.btnAdd.setOnClickListener(view -> {
             mPresenter.clickAdd();
         });
-      mViewBinding.icTitle.ivRight.setImageResource(R.mipmap.but_sweep_yard);
-      mViewBinding.icTitle.edTitle.setHint("请输入供货商名称");
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                getActivity().finish();
+            }
+        });
+        mViewBinding.icTitle.ivRight.setVisibility(View.GONE);
+        mViewBinding.icTitle.edTitle.setHint("请输入供货商名称");
         mViewBinding.icTitle.edTitle.setOnClickListener(view -> {
             if (mViewBinding.icTitle.edTitle.getText().toString().trim().length() == 0) {
                 ToastUtils.showShort("请输入供货商名称");
@@ -143,10 +157,16 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
     }
 
 
-    public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C) {
-        ((ReplenishmentListFragment) fragments.get(0)).setData(A, true);
-        ((ReplenishmentListFragment) fragments.get(1)).setData(B, true);
-        ((ReplenishmentListFragment) fragments.get(2)).setData(C, true);
+    public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C,boolean isFrist) {
+        if (isFrist){
+            this.psbA = A;
+            this.psbB = B;
+            this.psbC = C;
+        }else {
+            ((ReplenishmentListFragment) fragments.get(0)).setData(psbA,true);
+            ((ReplenishmentListFragment) fragments.get(1)).setData(psbB,true);
+            ((ReplenishmentListFragment) fragments.get(2)).setData(psbC,true);
+        }
 
 
     }

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

@@ -33,6 +33,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
     private ReplenishmentAdapter mReplenishmentAdapter;
     private List<Psb> psbArrayList = new ArrayList<>();
 
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_replenishment_list;
@@ -41,7 +42,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
     @Override
     public void initView() {
         if (mReplenishmentAdapter == null) {
-            mReplenishmentAdapter = new ReplenishmentAdapter(psbArrayList);
+            mReplenishmentAdapter = new ReplenishmentAdapter(new ArrayList<>());
             mViewBinding.recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.recycler.setAdapter(mReplenishmentAdapter);
 
@@ -61,7 +62,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
         });
 
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
-
+        setData(psbArrayList,true);
     }
 
     private void onRefresh() {
@@ -83,10 +84,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
      * @param isRefresh 是否刷新
      */
     public void setData(List<Psb> psbList, boolean isRefresh) {
-        if (mReplenishmentAdapter == null) {
-            psbArrayList = psbList;
-            return;
-        }
+
         if (isRefresh) {
             mReplenishmentAdapter.setEnableLoadMore(true);
             mViewBinding.srlProduct.setRefreshing(false);
@@ -103,9 +101,13 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
 
     }
 
+    public void setData(List<Psb> psbList){
+        this.psbArrayList=psbList;
+
+    }
     public void searchSucc(String wd) {
         List<Psb> psbs = new ArrayList<>();
-        if (psbArrayList == null) {
+        if (psbArrayList .size()==0) {
             return;
         }
         for (Psb psb : psbArrayList) {
@@ -133,7 +135,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
                 }
 
             }
-        }, 500);
+        }, 300);
 
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

@@ -80,11 +80,11 @@ public class VipPresenter extends VipContract.Presenter {
 
     @Override
     public void saleorderQuery(Long vipID) {
-        ApiFactory.Saleorder.querySaleorderByVipId(vipID,0,100).subscribe(ticketList -> {
-            mView.ticketQuerySus(ticketList);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
+//        ApiFactory.Saleorder.querySaleorderByVipId(vipID,0,100).subscribe(ticketList -> {
+//            mView.ticketQuerySus(ticketList);
+//        }, throwable -> {
+//            ToastUtils.showShort(throwable.getMessage());
+//        });
     }
 
 

app/src/main/res/drawable/frame_frame_zhouyu_bg.xml

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!-- This is the main color -->
+    <item>
+        <shape>
+            <!--    边框颜色 -->
+            <solid android:color="@color/black_baozheng"/>
+        </shape>
+    </item>
+    <!-- 给View的上 左  右设置8dp的边框 -->
+    <item android:bottom="@dimen/view_line_L050"  android:top="@dimen/view_line_L050"
+        android:start="@dimen/view_line_L050" android:end="@dimen/view_line_L050">
+        <shape>
+            <!--     View填充颜色 -->
+            <solid android:color="@color/gray_zhouyu" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file

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

@@ -24,6 +24,7 @@
             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"
@@ -31,7 +32,7 @@
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/btn_add"
+
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawablePadding="@dimen/dp_4"

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

@@ -67,10 +67,10 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="@dimen/all_padding"
+                android:paddingStart="@dimen/all_padding"
                 android:text="@{shopName}"
                 android:textColor="@color/black"
-                android:textSize="@dimen/all_text_size" />
+                android:textSize="@dimen/all_text_size_low" />
         </LinearLayout>
 
         <TextView
@@ -108,7 +108,7 @@
                 android:paddingTop="@dimen/dp_4"
                 android:text="@{date}"
                 android:textColor="@color/black"
-                android:textSize="@dimen/all_text_size" />
+                android:textSize="@dimen/all_text_size_low" />
         </LinearLayout>
 
         <LinearLayout
@@ -130,7 +130,7 @@
                 android:paddingStart="@dimen/all_padding"
                 android:text="@{no}"
                 android:textColor="@color/black"
-                android:textSize="@dimen/all_text_size" />
+                android:textSize="@dimen/all_text_size_low" />
 
 
         </LinearLayout>
@@ -192,7 +192,7 @@
                         android:padding="@dimen/dp_4"
                         android:text="@{supplierName}"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/all_text_size" />
+                        android:textSize="@dimen/all_text_size_low" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -215,7 +215,7 @@
                         android:padding="@dimen/dp_4"
                         android:text="@{supplierAddress}"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/all_text_size" />
+                        android:textSize="@dimen/all_text_size_low" />
                 </LinearLayout>
 
                 <android.support.constraint.Guideline

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

@@ -11,6 +11,7 @@
     <dimen name="big_text_size">18sp</dimen>
     <dimen name="sbig_text_size">25sp</dimen>
     <dimen name="all_text_size">16sp</dimen>
+    <dimen name="all_text_size_small_title">17sp</dimen>
     <dimen name="all_text_size_low">14sp</dimen>
     <dimen name="all_text_size_small">12sp</dimen>
     <dimen name="all_text_size_small_small">10sp</dimen>