更改出库扫描机界面逻辑，修改出库已采集列表界面的接口地址和逻辑

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

@@ -37,8 +37,26 @@ public class JLTMaterialBean implements Serializable {
     private String PR_DETAIL;//物料名称
     private String PR_SPEC;//物料规格
     private String title;//客户
+    private String MADE;
     private String DC;//入库日期
     private double HAVEREADY_ALL;//已采总数
+    private String LOTNO;
+
+    public String getLOTNO() {
+        return LOTNO;
+    }
+
+    public void setLOTNO(String LOTNO) {
+        this.LOTNO = LOTNO;
+    }
+
+    public String getMADE() {
+        return MADE;
+    }
+
+    public void setMADE(String MADE) {
+        this.MADE = MADE;
+    }
 
     public JLTMaterialBean() {
     }

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

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

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

@@ -23,6 +23,7 @@ import com.uas.yuejiahong.activity.FunctionActivity;
 import com.uas.yuejiahong.adapter.JLTStorageInDoneAdapter;
 import com.uas.yuejiahong.adapter.SecondaryListAdapter;
 import com.uas.yuejiahong.bean.JLTStorageModelBean;
+import com.uas.yuejiahong.bean.OutboundScanningBean;
 import com.uas.yuejiahong.global.GloableParams;
 import com.uas.yuejiahong.listener.MyEditorActionListener;
 import com.uas.yuejiahong.util.CommonUtil;
@@ -33,6 +34,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;
 
@@ -112,7 +115,7 @@ public class DeliveryOfCargoFromStorageHaveBeenTakenFragment extends BaseFragmen
         String outBox = mSearchEditText.getText().toString().trim();
 
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ADDRESS_JLT_RECEIVING_GETCOLLECTLISTBYBOX)
+                .url(GloableParams.ADDRESS_JLT_OUTBOUND_GETCOLLECTLISTBYBOX)
                 .method(Request.Method.GET)
                 .tag(TAG + "getcollectlistbybox")
                 .addParam("pi_ids", mPiids)
@@ -240,7 +243,7 @@ public class DeliveryOfCargoFromStorageHaveBeenTakenFragment extends BaseFragmen
     private void deleteAllCollect() {
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ADDRESS_PDAIOOUT_DELETEALLPREBIO)
+                .url(GloableParams.ADDRESS_OUTBOUND_DELETEALLPREBIO)
                 .method(Request.Method.POST)
                 .tag(TAG + "deleteallprebio")
                 .flag(0)
@@ -256,6 +259,7 @@ public class DeliveryOfCargoFromStorageHaveBeenTakenFragment extends BaseFragmen
                 }
                 mJLTStorageInDoneAdapter.notifyDataSetChanged();
                 CommonUtil.toastNoRepeat(mActivity, "撤销采集成功！");
+                EventBus.getDefault().post(new OutboundScanningBean("刷新出库扫描界面"));
             }
 
             @Override
@@ -351,7 +355,7 @@ public class DeliveryOfCargoFromStorageHaveBeenTakenFragment extends BaseFragmen
     public void onSubItemLongClick(int adapterPosition, int groupItemIndex, int subItemIndex, JLTStorageModelBean jltStorageModelBean) {
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ADDRESS_PDAIOOUT_DELELTEPREBIOBYID)
+                .url(GloableParams.ADDRESS_OUTBOUND_DELELTEPREBIOBYID)
                 .method(Request.Method.POST)
                 .tag(TAG + "deletebyid")
                 .flag(0)
@@ -364,6 +368,7 @@ public class DeliveryOfCargoFromStorageHaveBeenTakenFragment extends BaseFragmen
                 List<SecondaryListAdapter.SecondaryListBean<String, JLTStorageModelBean>> datas = mJLTStorageInDoneAdapter.getDatas();
                 datas.get(groupItemIndex).getSubItems().remove(subItemIndex);
                 mJLTStorageInDoneAdapter.notifyItemRemoved(adapterPosition);
+                EventBus.getDefault().post(new OutboundScanningBean("刷新出库扫描界面"));
             }
 
             @Override

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

@@ -39,6 +39,7 @@ import com.uas.yuejiahong.activity.FunctionActivity;
 import com.uas.yuejiahong.adapter.FormAdapter;
 import com.uas.yuejiahong.bean.FormBean;
 import com.uas.yuejiahong.bean.JLTMaterialBean;
