入库扫描界面----采集、取消采集返回后数据更新问题。移库界面---界面逻辑更改，接口参数修改、调试，表格数据增加。

app/src/main/java/com/uas/yuejiahong/bean/HaveBeenTakenBean.java

@@ -0,0 +1,10 @@
+package com.uas.yuejiahong.bean;
+
+/**
+ * Created by cjh on 2022-06-10
+ */
+public class HaveBeenTakenBean {
+    public HaveBeenTakenBean(String s) {
+
+    }
+}

app/src/main/java/com/uas/yuejiahong/bean/LocationCheckBean.java

@@ -5,6 +5,15 @@ public class LocationCheckBean {
     private String PRODCODE;
     private String QUANTITY;
     private String BRAND;
+    private String LOCATION;
+
+    public String getLOCATION() {
+        return LOCATION;
+    }
+
+    public void setLOCATION(String LOCATION) {
+        this.LOCATION = LOCATION;
+    }
 
     public String getBarcode() {
         return BARCODE;

app/src/main/java/com/uas/yuejiahong/fragment/JLTStorageInBarcodeFragment.java

@@ -14,6 +14,7 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.format.DateFormat;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
@@ -34,6 +35,7 @@ import com.uas.yuejiahong.activity.FunctionActivity;
 import com.uas.yuejiahong.adapter.JLTSearchWhcodeAdapter;
 import com.uas.yuejiahong.adapter.NewJLTStorageInTodoAdapter;
 import com.uas.yuejiahong.adapter.SecondaryListAdapter;
+import com.uas.yuejiahong.bean.HaveBeenTakenBean;
 import com.uas.yuejiahong.bean.JLTBarcodeParseBean;
 import com.uas.yuejiahong.bean.JLTBrandEntity;
 import com.uas.yuejiahong.bean.JLTMpqEntity;
@@ -57,6 +59,9 @@ import com.uas.yuejiahong.view.RecyclerItemDecoration;
 import com.uas.yuejiahong.view.business.CommonSelectPop;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -156,6 +161,8 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
 
     @Override
     protected void initEvents() {
+        EventBus.getDefault().register(this);
+
         mMoreButton.setOnClickListener(this);
         mCalendarImageView.setOnClickListener(this);
         mBarcodeScanIv.setOnClickListener(this);
@@ -178,7 +185,8 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
-                barcodeParse(text);
+//                barcodeParse(text);
+                confirmRequest(false);
             }
         });
 
@@ -718,6 +726,20 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     private void confirmRequest(boolean exist) {
         String mModelEditTexttrim = this.mModelEditText.getText().toString().trim();
         String mLotEditTexttrim = mLotEditText.getText().toString().trim();
+        String mBarcodeEditTexttrim = mBarcodeEditText.getText().toString().trim();
+        if (TextUtils.isEmpty(mBarcodeEditTexttrim)){
+            CommonUtil.toastNoRepeat(getContext(),"请输入条码号");
+            return;
+        }
+        if (TextUtils.isEmpty(mModelEditTexttrim)){
+            CommonUtil.toastNoRepeat(getContext(),"请输入品牌");
+            return;
+        }
+        if (TextUtils.isEmpty(mLotEditTexttrim)){
+            CommonUtil.toastNoRepeat(getContext(),"请输入仓位");
+            return;
+        }
+        progressDialog.show();
 //        String jsonString = JSON.toJSONString(mBarcodeParseBean);
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_RECEIVING_SAVEBARCODE2)
@@ -761,7 +783,8 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                         if (isFinish) {
                             CommonUtil.toastNoRepeat(mActivity, "该入库单最后一行已完成采集！");
                             mBarcodeEditText.setText("");
-                            resetState();
+                            mBarcodeEditText.requestFocus();
+//                            resetState();
 //                            getActivity().getSupportFragmentManager().popBackStackImmediate();
 //                            if (mOnFinishListener != null) {
 //                                mOnFinishListener.onFinish();
@@ -771,14 +794,20 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                                 getActivity().getSupportFragmentManager().popBackStack();
                             } else {
                                 mBarcodeEditText.setText("");
-                                resetState();
+                                mBarcodeEditText.requestFocus();
+//                                resetState();
                             }
                         }
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                resetState();
+//                resetState();
+                mBarcodeEditText.requestFocus();
+                if (!TextUtils.isEmpty(mPiid)) {
+                    getNeedList();
+                    Log.e("刷新","舒心入库俩啊");
+                }
             }
 
             @Override
