"增加收料单页面"和“增加出库单页面”增加滑动效果并调试

接口传参调整，界面优化调整
放大镜界面逻辑调整

app/src/main/java/com/uas/uas_mes_zb_p/activity/CommonSeclecActivity.java

@@ -85,30 +85,35 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
             public void onTextChanged(CharSequence s, int start, int before, int count) { }
             @Override
             public void afterTextChanged(Editable s) {
-                if (s.length() >= 0) {
-                    String mSearchStr = s.toString().trim();
-                    LogUtil.i("mSearchStr",mSearchStr);
-                    List<ComDataBean> thisList = new ArrayList<>();
-                    for(int i=0;i<mList.size();i++){
-                        if(mList.get(i).getEm_defaulthsname().contains(mSearchStr) || mList.get(i).getEm_depart().contains(mSearchStr)||mList.get(i).getEm_name().contains(mSearchStr)
-                                ||mList.get(i).getEm_id().contains(mSearchStr)
-                                ||mList.get(i).getEm_code().contains(mSearchStr)){
-                            thisList.add(mList.get(i));
-                        }
-
-                        if(i == mList.size() -1){
-                            myAdapter = new ComListAdapter(thisList);
-                            commonRv.setAdapter(myAdapter);
-                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
-                        }
-                    }
-
-
-                } else {
-                    myAdapter = new ComListAdapter(mList);
-                    commonRv.setAdapter(myAdapter);
-
-                }
+                mList = new ArrayList<>();
+                myAdapter = new ComListAdapter(mList);
+                myAdapter.setmList(mList);
+                commonRv.setAdapter(myAdapter);
+                generate_detailedData("");
+//                if (s.length() >= 0) {
+//                    String mSearchStr = s.toString().trim();
+//                    LogUtil.i("mSearchStr",mSearchStr);
+//                    List<ComDataBean> thisList = new ArrayList<>();
+//                    for(int i=0;i<mList.size();i++){
+//                        if(mList.get(i).getEm_defaulthsname().contains(mSearchStr) || mList.get(i).getEm_depart().contains(mSearchStr)||mList.get(i).getEm_name().contains(mSearchStr)
+//                                ||mList.get(i).getEm_id().contains(mSearchStr)
+//                                ||mList.get(i).getEm_code().contains(mSearchStr)){
+//                            thisList.add(mList.get(i));
+//                        }
+//
+//                        if(i == mList.size() -1){
+//                            myAdapter = new ComListAdapter(thisList);
+//                            commonRv.setAdapter(myAdapter);
+//                            LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+//                        }
+//                    }
+//
+//
+//                } else {
+//                    myAdapter = new ComListAdapter(mList);
+//                    commonRv.setAdapter(myAdapter);
+//
+//                }
             }
         });
 
@@ -132,9 +137,12 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
                         || actionId == EditorInfo.IME_ACTION_SEND
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String data = mSearch.getText().toString().trim();
+                    mList = new ArrayList<>();
+                    myAdapter = new ComListAdapter(mList);
+                    myAdapter.setmList(mList);
+                    commonRv.setAdapter(myAdapter);
                     generate_detailedData(data);
 
-
                     return true;
                 }
                 return false;
@@ -168,6 +176,7 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void generate_detailedData(String data){//放大镜
+        progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDORDER_AMAGNIFYINGGLASS)
                 .method(Request.Method.GET)
@@ -176,7 +185,7 @@ public class CommonSeclecActivity extends BaseActivity implements View.OnClickLi
                 .addParam("which","form")
                 .addParam("caller","ProdInout!Appropriationout")
                 .addParam("field","pi_emcode")