+import com.uas.yuejiahong.bean.OutboundScanningBean;
 import com.uas.yuejiahong.global.GloableParams;
 import com.uas.yuejiahong.listener.MyEditorActionListener;
 import com.uas.yuejiahong.util.CameraUtil;
@@ -53,6 +54,9 @@ import com.uas.yuejiahong.view.ClearableEditText;
 import com.uas.yuejiahong.view.RecyclerItemDecoration;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -85,7 +89,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
     private RecyclerView mFormRecyclerView;
 
     private List<JLTMaterialBean> mTableStorageInBeans;
-    private Column<String> mLocationColumn, mBarcodeColumn, mDcColumn;
+    private Column<String> mLocationColumn, mperiodColumn, mlotnoColumn, mDcColumn;
     private Column<Double> mQuantityColumn;
     private TableData<JLTMaterialBean> mTableData;
 
@@ -98,6 +102,8 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
     private RecyclerView mMenuRecyclerView;
     private BaseQuickAdapter<String, BaseViewHolder> mMenuAdapter;
     private List<String> mMenuList;
+    private ClearableEditText jlt_pick_material_out_scan_barcode_space;
+    private ImageView image_pick_material_out_scan_barcode_space;
 
     @Override
     public void onDestroyView() {
@@ -150,6 +156,8 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
         mSpecTextView = root.findViewById(R.id.jlt_pick_material_out_scan_spec_tv);
         mCustomerTextView = root.findViewById(R.id.jlt_pick_material_out_scan_customer_tv);
         mSupplierEditText = root.findViewById(R.id.jlt_pick_material_out_scan_supplier_et);
+        jlt_pick_material_out_scan_barcode_space = root.findViewById(R.id.jlt_pick_material_out_scan_barcode_space);
+        image_pick_material_out_scan_barcode_space = root.findViewById(R.id.image_pick_material_out_scan_barcode_space);
 
         mOperateLinearLayout = root.findViewById(R.id.pick_material_out_scan_operate_ll);
         mPkgLinearLayout = root.findViewById(R.id.pick_material_out_scan_pkg_ll);
@@ -180,8 +188,9 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
 //        mMenuList.add("特殊出库");
 
         mLocationColumn = new Column<String>("库位", "BAR_LOCATION");
-        mBarcodeColumn = new Column<String>("条码号", "BARCODE");
-        mDcColumn = new Column<String>("入库日期", "DC");
+        mperiodColumn = new Column<String>("周期", "MADE");
+        mlotnoColumn = new Column<String>("LOTNO", "LOTNO");
+        mDcColumn = new Column<String>("DC", "DC");
         mQuantityColumn = new ArrayColumn<Double>("数量", "quantity", false,
                 new IFormat<Double>() {
                     @Override
@@ -306,6 +315,8 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
 
     @Override
     protected void initDatas() {
+        //注册
+        EventBus.getDefault().register(this);
         getPickModel();
     }
 
@@ -340,6 +351,8 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                                 materialBean.setBAR_TRAYNO(FastjsonUtil.getDouble(dataObject, "TRAYNO"));
                                 materialBean.setBARCODE(FastjsonUtil.getText(dataObject, "BARCODE"));
                                 materialBean.setDC(FastjsonUtil.getText(dataObject, "DC"));
+                                materialBean.setMADE(FastjsonUtil.getText(dataObject, "MADE"));
+                                materialBean.setLOTNO(FastjsonUtil.getText(dataObject, "LOTNO"));
 
                                 mTableStorageInBeans.add(materialBean);
                             }
@@ -362,7 +375,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
 
     private void setTableData() {
         mTableData = new TableData<JLTMaterialBean>("库位提示", mTableStorageInBeans,
-                mLocationColumn, mBarcodeColumn, mDcColumn, mQuantityColumn);
+                mLocationColumn, mperiodColumn, mlotnoColumn,mDcColumn, mQuantityColumn);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
             @Override
@@ -510,7 +523,7 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
     /**
      * 设置页面数据
      */
-    private void setEditData() {
+    private void  setEditData() {
         if (mMaterialBean != null) {
             double restqty = mMaterialBean.getRESTQTY();
             mInoutnoTextView.setText(TextUtils.isEmpty(mPiInoutno) ? mMaterialBean.getINOUTNO() : mPiInoutno);
@@ -531,11 +544,15 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
      * 获取条码信息
      */
     private void barcodeParse() {
+        String jlt_pick_material_out_scan_barcode_spacetrim = jlt_pick_material_out_scan_barcode_space.getText().toString().trim();
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (TextUtils.isEmpty(barcode)) {
             return;
         }
-
+        if (TextUtils.isEmpty(jlt_pick_material_out_scan_barcode_spacetrim)){
+            CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
+            return;
+        }
         if (mMaterialBean == null) {
             CommonUtil.toastNoRepeat(mActivity, "待备任务数据为空");
             return;
@@ -554,33 +571,73 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                 .method(Request.Method.POST)
                 .addParam("barcode", barcode)
                 .addParam("pdid", mPdId)
-                .addParam("specialOut", "F")
+                .addParam("specialOut", jlt_pick_material_out_scan_barcode_spacetrim)//输入框中仓位值(改)(必填、不清空)
 //                .addParam("outdata", JSON.toJSONString(params))
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
+//                try {
+//                    mModelEditText.requestFocus();
+//                    String result = o.toString();
+//                    JSONObject resultObject = JSON.parseObject(result);
+//                    JSONObject dataObject = resultObject.getJSONObject("data");
+//                    if (dataObject != null) {
+//                        JSONObject billInfoObject = dataObject.getJSONObject("billInfo");
+//                        JSONObject barcodeinfoObject = dataObject.getJSONObject("barcodeinfo");
+//
+//                        if (billInfoObject != null) {
+//                            mMaterialBean = new JLTMaterialBean();
+//                            setMaterial(billInfoObject);
+//
+//                            setEditData();
+//
+//                            mPN = FastjsonUtil.getText(billInfoObject, "PN");
+//                            mModelEditText.setText(mPN);
+//                        }
+//
+//                        if (barcodeinfoObject != null) {
+//                            setPageData(barcodeinfoObject);
+//                        }
+//                    }
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//
+//
+//                getPickModelCheck();
+
                 try {
-                    mModelEditText.requestFocus();
                     String result = o.toString();
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONObject dataObject = resultObject.getJSONObject("data");
                     if (dataObject != null) {
-                        JSONObject billInfoObject = dataObject.getJSONObject("billInfo");
-                        JSONObject barcodeinfoObject = dataObject.getJSONObject("barcodeinfo");
+                        CommonUtil.toastNoRepeat(mActivity, "拣货成功");
+                        double restqty = FastjsonUtil.getDouble(dataObject, "NEEDREADY");
+                        double pickqty = FastjsonUtil.getDouble(dataObject, "HAVEREADY");
+                        double pickAll = FastjsonUtil.getDouble(dataObject, "HAVEREADY_ALL");
+                        mMaterialBean.setRESTQTY(restqty);
+                        mMaterialBean.setBAR_REMAIN(pickqty);
+                        mMaterialBean.setHAVEREADY_ALL(pickAll);
 
-                        if (billInfoObject != null) {
-                            mMaterialBean = new JLTMaterialBean();
-                            setMaterial(billInfoObject);
+                        mTodoTextView.setText(CommonUtil.doubleFormat(restqty));
+                        mDoneTextView.setText(CommonUtil.doubleFormat(pickqty));
+                        mDoneAllTextView.setText(CommonUtil.doubleFormat(pickAll));
 
-                            setEditData();
+//                        SharedPreUtil.saveFloat(mActivity, Constants.FLAG.JLT_PICK_MATERIAL_QUANTITY, (float) restqty);
+                        resetState(true);
+                        if (restqty <= 0) {
+                            CommonUtil.toastNoRepeat(mActivity, "当前型号已采集完成，自动切换至下一型号");
+                            getPickModel();
+                        } else {
+                            if (mMenuRadioGroup.getCheckedRadioButtonId() == R.id.pick_material_out_scan_sign_rb) {
+                                getLocpickList();
+                                getPickModel();
 
-                            mPN = FastjsonUtil.getText(billInfoObject, "PN");
-                            mModelEditText.setText(mPN);
-                        }
 
-                        if (barcodeinfoObject != null) {
-                            setPageData(barcodeinfoObject);
+                            } else {
+                                mMenuRadioGroup.check(R.id.pick_material_out_scan_sign_rb);
+                            }
                         }
                     }
                 } catch (Exception e) {
@@ -588,15 +645,15 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                 }
 
 
-                getPickModelCheck();
             }
 
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
+//                CommonUtil.toastNoRepeat(mActivity, failStr);
+//                mBarcodeEditText.setText("");
+//                mBarcodeEditText.requestFocus();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
-                mBarcodeEditText.setText("");
-                mBarcodeEditText.requestFocus();
             }
         });
     }
@@ -1065,5 +1122,15 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
             }
         }
     }