@@ -786,10 +815,13 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 progressDialog.dismiss();
 
                 CommonUtil.toastNoRepeat(mActivity, failStr);
+                if (!TextUtils.isEmpty(mPiid)) {
+                    getNeedList();
+                }
             }
         });
     }
-
+    //清空所有输入框
     private void resetState() {
         mModelEditText.setText("");
         mQuantityEditText.setText("");
@@ -1195,4 +1227,17 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     public interface OnFinishListener {
         void onFinish();
     }
+    @Subscribe
+    public void onPermissions(HaveBeenTakenBean bean){
+        if (!TextUtils.isEmpty(mPiid)) {
+            getNeedList();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        //注销
+        EventBus.getDefault().unregister(this);
+    }
 }

app/src/main/java/com/uas/yuejiahong/fragment/JLTStorageInDoneListFragment.java

@@ -23,6 +23,7 @@ import com.uas.yuejiahong.R;
 import com.uas.yuejiahong.activity.FunctionActivity;
 import com.uas.yuejiahong.adapter.JLTStorageInDoneAdapter;
 import com.uas.yuejiahong.adapter.SecondaryListAdapter;
+import com.uas.yuejiahong.bean.HaveBeenTakenBean;
 import com.uas.yuejiahong.bean.JLTStorageModelBean;
 import com.uas.yuejiahong.global.GloableParams;
 import com.uas.yuejiahong.listener.MyEditorActionListener;
@@ -34,6 +35,8 @@ import com.uas.yuejiahong.util.VolleyRequest;
 import com.uas.yuejiahong.view.ClearableEditText;
 import com.uas.yuejiahong.view.RecyclerItemDecoration;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -213,6 +216,7 @@ public class JLTStorageInDoneListFragment extends BaseFragment implements JLTSto
                             }
                         }).show();
             }
+
         });
 
         confirmBtn.setOnClickListener(new View.OnClickListener() {
@@ -259,6 +263,7 @@ public class JLTStorageInDoneListFragment extends BaseFragment implements JLTSto
                 }
                 mJLTStorageInDoneAdapter.notifyDataSetChanged();
                 CommonUtil.toastNoRepeat(mActivity, "撤销采集成功！");
+                EventBus.getDefault().post(new HaveBeenTakenBean("刷新已采集列表"));
             }
 
             @Override
@@ -367,12 +372,15 @@ public class JLTStorageInDoneListFragment extends BaseFragment implements JLTSto
                 List<SecondaryListAdapter.SecondaryListBean<String, JLTStorageModelBean>> datas = mJLTStorageInDoneAdapter.getDatas();
                 datas.get(groupItemIndex).getSubItems().remove(subItemIndex);
                 mJLTStorageInDoneAdapter.notifyItemRemoved(adapterPosition);
+                EventBus.getDefault().post(new HaveBeenTakenBean("刷新已采集列表"));
+
             }
 
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
+                EventBus.getDefault().post(new HaveBeenTakenBean("刷新已采集列表"));
             }
         });
     }

app/src/main/java/com/uas/yuejiahong/fragment/JltStorageInFilterListFragment.java

@@ -188,10 +188,7 @@ public class JltStorageInFilterListFragment extends BaseFragment implements OnCo
 
             @Override
             public void afterTextChanged(Editable s) {
-                String trim = s.toString().trim();
-                if (trim.length()>3){
-                    getInDataList();
-                }
+                getInDataList();
             }
         });
 
@@ -315,7 +312,7 @@ public class JltStorageInFilterListFragment extends BaseFragment implements OnCo
     }
 
     private void getInDataList() {
-        progressDialog.show();
+//        progressDialog.show();
         String trim = mSearchCet.getText().toString().trim();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_JLT_RECEIVING_GETINDATALIST)

app/src/main/java/com/uas/yuejiahong/fragment/LocationTransferFragment.java

@@ -48,7 +48,7 @@ public class LocationTransferFragment extends BaseFragment implements OnColumnIt
     private TextView mOldLocationBtn, mNewLocationBtn,location_transfer_model_ok,location_transfer_quantity_ok;
     private SmartTable mSmartTable;
     private TableData<LocationCheckBean> mTableData;