-                .addParam("condition",mSearch.getText().toString().trim())//传编号
+                .addParam("condition","em_name like '%"+mSearch.getText().toString().trim()+"%'")//传编号
                 .addParam("page",savePage+"")
                 .addParam("pageSize",savepageSize+"")
                 .build(), new HttpCallback() {

app/src/main/java/com/uas/uas_mes_zb_p/bean/MessageOutboundEvents.java

@@ -0,0 +1,7 @@
+package com.uas.uas_mes_zb_p.bean;
+
+public class MessageOutboundEvents {
+    public MessageOutboundEvents(String s) {
+
+    }
+}

app/src/main/java/com/uas/uas_mes_zb_p/fragment/OutboundLis_Two_fragment.java

@@ -35,7 +35,7 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.uas_mes_zb_p.R;
 import com.uas.uas_mes_zb_p.activity.FunctionActivity;
-import com.uas.uas_mes_zb_p.bean.MessageEvents;
+import com.uas.uas_mes_zb_p.bean.MessageOutboundEvents;
 import com.uas.uas_mes_zb_p.bean.OutboundListBean;
 import com.uas.uas_mes_zb_p.global.GloableParams;
 import com.uas.uas_mes_zb_p.util.CameraUtil;
@@ -262,6 +262,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                 CommonUtil.toastNoRepeat(mActivity, failStr);
 
                 setFilterTableData(mFilterStorageInBeans);
+                progressDialog.dismiss();
             }
         });
     }
@@ -336,7 +337,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
         }
     }
     @Subscribe
-    public void onMessageEvent(MessageEvents event) {
+    public void onMessageEvent(MessageOutboundEvents event) {
         getDatalistCodes(storage_recharge_collect_et.getText().toString().trim());
     }
 
@@ -436,6 +437,7 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
             }
         }
     }
+
     @Override
     public void onDestroy() {
         super.onDestroy();

app/src/main/java/com/uas/uas_mes_zb_p/fragment/OutboundListAdd_Fragment.java

@@ -37,6 +37,7 @@ import com.bin.david.form.listener.OnColumnItemClickListener;
 import com.uas.uas_mes_zb_p.R;
 import com.uas.uas_mes_zb_p.activity.CommonSeclecActivity;
 import com.uas.uas_mes_zb_p.activity.FunctionActivity;
+import com.uas.uas_mes_zb_p.bean.MessageOutboundEvents;
 import com.uas.uas_mes_zb_p.bean.OutBoundListAddDalieBean;
 import com.uas.uas_mes_zb_p.global.GloableParams;
 import com.uas.uas_mes_zb_p.listener.MyEditorActionListener;
@@ -53,6 +54,8 @@ import com.uas.uas_mes_zb_p.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -328,7 +331,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                 if (dataObject != null) {
                     bar_remain = FastjsonUtil.getText(dataObject, "bar_remain");
                     initEditPopupWindow();
-
+                    EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
                 }
 
             }
@@ -338,6 +341,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
                 storage_recharge_collect_ets.setText("");
+                EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
 
             }
         });
@@ -360,7 +364,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             string_va_id=va_ids;
         }
 
-        String pUserNames = SharedPreUtil.getString(mActivity, "pUserNames", null);
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_SAVE_OUTBOUNDLIST)
                 .method(Request.Method.GET)
@@ -370,7 +373,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                 .addParam("pi_id", string_va_id)
                 .addParam("ifcancel",ifcancel)//是否勾选了取消采集
                 .addParam("remain",number)//手动输入的数
-                .addParam("em_code",pUserNames)//账号
+                .addParam("em_code",ed_picking_code.getText().toString().trim())//界面领料人code
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -457,6 +460,8 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
+                getDataCommitList();
+
 
             }
         });
@@ -614,7 +619,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                     mFilterStorageInBeans = list;//PI_INOUTNO
                     setFilterTableData(mFilterStorageInBeans);
 
-
+                    EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
                     progressDialog.dismiss();
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -659,6 +664,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
+                getDataCommitList();
 
             }
         });
@@ -688,6 +694,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
+                getDataCommitList();
 
             }
         });
@@ -730,7 +737,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(mActivity, CommonSeclecActivity.class);
-                intent.putExtra("title", "岗位资源");
+                intent.putExtra("title", "人员资料");
                 intent.putExtra("type", 1);
                 startActivityForResult(intent, Constants.FLAG.GET_COMMON_ITEM);
             }