-
+    @Subscribe
+    public void onPermissions(OutboundScanningBean bean){
+        getLocpickList();//库位提示
+        getPickModel();//第一条数据
+    }
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        //注销
+        EventBus.getDefault().unregister(this);
+    }
 }

app/src/main/java/com/uas/yuejiahong/global/GloableParams.java

@@ -213,6 +213,7 @@ public class GloableParams {
     public static String ADDRESS_JLT_RECEIVING_SAVEBARCODE;
     public static String ADDRESS_JLT_RECEIVING_GETNEEDLIST;
     public static String ADDRESS_JLT_RECEIVING_GETCOLLECTLISTBYBOX;
+    public static String ADDRESS_JLT_OUTBOUND_GETCOLLECTLISTBYBOX;
     public static String ADDRESS_JLT_RECEIVING_GETOUTBOXDATA;
     public static String ADDRESS_JLT_RECEIVING_DELETEOUTBOX;
     public static String ADDRESS_JLT_RECEIVING_CHECKOUTBOX;
@@ -221,7 +222,9 @@ public class GloableParams {
     public static String ADDRESS_JLT_RECEIVING_GETINDATALIST;
     public static String ADDRESS_RECEIVING_NEWBAOCODEIO;
     public static String ADDRESS_PDAIOOUT_DELETEALLPREBIO;
+    public static String ADDRESS_OUTBOUND_DELETEALLPREBIO;
     public static String ADDRESS_PDAIOOUT_DELELTEPREBIOBYID;
+    public static String ADDRESS_OUTBOUND_DELELTEPREBIOBYID;
     public static String ADDRESS_PDAIOOUT_CHECKBAOCODEIOPN;
     public static String ADDRESS_BARSTOCK_SEARCHBYLOCATION;
     public static String ADDRESS_PDAIOOUT_GETPRODINOUTOUTLIST;
@@ -254,6 +257,8 @@ public class GloableParams {
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETNEEDLIST = "/api/pda/receiving/getNeedList.action";
     //入库已采集列表
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETCOLLECTLISTBYBOX = "/api/pda/receiving/getCollectListByBox.action";
+    //出库已采集列表
+    private static final String ADDRESSTAIL_JLT_OUTBOUND_GETCOLLECTLISTBYBOX = "/api/pda/receiving/getCollectListByBoxOut.action";
     //入库条码校验
     private static final String ADDRESSTAIL_RECEIVING_BARCODEPARSE2 = "/api/pda/receiving/barcodeParse2.action";
     //入库采集
@@ -276,6 +281,11 @@ public class GloableParams {
     private static final String ADDRESSTAIL_PDAIOOUT_DELETEALLPREBIO = "/api/pdaio/pdaioOut/deleteAllPrebio.action";
     //撤销单条明细采集
     private static final String ADDRESSTAIL_PDAIOOUT_DELELTEPREBIOBYID = "/api/pdaio/pdaioOut/deleltePreBioById.action";
+    //出库撤销采集
+    private static final String ADDRESSTAIL_OUTBOUND_DELETEALLPREBIO = "/api/pdaio/pdaioOut/deleteAllPrebioOut.action";
+
+    //出库撤销单条明细采集
+    private static final String ADDRESSTAIL_OUTBOUND_DELELTEPREBIOBYID = "/api/pdaio/pdaioOut/deleltePreBioByIdOut.action";
     //出库条码校验
     private static final String ADDRESSTAIL_PDAIOOUT_CHECKBAOCODEIOPN = "/api/pdaio/pdaioOut/checkBaocodeioPN.action";
 
@@ -1018,6 +1028,8 @@ public class GloableParams {
         GloableParams.ADDRESS_JLT_RECEIVING_SAVEBARCODE = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_SAVEBARCODE;
         GloableParams.ADDRESS_JLT_RECEIVING_GETNEEDLIST = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_GETNEEDLIST;
         GloableParams.ADDRESS_JLT_RECEIVING_GETCOLLECTLISTBYBOX = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_GETCOLLECTLISTBYBOX;
+        GloableParams.ADDRESS_JLT_OUTBOUND_GETCOLLECTLISTBYBOX = uriHead + GloableParams.ADDRESSTAIL_JLT_OUTBOUND_GETCOLLECTLISTBYBOX;
+
         GloableParams.ADDRESS_JLT_RECEIVING_GETOUTBOXDATA = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_GETOUTBOXDATA;
         GloableParams.ADDRESS_JLT_RECEIVING_DELETEOUTBOX = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_DELETEOUTBOX;
         GloableParams.ADDRESS_JLT_RECEIVING_CHECKOUTBOX = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_CHECKOUTBOX;
@@ -1026,7 +1038,10 @@ public class GloableParams {
         GloableParams.ADDRESS_JLT_RECEIVING_GETINDATALIST = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_GETINDATALIST;
         GloableParams.ADDRESS_RECEIVING_NEWBAOCODEIO = uriHead + GloableParams.ADDRESSTAIL_RECEIVING_NEWBAOCODEIO;
         GloableParams.ADDRESS_PDAIOOUT_DELETEALLPREBIO = uriHead + GloableParams.ADDRESSTAIL_PDAIOOUT_DELETEALLPREBIO;
+        GloableParams.ADDRESS_OUTBOUND_DELETEALLPREBIO = uriHead + GloableParams.ADDRESSTAIL_OUTBOUND_DELETEALLPREBIO;
+
         GloableParams.ADDRESS_PDAIOOUT_DELELTEPREBIOBYID = uriHead + GloableParams.ADDRESSTAIL_PDAIOOUT_DELELTEPREBIOBYID;
+        GloableParams.ADDRESS_OUTBOUND_DELELTEPREBIOBYID = uriHead + GloableParams.ADDRESSTAIL_OUTBOUND_DELELTEPREBIOBYID;
         GloableParams.ADDRESS_PDAIOOUT_CHECKBAOCODEIOPN = uriHead + GloableParams.ADDRESSTAIL_PDAIOOUT_CHECKBAOCODEIOPN;
         GloableParams.ADDRESS_BARSTOCK_SEARCHBYLOCATION = uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_SEARCHBYLOCATION;
         GloableParams.ADDRESS_PDAIOOUT_GETPRODINOUTOUTLIST = uriHead + GloableParams.ADDRESSTAIL_PDAIOOUT_GETPRODINOUTOUTLIST;

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

@@ -21,7 +21,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:text="单号"
+                android:text="@string/tv_odd"
                 android:textColor="#333333"
                 android:textSize="13sp" />
 
@@ -46,7 +46,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:text="已采总数"
+                android:text="@string/jlt_pick_material_out_scan_doneall_tv"
                 android:textColor="#333333"
                 android:textSize="13sp" />
 
@@ -72,7 +72,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="物料"
+            android:text="@string/jlt_pick_material_out_scan_prod_tv"
             android:textColor="#333333"
             android:textSize="13sp" />
 
@@ -97,7 +97,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="型号"
+            android:text="@string/jlt_pick_material_out_scan_model_tv"
             android:textColor="#333333"
             android:textSize="13sp" />
 
@@ -122,7 +122,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="客户"
+            android:text="@string/jlt_pick_material_out_scan_customer_tv"
             android:textColor="#333333"
             android:textSize="13sp" />
 
@@ -152,7 +152,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="待采"
+                android:text="@string/jlt_pick_material_out_scan_todo_tv"
                 android:textColor="#333333"
                 android:textSize="13sp" />
 
@@ -175,7 +175,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="已采"
+                android:text="@string/jlt_pick_material_out_scan_done_tv"
                 android:textColor="#333333"
                 android:textSize="13sp" />
 
@@ -303,7 +303,7 @@
                 android:background="@null"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:hint="请采集条码号/二维码"
+                android:hint="@string/string_barcode"
                 android:imeOptions="actionSend"
                 android:minHeight="34dp"
                 android:textColor="@color/black" />
@@ -317,6 +317,34 @@
                 android:clickable="false"
                 android:src="@drawable/ic_edittext_scan" />
         </LinearLayout>
+        <LinearLayout
+            android:layout_marginTop="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_line_edittext">
+
+            <com.uas.yuejiahong.view.ClearableEditText
+                android:id="@+id/jlt_pick_material_out_scan_barcode_space"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@null"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="@string/string_barcodec"
+                android:imeOptions="actionSend"
+                android:minHeight="34dp"
+                android:textColor="@color/black" />
+
+            <ImageView
+                android:visibility="gone"
+                android:id="@+id/image_pick_material_out_scan_barcode_space"
+                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>
 
         <RadioGroup
             android:id="@+id/pick_material_out_scan_menu_rg"
@@ -327,6 +355,7 @@
             android:paddingBottom="6dp">
 
             <RadioButton
+                android:visibility="gone"
                 android:id="@+id/pick_material_out_scan_info_rb"
                 android:layout_width="0dp"
                 android:layout_height="30dp"
@@ -346,7 +375,7 @@
                 android:button="@null"
                 android:checked="true"
                 android:gravity="center"
-                android:text="库位提示"
+                android:text="@string/pick_material_out_scan_sign_rb"
                 android:textColor="@color/selector_radio_text_color" />
         </RadioGroup>
     </LinearLayout>

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

@@ -15,7 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
-            android:text="单号："
+            android:text="@string/storage_common_inoutno_tv"
             android:textColor="@color/body_text_1"
             android:textSize="@dimen/textsize_14" />
 
@@ -39,7 +39,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
-            android:text="客户："
+            android:text="@string/storage_common_customer_tv"
             android:textColor="@color/body_text_1"
             android:textSize="@dimen/textsize_14" />
 

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

@@ -19,7 +19,7 @@
             android:layout_weight="1"
             android:background="@drawable/shape_msg_block"
             android:drawableLeft="@drawable/icon_search"
-            android:hint="搜索"
+            android:hint="@string/btn_search"
             android:imeOptions="actionSearch"
             android:paddingLeft="5dp" />
 
@@ -39,7 +39,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="false"
-            android:text="我的" />
+            android:text="@string/pda_wms_in_filter_mine_cb" />
     </LinearLayout>
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -76,7 +76,7 @@
             style="@style/ButtonStyle"
             android:layout_width="100dp"
             android:layout_height="36dp"
-            android:text="合并出库"
+            android:text="@string/pda_wms_in_filter_list_multiple_tv"
             android:textSize="14sp" />
     </LinearLayout>
 </LinearLayout>

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

@@ -335,6 +335,7 @@
     <string name="submit_success">提交成功</string>
     <string name="delete_success">删除成功</string>
     <string name="string_barcode">条码</string>
+    <string name="string_barcodec">仓位</string>
     <string name="random_check_list">抽查校验单</string>
     <string name="material_out_collect_not_list">材料出库未采集明细</string>
     <string name="exit_current_account">退出当前账号</string>
@@ -427,6 +428,21 @@
     <string name="location_transfer_new_location_et">请采集新库位</string>
 
 
+    <string name="pda_wms_in_filter_mine_cb">我的</string>
+    <string name="pda_wms_in_filter_list_multiple_tv">合并出库</string>
+    <string name="tv_odd">单号</string>
+    <string name="jlt_pick_material_out_scan_doneall_tv">已采总数</string>
+    <string name="jlt_pick_material_out_scan_prod_tv">物料</string>
+    <string name="jlt_pick_material_out_scan_model_tv">型号</string>
+    <string name="jlt_pick_material_out_scan_customer_tv">客户</string>
+    <string name="jlt_pick_material_out_scan_todo_tv">待采</string>
+    <string name="jlt_pick_material_out_scan_done_tv">已采</string>
+    <string name="jlt_pick_material_out_scan_barcode_et">请采集条码号/二维码</string>
+    <string name="pick_material_out_scan_sign_rb">库位提示</string>
+    <string name="storage_common_inoutno_tv">单号：</string>
+    <string name="storage_common_customer_tv">客户：</string>
+
+
     <string-array name="material_collect_menu">
         <item>已采集列表</item>
         <item>未采集明细</item>