UI

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/OtherSelectActivity.java

@@ -3,6 +3,8 @@ package com.xingdata.zzdpos.ui.manage.otherselect;
 import android.text.InputType;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
 
 import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
@@ -31,12 +33,19 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, Acti
     @Override
     public void initView() {
         mViewBinding.lyTitle.ivRight.setVisibility(View.GONE);
-        mViewBinding.lyTitle.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
+        mViewBinding.lyTitle.edTitle.setVisibility(View.GONE);
+        mViewBinding.lyTitle.tvTitle.setText("邻库查询");
+        mViewBinding.lyTitle.tvTitle.setVisibility(View.VISIBLE);
         FragmentUtils.add(getSupportFragmentManager(), mOtherListFragment, mViewBinding.fragmentContainer.getId(), false, true);
-        mViewBinding.lyTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_ENTER)
-                search(mViewBinding.lyTitle.edTitle.getText().toString().trim());
-            return false;
+
+        mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                if (i == EditorInfo.IME_ACTION_SEARCH) {
+                    search(mViewBinding.edTitle.getText().toString().trim());
+                }
+                return true;
+            }
         });
         mViewBinding.lyTitle.setOnClickListener(new OnClickListener() {
             @Override

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/adpter/OtherSelectAdapter.java

@@ -31,7 +31,10 @@ public class OtherSelectAdapter extends BaseAdapter<Ossku, ItemOtherSelectBindin
         mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
         mViewBinding.imgGoods.setImageURI(item.getSpuImg());
 //        mViewBinding.tvNum.setText(item.getSkuStock() + "个");
-        mViewBinding.tvShop.setText(item.getShopName());
+        mViewBinding.setShopName(item.getShopName());
+        mViewBinding.setStock("库存:" +item.getSkuStock()+item.getSpuUnitName());
+        mViewBinding.setAddress(item.getCityProvName()+item.getCityName()+item.getCityCountyName()+item.getCityAddress());
+        mViewBinding.setPhone(item.getContactTel());
 //        mViewBinding.tvAddress.setText(item.getCityAddress());
 //        mViewBinding.tvTel.setText(item.getContactTel());
     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/fragment/OtherListFragment.java

@@ -51,12 +51,12 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
         Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
         mViewBinding.recyclerOtherSelcet.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
 
-        mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-            @Override
-            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                mPresenter.clickOsskuItem(mOtherSelectAdapter.getData().get(position));
-            }
-        });
+//        mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+//            @Override
+//            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//                mPresenter.clickOsskuItem(mOtherSelectAdapter.getData().get(position));
+//            }
+//        });
 
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mOtherSelectAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.recyclerOtherSelcet);

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

@@ -46,9 +46,10 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
 
         if (!isTouch) {
             mViewBinding.etCount.setEnabled(false);
-            mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext, R.color.white_cargo));
+            mViewBinding.etCount.setTextColor(ContextCompat.getColor(mContext, R.color.red_lvzhi));
             mViewBinding.btnDown.setVisibility(View.GONE);
             mViewBinding.btnUp.setVisibility(View.GONE);
+            mViewBinding.tvFinallyCount.setVisibility(View.VISIBLE);
         }
     }
 
@@ -108,7 +109,6 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
     }
 
 
-
     public void setmUpdatePriceListener(UpdatePriceListener updatePriceListener) {
         this.mUpdatePriceListener = updatePriceListener;
     }

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

@@ -8,6 +8,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.text.InputType;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
 import com.blankj.utilcode.util.KeyboardUtils;