@@ -777,11 +784,13 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+        EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
         return false;
     }
 
     @Override
     public boolean onFragmentBackPressed() {
+        EventBus.getDefault().post(new MessageOutboundEvents("提交单据后刷新列表"));
         return false;
     }
 
@@ -817,7 +826,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                 break;
             case R.id.outbound_search_im://放大镜
                 Intent intent = new Intent(mActivity, CommonSeclecActivity.class);
-                intent.putExtra("title", "岗位资源");
+                intent.putExtra("title", "人员资料");
                 intent.putExtra("type", 1);
                 startActivityForResult(intent, Constants.FLAG.GET_COMMON_ITEMS);
                 break;

app/src/main/java/com/uas/uas_mes_zb_p/fragment/StoragerechargeAdd_Fragment.java

@@ -262,6 +262,7 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
                 storage_recharge_collect_ets.setText("");
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
 
             }
         });
@@ -301,6 +302,7 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
 
             }
         });
@@ -395,7 +397,7 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
 
                     mFilterStorageInBeans = list;//PI_INOUTNO
                     setFilterTableData(mFilterStorageInBeans);
-
+                    EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
 
                     progressDialog.dismiss();
                 } catch (Exception e) {
@@ -409,6 +411,7 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
                 setFilterTableData(new ArrayList<>());
                 CommonUtil.toastNoRepeat(mActivity, failStr);
                 setFilterTableData(mFilterStorageInBeans);
+                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
             }
         });
     }

app/src/main/java/com/uas/uas_mes_zb_p/tools/VolleyUtil.java