-    private Column<String>mBRANDColumn, mProdCodeColumn, mBarcodeColumn, mQuantityColumn;
+    private Column<String>mBRANDColumn, mProdCodeColumn,mLocationColumn, mBarcodeColumn, mQuantityColumn;
     private List<LocationCheckBean> mLocationCheckBeans;
     private RefreshLayout mRefreshLayout;
     private int mPageIndex = 1, mPageSize = 20;
@@ -80,8 +80,9 @@ public class LocationTransferFragment extends BaseFragment implements OnColumnIt
         mRefreshLayout.setEnableRefresh(false);
         mSmartTable = root.findViewById(R.id.location_transfer_info_st);
         CommonUtil.getDefaultTable(mActivity, mSmartTable);
-        mBRANDColumn = new Column<>("仓位", "BRAND");
+        mBRANDColumn = new Column<>("仓位", "LOCATION");
         mProdCodeColumn = new Column<>("型号", "PRODCODE");
+        mLocationColumn = new Column<>("品牌", "BRAND");
         mBarcodeColumn = new Column<>("物料编号", "BARCODE");
         mQuantityColumn = new Column<>("数量", "QUANTITY");
         mLocationCheckBeans = new ArrayList<>();
@@ -152,13 +153,13 @@ public class LocationTransferFragment extends BaseFragment implements OnColumnIt
     protected void initDatas() {
         mBRANDColumn.setOnColumnItemClickListener(this);
         mProdCodeColumn.setOnColumnItemClickListener(this);
+        mLocationColumn.setOnColumnItemClickListener(this);
         mBarcodeColumn.setOnColumnItemClickListener(this);
         mQuantityColumn.setOnColumnItemClickListener(this);
     }
 
     private void transferToNewLocation() {
         String location_transfer_modeltrim = location_transfer_model.getText().toString().trim();
-        String location_transfer_quantitytrim = location_transfer_quantity.getText().toString().trim();
         String trim = mNewLocationEditText.getText().toString().trim();//
         mLocation = mOldLocationEditText.getText().toString().trim();
         if (TextUtils.isEmpty(mLocation)) {
@@ -169,10 +170,6 @@ public class LocationTransferFragment extends BaseFragment implements OnColumnIt
             CommonUtil.toastNoRepeat(mActivity, "物料编码不可为空");
             return;
         }
-        if (TextUtils.isEmpty(location_transfer_quantitytrim)) {
-            CommonUtil.toastNoRepeat(mActivity, "数量不可为空");
-            return;
-        }
         String newLocation = mNewLocationEditText.getText().toString().trim();
         if (TextUtils.isEmpty(mLocation)) {
             CommonUtil.toastNoRepeat(mActivity, "请采集新库位");
@@ -189,7 +186,6 @@ public class LocationTransferFragment extends BaseFragment implements OnColumnIt
                 .addParam("fromLo", mLocation)
                 .addParam("toLo", newLocation)
                 .addParam("prcode",location_transfer_modeltrim)//物料编号
-                .addParam("qty",location_transfer_quantitytrim)//数量
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -258,7 +254,7 @@ public class LocationTransferFragment extends BaseFragment implements OnColumnIt
                                 locationCheckBean.setBarcode(FastjsonUtil.getText(dataObject, "BARCODE"));
                                 locationCheckBean.setQuantity(FastjsonUtil.getText(dataObject, "QTY"));
                                 locationCheckBean.setBrand(FastjsonUtil.getText(dataObject, "BRAND"));
-
+                                locationCheckBean.setLOCATION(FastjsonUtil.getText(dataObject, "LOCATION"));
                                 locationCheckBeans.add(locationCheckBean);
                             }
                         }
@@ -310,7 +306,7 @@ public class LocationTransferFragment extends BaseFragment implements OnColumnIt
 
     private void setTableData(List<LocationCheckBean> locationCheckBeans) {
         mTableData = new TableData<LocationCheckBean>("库位提示", locationCheckBeans,
-                mBRANDColumn,mProdCodeColumn, mBarcodeColumn, mQuantityColumn);
+                mBRANDColumn,mProdCodeColumn,mLocationColumn,mBarcodeColumn, mQuantityColumn);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
             @Override

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

@@ -41,7 +41,8 @@
 
 
         </TableRow>
-        <TableRow style="@style/PopUpperLayoutStyle">
+        <TableRow style="@style/PopUpperLayoutStyle"
+            android:visibility="gone">
 
             <com.uas.yuejiahong.view.ClearableEditText
                 android:id="@+id/location_transfer_quantity"