@@ -53,8 +54,11 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
 
     @Override
     public void initView() {
-        mViewBinding.lyTitle.edTitle.setHint(R.string.inventory_add_et_hint);
-        mViewBinding.lyTitle.edTitle.setText("");
+        mViewBinding.lyTitle.edTitle.setVisibility(View.GONE);
+        mViewBinding.lyTitle.tvTitle.setVisibility(View.VISIBLE);
+        mViewBinding.lyTitle.tvTitle.setText("定货详情");
+        mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
+        mViewBinding.edTitle.setText("");
         Drawable drawableTop = getResources().getDrawable(R.mipmap.but_unfurled);
         Drawable drawableBottom = getResources().getDrawable(R.mipmap.but_up);
         drawableTop.setBounds(0, 0, (int) mViewBinding.tvShopTitle.getTextSize() - 10, (int) mViewBinding.tvShopTitle.getTextSize() - 10);
@@ -93,10 +97,15 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
             }
         });
         mViewBinding.lyTitle.ivRight.setVisibility(View.GONE);
-        mViewBinding.lyTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
-            if (keyCode == KeyEvent.KEYCODE_ENTER)
-                scrollToItem(mViewBinding.lyTitle.edTitle.getText().toString().trim());
-            return false;
+
+        mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                if (i == EditorInfo.IME_ACTION_SEARCH) {
+                    scrollToItem(mViewBinding.edTitle.getText().toString().trim());
+                }
+                return true;
+            }
         });
         mViewBinding.lyTitle.ivBack.setOnClickListener(view -> {
             this.pop();
@@ -137,7 +146,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
                     mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
                     break;
                 case 1:
-                    mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, true);
+                    mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
                     break;
                 case 0:
                     mReplenishmentDetailAdapter = new ReplenishmentDetailAdapter(ssskuList, false);
@@ -205,15 +214,12 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
             switch (mPsb.getPsbStatus()) {
                 case 3:
                     mViewBinding.btnOk.setText("修改订单");
-
                     break;
                 case 1:
                     mViewBinding.btnOk.setText("确认收货");
-
                     break;
                 case 0:
                     mViewBinding.llBottom.setVisibility(View.GONE);
-
                     break;
                 default:
                     break;
@@ -296,5 +302,6 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
         }
 
         ToastUtils.showShort("没有找到相关货品");
+
     }
 }

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

@@ -65,6 +65,9 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
         mViewBinding.btnAdd.setOnClickListener(view -> {
             mPresenter.clickAdd();
         });
+        mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
+        mViewBinding.icTitle.tvTitle.setText("补货订货");
+        mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -72,23 +75,23 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
             }
         });
         mViewBinding.icTitle.ivRight.setVisibility(View.GONE);
-        mViewBinding.icTitle.edTitle.setHint("请输入供货商名称");
-        mViewBinding.icTitle.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
+        mViewBinding.edTitle.setHint("请输入供货商名称");
+        mViewBinding.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
 
-        mViewBinding.icTitle.edTitle.setOnClickListener(view -> {
-            if (mViewBinding.icTitle.edTitle.getText().toString().trim().length() == 0) {
+        mViewBinding.edTitle.setOnClickListener(view -> {
+            if (mViewBinding.edTitle.getText().toString().trim().length() == 0) {
                 ToastUtils.showShort("请输入供货商名称");
                 return;
             }
             switch (mViewBinding.tab.getSelectedTabPosition()) {
                 case 0:
-                    mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(0));
+                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(0));
                     break;
                 case 1:
-                    mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(1));
+                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(1));
                     break;
                 case 2:
-                    mPresenter.searchPsbList(mViewBinding.icTitle.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(2));
+                    mPresenter.searchPsbList(mViewBinding.edTitle.getText().toString(), (ReplenishmentListFragment) fragments.get(2));
                     break;
             }
 
@@ -160,15 +163,15 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
     }
 
 
-    public void showReplenishmentList(List<Psb> A, List<Psb> B, List<Psb> C,boolean isFrist) {
-        if (isFrist){
+    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);
+        } 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

@@ -138,6 +138,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
             public void run() {
                 if (psbs.size() == 0) {
                     mViewBinding.llEmpty.setVisibility(View.VISIBLE);
+                    hideSoftInput();
                 } else {
                     mReplenishmentAdapter.setNewData(psbs);
                     mReplenishmentAdapter.loadMoreEnd();