@@ -1065,7 +1065,6 @@ public class VolleyUtil {
     public static void requestUserLogin(Context pContext, String pUrl, int pMethod, int pRequestType,
                                         final String pMaster, final String pUserName, final String pPassword) {
 
-        SharedPreUtil.saveString(pContext,"pUserNames",pUserName);
 
         //通知连接页面类型
         getVolleyUtil();

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

@@ -12,7 +12,7 @@
     <com.uas.uas_mes_zb_p.view.ClearableEditText
         android:id="@+id/fl_search_actext"
         style="@style/Search"
-        android:layout_height="35dp"
+        android:layout_height="@dimen/dp_40"
         android:background="@drawable/shape_from_edit"
         android:padding="6dp"
         android:imeOptions="actionSend"

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

@@ -4,67 +4,79 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white">
+
+
     <LinearLayout
+        android:paddingLeft="@dimen/dp_10"
+        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="@color/white"
-        android:padding="@dimen/textsize_16">
+        android:layout_height="wrap_content">
+
         <LinearLayout
-            android:orientation="horizontal"
+            android:layout_gravity="center"
+            android:layout_weight="1"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:layout_gravity="center"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_line_edittext">
+
+            <com.uas.uas_mes_zb_p.view.ClearableEditText
+                android:id="@+id/storage_recharge_collect_ets"
+                style="@style/EditTextStyle"
                 android:layout_weight="1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg_line_edittext">
+                android:background="@null"
+                android:focusable="true"
+                android:lines="1"
+                android:focusableInTouchMode="true"
+                android:hint="请采集单号"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
 
-                <com.uas.uas_mes_zb_p.view.ClearableEditText
-                    android:id="@+id/storage_recharge_collect_ets"
-                    style="@style/EditTextStyle"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    android:focusable="true"
-                    android:lines="1"
-                    android:focusableInTouchMode="true"
-                    android:hint="请采集单号"
-                    android:imeOptions="actionSend"
-                    android:textColor="@color/black" />
-
-                <ImageView
-                    android:id="@+id/storage_recharge_scan_ivs"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginRight="10dp"
-                    android:clickable="false"
-                    android:src="@drawable/ic_edittext_scan" />
+            <ImageView
+                android:id="@+id/storage_recharge_scan_ivs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginRight="10dp"
+                android:clickable="false"
+                android:src="@drawable/ic_edittext_scan" />
 
-            </LinearLayout>
-           <LinearLayout
-               android:layout_gravity="center"
-               android:background="@color/white"
-                android:orientation="vertical"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content">
-               <CheckBox
-                   android:layout_gravity="center"
-                   android:id="@+id/add_checkbos"
-                   android:text="取消采集"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content">
-               </CheckBox>
-               <CheckBox
-                   android:layout_gravity="center"
-                   android:id="@+id/ck_special_outbound"
-                   android:text="特殊出库"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content">
-               </CheckBox>
-           </LinearLayout>
         </LinearLayout>
+        <LinearLayout
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <CheckBox
+                android:layout_gravity="center"
+                android:id="@+id/add_checkbos"
+                android:text="取消采集"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </CheckBox>
+            <CheckBox
+                android:layout_gravity="center"
+                android:id="@+id/ck_special_outbound"
+                android:text="特殊出库"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </CheckBox>
+        </LinearLayout>
+    </LinearLayout>
+    <ScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:padding="5dp">
 
         <LinearLayout
             android:background="@color/white"
@@ -91,7 +103,7 @@
                 android:textSize="16sp" />
 
         </LinearLayout>
-            <LinearLayout
+        <LinearLayout
                 android:orientation="horizontal"
                 android:background="@color/white"
                 android:id="@+id/jlt_storage_in_barcode_line"
@@ -139,10 +151,6 @@
                 </LinearLayout>
 
             </LinearLayout>
-
-
-
-
         <LinearLayout
             android:background="@color/white"
             android:layout_width="match_parent"
@@ -155,7 +163,7 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:minWidth="60dp"
-                android:text="领用\n部门"
+                android:text="部门"
                 android:textColor="@color/body_text_1"
                 android:textSize="16sp" />
 
@@ -166,6 +174,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:lines="1"
+                android:layout_height="30dp"
                 android:editable="false" >
             </EditText>
             <EditText
@@ -175,6 +184,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:lines="1"
+                android:layout_height="30dp"
                 android:editable="false" >
 
             </EditText>
@@ -280,48 +290,55 @@
 
         <com.bin.david.form.core.SmartTable
             android:layout_marginTop="@dimen/textsize_20"
+            android:layout_marginBottom="@dimen/textsize_20"
             android:id="@+id/jlt_storage_in_filter_list_sts"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <Button
-                android:id="@+id/jlt_storage_in_generate_detailed_btn"
-                style="@style/ButtonStyle"
-                android:layout_width="0dp"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:text="明细"
-                />
-            <Button
-                android:id="@+id/jlt_storage_in_barcode_save_btn"
-                style="@style/ButtonStyle"
-                android:layout_width="0dp"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:text="提交"
-                />
-            <Button
-                android:id="@+id/jlt_storage_in_audit_btn"
-                style="@style/ButtonStyle"
-                android:layout_width="0dp"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:text="审核"
-                />
-            <Button
-                android:id="@+id/jlt_outbound_in_post_btn"
-                style="@style/ButtonStyle"
-                android:layout_width="0dp"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:text="过账"
-                />
+            android:layout_height="300dp" />
+
+    </LinearLayout>
+    </ScrollView>
+
+
+
+    <LinearLayout
+        android:background="@color/white"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/jlt_storage_in_generate_detailed_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="5dp"
+            android:layout_weight="1"
+            android:text="明细"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_barcode_save_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="5dp"
+            android:layout_weight="1"
+            android:text="提交"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_audit_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="5dp"
+            android:layout_weight="1"
+            android:text="审核"
+            />
+        <Button
+            android:id="@+id/jlt_outbound_in_post_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="5dp"
+            android:layout_weight="1"
+            android:text="过账" />
 
-        </LinearLayout>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -5,51 +5,59 @@
     android:orientation="vertical"
     android:background="@color/white">
     <LinearLayout
+        android:padding="@dimen/sp_16"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="@color/white"
-        android:padding="@dimen/textsize_16">
+        android:layout_height="wrap_content">
         <LinearLayout
-            android:orientation="horizontal"
+            android:layout_weight="1"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_line_edittext">
+
+            <com.uas.uas_mes_zb_p.view.ClearableEditText
+                android:id="@+id/storage_recharge_collect_ets"
+                style="@style/EditTextStyle"
                 android:layout_weight="1"
-                android:layout_width="match_parent"
+                android:background="@null"
+                android:focusable="true"
+                android:lines="1"
+                android:focusableInTouchMode="true"
+                android:hint="请采集单号"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+
+            <ImageView
+                android:id="@+id/storage_recharge_scan_ivs"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/bg_line_edittext">
-
-                <com.uas.uas_mes_zb_p.view.ClearableEditText
-                    android:id="@+id/storage_recharge_collect_ets"
-                    style="@style/EditTextStyle"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    android:focusable="true"
-                    android:lines="1"
-                    android:focusableInTouchMode="true"
-                    android:hint="请采集单号"
-                    android:imeOptions="actionSend"
-                    android:textColor="@color/black" />
-
-                <ImageView
-                    android:id="@+id/storage_recharge_scan_ivs"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginRight="10dp"
-                    android:clickable="false"
-                    android:src="@drawable/ic_edittext_scan" />
-
-            </LinearLayout>
-            <CheckBox
                 android:layout_gravity="center"
-                android:id="@+id/add_checkbos"
-                android:text="取消采集"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-            </CheckBox>
+                android:layout_marginRight="10dp"
+                android:clickable="false"
+                android:src="@drawable/ic_edittext_scan" />
+
         </LinearLayout>
+        <CheckBox
+            android:layout_gravity="center"
+            android:id="@+id/add_checkbos"
+            android:text="取消采集"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+        </CheckBox>
+    </LinearLayout>
+    <ScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:padding="@dimen/textsize_16">
+
 
         <LinearLayout
             android:background="@color/white"
@@ -100,6 +108,7 @@
                 android:background="@drawable/bg_line_edittext"
                 android:layout_width="0dp"
                 android:layout_weight="1"
+                android:layout_height="30dp"
                 android:lines="1"
                 android:editable="false">
             </EditText>
@@ -127,7 +136,9 @@
                 android:background="@drawable/bg_line_edittext"
                 android:layout_width="0dp"
                 android:layout_weight="1"
+                android:layout_height="30dp"
                 android:lines="1"
+                android:textSize="10sp"
                 android:editable="false" >
             </EditText>
 
@@ -157,6 +168,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:lines="1"
+                android:layout_height="30dp"
                 android:background="@drawable/bg_line_edittext"
                 android:hint="请输入送货单号" />
         </LinearLayout>
@@ -164,41 +176,45 @@
             android:layout_marginTop="@dimen/textsize_20"
             android:id="@+id/jlt_storage_in_filter_list_sts"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <Button
-                android:id="@+id/jlt_storage_in_generate_detailed_btn"
-                style="@style/ButtonStyle"
-                android:layout_width="0dp"
-                android:layout_margin="12dp"
-                android:layout_weight="1"
-                android:text="生成明细"
-                android:enabled="false"
-                />
-            <Button
-                android:id="@+id/jlt_storage_in_barcode_save_btn"
-                style="@style/ButtonStyle"
-                android:layout_width="0dp"
-                android:layout_margin="12dp"
-                android:layout_weight="1"
-                android:text="提交"
-                android:enabled="false"
-                />
-            <Button
-                android:id="@+id/jlt_storage_in_audit_btn"
-                style="@style/ButtonStyle"
-                android:layout_width="0dp"
-                android:layout_margin="12dp"
-                android:layout_weight="1"
-                android:text="审核"
-                android:enabled="false"
-                />
+            android:layout_height="300dp"
+            android:layout_marginBottom="@dimen/dp_10"/>
 
-        </LinearLayout>
     </LinearLayout>
+    </ScrollView>
+    <LinearLayout
+        android:background="@color/white"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/jlt_storage_in_generate_detailed_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="生成明细"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_barcode_save_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="提交"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_audit_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="审核"
+            android:enabled="false"
+            />
 
+    </LinearLayout>
 </LinearLayout>