增加库存条码冻结功能,仓库通用版盘点作业扫码超过13位时自动触发条码enter,盘点作业增加查询功能, 增加料号与储位编号选项, 条码enter与查询接口增加料号与储位编号,修改了盘点作业, 确认数量弹窗的数量0限制,盘点作业表格中增加序号列功能, 出库采集表格增加待采集数,出库采集页增加垂直滚动.

app/src/main/java/com/uas/pda_smart_com/bean/InventoryCollctBean.java

@@ -21,6 +21,15 @@ class InventoryCollctBean {
     private double STD_BATCHQTY;
     private double STD_ACTQTY;
     private String PR_SPEC;
+    private long POS;   //序号
+
+    public long getPOS() {
+        return POS;
+    }
+
+    public void setPOS(long POS) {
+        this.POS = POS;
+    }
 
     public String getST_WHCODE() {
         return ST_WHCODE;

app/src/main/java/com/uas/pda_smart_com/bean/OutboundTableData.java

@@ -15,6 +15,16 @@ public class OutboundTableData {
     private double PD_OUTQTY;
     private Object PD_PDAQTY;
 
+    public double getTo_Be_Collected() {
+        return To_Be_Collected;
+    }
+
+    public void setTo_Be_Collected(double to_Be_Collected) {
+        To_Be_Collected = to_Be_Collected;
+    }
+
+    private double To_Be_Collected;       //待采集数
+
     public String getPD_WHCODE() {
         return PD_WHCODE;
     }

app/src/main/java/com/uas/pda_smart_com/fragment/IOCOutMakeMaterialOper.java

@@ -435,7 +435,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
     private SmartTable mSmartTable;
     private Column<String> PD_PRODCODE, PR_DETAIL, PD_PDAQTY, PD_WHCODE, V_PW_WHCODE, PR_ORISPECCODE;
-    private Column<Double> PD_OUTQTY, V_PW_ONHAND, V_BA_REMAIN;
+    private Column<Double> PD_OUTQTY,To_Be_Collected, V_PW_ONHAND, V_BA_REMAIN;
     private TableData<OutboundTableData> mTableData;
     private List<OutboundTableData> mStockTaskMultipleBeans;
     private CheckBox mCheckBox;
@@ -552,7 +552,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         mOldAddress = SharedPreUtil.getString(mActivity, "printAddress", "");
         mPrintDpi = SharedPreUtil.getInt(mActivity, "printDpi", 203);
 
-
         mCheckBox = root.findViewById(R.id.stock_data_summary_cb);
         mSmartTable = root.findViewById(R.id.st_data);
         CommonUtil.getDefaultTable(mActivity, mSmartTable);
@@ -568,6 +567,12 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 return CommonUtil.doubleFormat(aDouble);
             }
         });
+        To_Be_Collected = new Column<Double>("待采集数", "To_Be_Collected", new IFormat<Double>() {
+            @Override
+            public String format(Double aDouble) {
+                return CommonUtil.doubleFormat(aDouble);
+            }
+        });
         V_PW_ONHAND = new Column<Double>("实物库存", "V_PW_ONHAND", new IFormat<Double>() {
             @Override
             public String format(Double aDouble) {
@@ -587,7 +592,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         //				仓库pd_whcode,仓位V_PW_WHCODE,实物库存V_PW_ONHAND,
         //				条码库存V_BA_REMAIN，型号PR_ORISPECCODE
         mTableData = new TableData<OutboundTableData>("出库单列表", filterTableData,
-                PD_PRODCODE, PR_DETAIL, PD_OUTQTY, PD_PDAQTY, PD_WHCODE,
+                PD_PRODCODE, PR_DETAIL, PD_OUTQTY, PD_PDAQTY,To_Be_Collected, PD_WHCODE,
                 V_PW_WHCODE, V_PW_ONHAND, V_BA_REMAIN, PR_ORISPECCODE);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
@@ -876,6 +881,21 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 outboundTableData.setV_BA_REMAIN(FastjsonUtil.getDouble(dataObject, "V_BA_REMAIN"));
                                 outboundTableData.setPR_ORISPECCODE(FastjsonUtil.getText(dataObject, "PR_ORISPECCODE"));
 
+                                double toBeCollected = 0;
+                                //出库数量pd_outqty,已采集数量pd_pdaqty,
+                                try {
+                                    double pd_outqty = FastjsonUtil.getDouble(dataObject, "PD_OUTQTY");
+                                    String pd_pdaqty = FastjsonUtil.getText(dataObject, "PD_PDAQTY");
+                                    int pdaqty = 0;
+                                    if (!TextUtils.isEmpty(pd_pdaqty)) {
+                                        pdaqty = Integer.parseInt(pd_pdaqty);
+                                    }
+                                    toBeCollected = pd_outqty - pdaqty;
+                                }catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                                outboundTableData.setTo_Be_Collected(toBeCollected);
+
                                 mStockTaskMultipleBeans.add(outboundTableData);
                             }
                         }

app/src/main/java/com/uas/pda_smart_com/fragment/IndexWareHouseContentFragment.java

@@ -144,6 +144,11 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
+                case GloableParams.MENU_STORAGE_BARCODE_FREEZE:
+                    fragment = new InventoryBarcodeFreeze();
+                    getFragmentManager().beginTransaction().addToBackStack(null)
+                            .replace(R.id.container_function_fragment, fragment).commit();
+                    break;
             }
         }
     }

app/src/main/java/com/uas/pda_smart_com/fragment/InventoryBarcodeFreeze.java

@@ -0,0 +1,209 @@
+package com.uas.pda_smart_com.fragment;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.pda_smart_com.R;
+import com.uas.pda_smart_com.activity.FunctionActivity;
+import com.uas.pda_smart_com.global.GloableParams;
+import com.uas.pda_smart_com.util.CommonUtil;
+import com.uas.pda_smart_com.util.FastjsonUtil;
+import com.uas.pda_smart_com.util.HttpCallback;
+import com.uas.pda_smart_com.util.HttpParams;
+import com.uas.pda_smart_com.util.VollyRequest;
+import com.uas.pda_smart_com.view.ClearableEditText;
+
+public
+        /**
+         * Created by sw on 2025-01-06
+         */
+class InventoryBarcodeFreeze extends BaseFragment implements View.OnClickListener {
+    private StringRequest mStringRequest;
+    private ClearableEditText cet_barcode_enter;
+    private LinearLayout line_hint;
+    private TextView tv_hint1;
+    private Button bt_ok;
+    private RadioGroup rg_hui;
+    private RadioButton rb_freeze;
+    private RadioButton rb_release;
+    private String inventoryType = "freeze";
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_labe_lreprnting;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("库存条码冻结");
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        cet_barcode_enter = root.findViewById(R.id.cet_barcode_enter);
+        line_hint = root.findViewById(R.id.line_hint);
+        tv_hint1 = root.findViewById(R.id.tv_hint1);
+        bt_ok = root.findViewById(R.id.bt_ok);
+        rg_hui = root.findViewById(R.id.rg_hui);
+        rb_freeze = root.findViewById(R.id.rb_freeze);
+        rb_release = root.findViewById(R.id.rb_release);
+        cet_barcode_enter.requestFocus();
+    }
+
+    @Override
+    protected void initEvents() {
+        rb_freeze.setChecked(true);
+
+        cet_barcode_enter.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String data = cet_barcode_enter.getText().toString().trim();
+                    getgetinfo(data);
+                    return true;
+                }
+                return false;
+            }
+        });
+        bt_ok.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getgetinfo(cet_barcode_enter.getText().toString().trim());
+            }
+        });
+
+        rg_hui.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @SuppressLint("NonConstantResourceId")
+            @Override
+            public void onCheckedChanged(RadioGroup radioGroup, int checkid) {
+                switch (checkid) {
+                    case R.id.rb_freeze:
+                        inventoryType = "freeze";
+                        break;
+                    case R.id.rb_release:
+                        inventoryType = "release";
+                        break;
+
+                }
+            }
+        });
+
+    }
+
+    @Override
+    protected void initDatas() {
+    }
+
+
+    /**
+     * enter事件
+     */
+    private void getgetinfo(String barcode) {
+        if (barcode.isEmpty()) {
+            CommonUtil.toastNoRepeat(mActivity, "请输入条码号");
+            return;
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_GET_INVENTORY_BARCODE_FREEZE)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getMaCode")
+                        .flag(0)
+                        .addParam("barcode", barcode)
+                        .addParam("Type", inventoryType)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        cet_barcode_enter.setText("");
+                        cet_barcode_enter.requestFocus();
+                        JSONObject data = FastjsonUtil.getJSONObject(o.toString(), "data");
+                        if (data != null) {
+                            line_hint.setVisibility(View.VISIBLE);
+                            tv_hint1.setVisibility(View.VISIBLE);
+                            //返回参数，
+                            //显示BAR_CODE条码号， BAR_REMAIN剩余数量， PR_SPEC规格，名称
+                            //PR_DETAIL
+                            //"data": {
+                            //		"BAR_CODE": "KS24111300012",
+                            //		"BAR_REMAIN": "18",
+                            //		"PR_SPEC": "护套线/UL2464/PVC/黑色/24AWG/0.16*11芯/OD3.9mm/一头带2.1*5.5 DC母头/一头外剥20mm浸锡2mm/线长1050mm(不含头,公差-0,+20)/RoHS",
+                            //		"PR_DETAIL": "护套线"
+                            //	},
+                            String content = "";
+                            content = FastjsonUtil.getText(data, "RESULT") + "\r\n" +
+                                     "条码号: " + FastjsonUtil.getText(data, "BAR_CODE") + "\r\n" +
+                                    "剩余数量: " + FastjsonUtil.getText(data, "BAR_REMAIN") + "\r\n" +
+                                    "规格: " + FastjsonUtil.getText(data, "PR_SPEC") + "\r\n" +
+                                    "名称: " + FastjsonUtil.getText(data, "PR_DETAIL")
+                            ;
+                            tv_hint1.setText(content);
+
+                            return;
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        cet_barcode_enter.setText("");
+                        cet_barcode_enter.requestFocus();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("库存条码冻结");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        } else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+    }
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        //        if (resultCode != Activity.RESULT_OK) {
+        //            return;
+        //        }
+
+
+    }
+
+    @SuppressLint("NonConstantResourceId")
+    @Override
+    public void onClick(View v) {
+    }
+}

app/src/main/java/com/uas/pda_smart_com/fragment/InventoryCollectFragment.java

@@ -52,7 +52,7 @@ import java.util.List;
  */
 public class InventoryCollectFragment extends BaseFragment implements View.OnClickListener {
     private static final int SCAN_BARCODE_CODE = 101;
-    private ClearableEditText mTagEditText, mBarcodeEditText;
+    private ClearableEditText mTagEditText, mBarcodeEditText,cet_liaohao,cet_chuweibianhao;
     private ImageView mScanImageView;
     private TextView mResultTextView, mNumTextView, mClassTextView, tvPiInoutno;
     private Button mMoreButton;
@@ -64,11 +64,13 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
     private SmartTable mSmartTable;
     private Column<String> ST_WHCODE, STD_PRODCODE, PR_DETAIL, BAR_LOCATION, PR_SPEC;
     private Column<Double> STD_BATCHQTY, STD_ACTQTY;
+    private Column<Long> mPosColumn;
     private TableData<InventoryCollctBean> mTableData;
     private List<InventoryCollctBean> mStockTaskMultipleBeans;
     private CheckBox mCheckBox;
     private String bar_remain;
     private AlertDialog alertDialog;
+    private TextView tv_chaxun;
 
     @Override
     protected int getLayout() {
@@ -89,12 +91,17 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
         mClassTextView = root.findViewById(R.id.inventory_collect_class_tv);
         cb_caiji = root.findViewById(R.id.cb_caiji);
         tvPiInoutno = mActivity.findViewById(R.id.tv_pi_inoutno);
+        cet_liaohao = mActivity.findViewById(R.id.cet_liaohao);
+        cet_chuweibianhao = mActivity.findViewById(R.id.cet_chuweibianhao);
+        tv_chaxun = mActivity.findViewById(R.id.tv_chaxun);
 
         mBarcodeEditText.requestFocus();
 
         mCheckBox = root.findViewById(R.id.stock_data_summary_cb);
         mSmartTable = root.findViewById(R.id.st_data);
         CommonUtil.getDefaultTable(mActivity, mSmartTable);
+        mPosColumn = new Column<Long>("序号", "POS");
+        mPosColumn.setFixed(true);
         ST_WHCODE = new Column<String>("仓库", "ST_WHCODE");
         STD_PRODCODE = new Column<String>("料号", "STD_PRODCODE");
         PR_DETAIL = new Column<String>("名称", "PR_DETAIL");
@@ -145,227 +152,228 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
         CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
-                //                String deadLine = mTagEditText.getText().toString().trim();
-                String barcode = mBarcodeEditText.getText().toString().trim();
+                getBarcodedata();
+            }
+        });
 
-                //                if (TextUtils.isEmpty(deadLine)) {
-                //                    CommonUtil.toastNoRepeat(mActivity, "请输入临界校验日期");
-                //                    return;
-                //                }
+        mCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                getDataList();
+            }
+        });
 
-                if (TextUtils.isEmpty(barcode)) {
-                    CommonUtil.toastNoRepeat(mActivity, "请采集条码");
-                    return;
-                }
-                progressDialog.show();
-                if (isChecked) {
-                    VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                            .url(GloableParams.ADDRESS_BARSTOCK_GETBARCODEINFO)
-                            .method(Request.Method.GET)
-                            .tag(TAG + "getbarcodeinfo")
-                            .flag(0)
-                            .addParam("inoutno", pi_inoutno)
-                            //.addParam("deadline", deadLine)
-                            .addParam("barcode", barcode)
-                            .addParam("iscancel", isChecked + "")
-                            .build(), new HttpCallback() {
-                        @Override
-                        public void onSuccess(int flag, Object o) throws Exception {
-                            try {
-                                mBarcodeEditText.setText("");
-                                String result = o.toString();
-                                JSONObject resultObject = JSON.parseObject(result);
-                                JSONObject dataObject = resultObject.getJSONObject("data");
-                                if (dataObject != null) {
-                                    String type = FastjsonUtil.getText(dataObject, "BI_TYPE");
-                                    String prompt = "采集成功！";
-                                    if (!"超期".equals(type)) {
-                                        mResultTextView.setTextColor(mActivity.getResources().getColor(R.color.black));
-                                        prompt = "采集成功！";
-                                    } else {
-                                        mResultTextView.setTextColor(mActivity.getResources().getColor(R.color.red));
-                                        prompt = "采集成功！已超期";
-                                    }
-                                    mResultTextView.setVisibility(View.VISIBLE);
-                                    mResultTextView.setText(prompt
-                                            + "\n物料：" + FastjsonUtil.getText(dataObject, "BI_PRODCODE")
-                                            //                                        + "\n品牌：" + FastjsonUtil.getText(dataObject, "BI_BRAND")
-                                            //                                        + "\nLOTNO：" + FastjsonUtil.getText(dataObject, "BI_LOTNO")
-                                            //                                        + "\nDC：" + FastjsonUtil.getText(dataObject, "BI_DATECODE")
-                                            + "\n型号：" + FastjsonUtil.getText(dataObject, "PR_ORISPECCODE")
-                                            + "\n条码号：" + FastjsonUtil.getText(dataObject, "BI_BARCODE")
-                                            + "\n数量：" + FastjsonUtil.getText(dataObject, "BI_INQTY")
-                                    );
-                                }
-                            } catch (Exception e) {
-                                e.printStackTrace();
+        tv_chaxun.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getDataList();
+            }
+        });
+    }
+
+    private void getBarcodedata() {
+        String barcode = mBarcodeEditText.getText().toString().trim();
+        if (TextUtils.isEmpty(barcode)) {
+            CommonUtil.toastNoRepeat(mActivity, "请采集条码");
+            return;
+        }
+        progressDialog.show();
+        if (isChecked) {
+            VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                    .url(GloableParams.ADDRESS_BARSTOCK_GETBARCODEINFO)
+                    .method(Request.Method.GET)
+                    .tag(TAG + "getbarcodeinfo")
+                    .flag(0)
+                    .addParam("inoutno", pi_inoutno)
+                    //.addParam("deadline", deadLine)
+                    .addParam("barcode", barcode)
+                    .addParam("iscancel", isChecked + "")
+                    .addParam("prodcode", cet_liaohao.getText().toString().trim())
+                    .addParam("location", cet_chuweibianhao.getText().toString().trim())
+                    .build(), new HttpCallback() {
+                @Override
+                public void onSuccess(int flag, Object o) throws Exception {
+                    try {
+                        mBarcodeEditText.setText("");
+                        String result = o.toString();
+                        JSONObject resultObject = JSON.parseObject(result);
+                        JSONObject dataObject = resultObject.getJSONObject("data");
+                        if (dataObject != null) {
+                            String type = FastjsonUtil.getText(dataObject, "BI_TYPE");
+                            String prompt = "采集成功！";
+                            if (!"超期".equals(type)) {
+                                mResultTextView.setTextColor(mActivity.getResources().getColor(R.color.black));
+                                prompt = "采集成功！";
+                            } else {
+                                mResultTextView.setTextColor(mActivity.getResources().getColor(R.color.red));
+                                prompt = "采集成功！已超期";
                             }
+                            mResultTextView.setVisibility(View.VISIBLE);
+                            mResultTextView.setText(prompt
+                                    + "\n物料：" + FastjsonUtil.getText(dataObject, "BI_PRODCODE")
+                                    //                                        + "\n品牌：" + FastjsonUtil.getText(dataObject, "BI_BRAND")
+                                    //                                        + "\nLOTNO：" + FastjsonUtil.getText(dataObject, "BI_LOTNO")
+                                    //                                        + "\nDC：" + FastjsonUtil.getText(dataObject, "BI_DATECODE")
+                                    + "\n型号：" + FastjsonUtil.getText(dataObject, "PR_ORISPECCODE")
+                                    + "\n条码号：" + FastjsonUtil.getText(dataObject, "BI_BARCODE")
+                                    + "\n数量：" + FastjsonUtil.getText(dataObject, "BI_INQTY")
+                            );
                         }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
 
-                        @Override
-                        public void onFail(int flag, String failStr) throws Exception {
-                            mBarcodeEditText.setText("");
-                            progressDialog.dismiss();
-                            CommonUtil.toastNoRepeat(mActivity, failStr);
-                            mResultTextView.setVisibility(View.VISIBLE);
-                            mResultTextView.setText(failStr);
+                @Override
+                public void onFail(int flag, String failStr) throws Exception {
+                    mBarcodeEditText.setText("");
+                    progressDialog.dismiss();
+                    CommonUtil.toastNoRepeat(mActivity, failStr);
+                    mResultTextView.setVisibility(View.VISIBLE);
+                    mResultTextView.setText(failStr);
+                }
+            });
+        } else {
+            VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                    .url(GloableParams.ADDRESS_GET_BARCODE_DATA)
+                    .method(Request.Method.GET)
+                    .tag(TAG + "getbarcodeinfo")
+                    .flag(0)
+                    .addParam("barcode", barcode)
+                    .addParam("code", pi_inoutno)
+                    .build(), new HttpCallback() {
+                @Override
+                public void onSuccess(int flag, Object o) throws Exception {
+                    progressDialog.dismiss();
+                    bar_remain = "";
+                    try {
+                        String result = o.toString();
+                        JSONObject resultObject = JSON.parseObject(result);
+                        JSONObject dataObject = resultObject.getJSONObject("data");
+                        if (dataObject != null) {
+                            bar_remain = FastjsonUtil.getText(dataObject, "BAR_REMAIN");
                         }
-                    });
-                } else {
-                    VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                            .url(GloableParams.ADDRESS_GET_BARCODE_DATA)
-                            .method(Request.Method.GET)
-                            .tag(TAG + "getbarcodeinfo")
-                            .flag(0)
-                            .addParam("barcode", barcode)
-                            .addParam("code", pi_inoutno)
-                            .build(), new HttpCallback() {
-                        @Override
-                        public void onSuccess(int flag, Object o) throws Exception {
-                            progressDialog.dismiss();
-                            bar_remain = "";
-                            try {
-                                String result = o.toString();
-                                JSONObject resultObject = JSON.parseObject(result);
-                                JSONObject dataObject = resultObject.getJSONObject("data");
-                                if (dataObject != null) {
-                                    bar_remain = FastjsonUtil.getText(dataObject, "BAR_REMAIN");
-                                }
-
-                                View dialogView = View.inflate(getActivity(), R.layout.dialog_confirm_quantity, null);
-                                final EditText modifyEditText = dialogView.findViewById(R.id.recharge_modify_et);
-
-                                TextView tv_uninventoried_quantity = dialogView.findViewById(R.id.tv_uninventoried_quantity);
-                                TextView tv_material_no = dialogView.findViewById(R.id.tv_material_no);
-                                TextView tv_material_name = dialogView.findViewById(R.id.tv_material_name);
-                                TextView tv_material_specification = dialogView.findViewById(R.id.tv_material_specification);
-
-                                tv_uninventoried_quantity.setText(FastjsonUtil.getText(dataObject, "UNQTY"));
-                                tv_material_no.setText(FastjsonUtil.getText(dataObject, "BAR_PRODCODE"));
-                                tv_material_name.setText(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
-                                tv_material_specification.setText(FastjsonUtil.getText(dataObject, "PR_SPEC"));
-                                modifyEditText.setText(bar_remain);
-                                modifyEditText.setSelection(modifyEditText.getText().length());
-
-                                alertDialog = new AlertDialog.Builder(getActivity())
-                                        .setTitle("确认数量")
-                                        .setNegativeButton(R.string.cancel, null)
-                                        .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+
+                        View dialogView = View.inflate(getActivity(), R.layout.dialog_confirm_quantity, null);
+                        final EditText modifyEditText = dialogView.findViewById(R.id.recharge_modify_et);
+
+                        TextView tv_uninventoried_quantity = dialogView.findViewById(R.id.tv_uninventoried_quantity);
+                        TextView tv_material_no = dialogView.findViewById(R.id.tv_material_no);
+                        TextView tv_material_name = dialogView.findViewById(R.id.tv_material_name);
+                        TextView tv_material_specification = dialogView.findViewById(R.id.tv_material_specification);
+
+                        tv_uninventoried_quantity.setText(FastjsonUtil.getText(dataObject, "UNQTY"));
+                        tv_material_no.setText(FastjsonUtil.getText(dataObject, "BAR_PRODCODE"));
+                        tv_material_name.setText(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
+                        tv_material_specification.setText(FastjsonUtil.getText(dataObject, "PR_SPEC"));
+                        modifyEditText.setText(bar_remain);
+                        modifyEditText.setSelection(modifyEditText.getText().length());
+
+                        alertDialog = new AlertDialog.Builder(getActivity())
+                                .setTitle("确认数量")
+                                .setNegativeButton(R.string.cancel, null)
+                                .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        if (StringUtil.isEmpty(modifyEditText.getText().toString().trim())) {
+                                            CommonUtil.toastNoRepeat(getActivity(), "请输入条码数量");
+                                            return;
+                                        }
+                                        double quantity = -1;
+                                        try {
+                                            quantity = Double.parseDouble(modifyEditText.getText().toString().trim());
+                                        } catch (Exception e) {
+                                            CommonUtil.toastNoRepeat(getActivity(), "请输入正确的数字");
+                                            return;
+                                        }
+                                        if (quantity < 0) {
+                                            CommonUtil.toastNoRepeat(getActivity(), "数量必须大于等于0");
+                                            return;
+                                        }
+                                        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                                                .url(GloableParams.ADDRESS_BARSTOCK_GETBARCODEINFO)
+                                                .method(Request.Method.GET)
+                                                .tag(TAG + "getbarcodeinfo")
+                                                .flag(0)
+                                                .addParam("inoutno", pi_inoutno)
+                                                //.addParam("deadline", deadLine)
+                                                .addParam("barcode", barcode)
+                                                .addParam("iscancel", isChecked + "")
+                                                .addParam("bar_remain", modifyEditText.getText().toString().trim())
+                                                .addParam("prodcode", cet_liaohao.getText().toString().trim())
+                                                .addParam("location", cet_chuweibianhao.getText().toString().trim())
+                                                .build(), new HttpCallback() {
                                             @Override
-                                            public void onClick(DialogInterface dialog, int which) {
-                                                if (StringUtil.isEmpty(modifyEditText.getText().toString().trim())) {
-                                                    CommonUtil.toastNoRepeat(getActivity(), "请输入条码数量");
-                                                    return;
-                                                }
-                                                double quantity = -1;
+                                            public void onSuccess(int flag, Object o) throws Exception {
+                                                alertDialog.dismiss();
                                                 try {
-                                                    quantity = Double.parseDouble(modifyEditText.getText().toString().trim());
-                                                } catch (Exception e) {
-                                                    CommonUtil.toastNoRepeat(getActivity(), "请输入正确的数字");
-                                                    return;
-                                                }
-                                                if (quantity <= 0) {
-                                                    CommonUtil.toastNoRepeat(getActivity(), "数量必须大于0");
-                                                    return;
-                                                }
-                                                VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                                                        .url(GloableParams.ADDRESS_BARSTOCK_GETBARCODEINFO)
-                                                        .method(Request.Method.GET)
-                                                        .tag(TAG + "getbarcodeinfo")
-                                                        .flag(0)
-                                                        .addParam("inoutno", pi_inoutno)
-                                                        //.addParam("deadline", deadLine)
-                                                        .addParam("barcode", barcode)
-                                                        .addParam("iscancel", isChecked + "")
-                                                        .addParam("bar_remain", modifyEditText.getText().toString().trim())
-                                                        .build(), new HttpCallback() {
-                                                    @Override
-                                                    public void onSuccess(int flag, Object o) throws Exception {
-                                                        alertDialog.dismiss();
-                                                        try {
-                                                            mBarcodeEditText.setText("");
-                                                            String result = o.toString();
-                                                            JSONObject resultObject = JSON.parseObject(result);
-                                                            JSONObject dataObject = resultObject.getJSONObject("data");
-                                                            if (dataObject != null) {
-                                                                String type = FastjsonUtil.getText(dataObject, "BI_TYPE");
-                                                                String prompt = "采集成功！";
-                                                                if (!"超期".equals(type)) {
-                                                                    mResultTextView.setTextColor(mActivity.getResources().getColor(R.color.black));
-                                                                    prompt = "采集成功！";
-                                                                } else {
-                                                                    mResultTextView.setTextColor(mActivity.getResources().getColor(R.color.red));
-                                                                    prompt = "采集成功！已超期";
-                                                                }
-
-                                                                mResultTextView.setVisibility(View.VISIBLE);
-                                                                mResultTextView.setText(prompt
-                                                                        + "\n物料：" + FastjsonUtil.getText(dataObject, "BI_PRODCODE")
-                                                                        //                                        + "\n品牌：" + FastjsonUtil.getText(dataObject, "BI_BRAND")
-                                                                        //                                        + "\nLOTNO：" + FastjsonUtil.getText(dataObject, "BI_LOTNO")
-                                                                        //                                        + "\nDC：" + FastjsonUtil.getText(dataObject, "BI_DATECODE")
-                                                                        + "\n型号：" + FastjsonUtil.getText(dataObject, "PR_ORISPECCODE")
-                                                                        + "\n条码号：" + FastjsonUtil.getText(dataObject, "BI_BARCODE")
-                                                                        + "\n数量：" + FastjsonUtil.getText(dataObject, "BI_INQTY")
-                                                                );
-                                                            }
-                                                        } catch (Exception e) {
-                                                            e.printStackTrace();
+                                                    mBarcodeEditText.setText("");
+                                                    String result = o.toString();
+                                                    JSONObject resultObject = JSON.parseObject(result);
+                                                    JSONObject dataObject = resultObject.getJSONObject("data");
+                                                    if (dataObject != null) {
+                                                        String type = FastjsonUtil.getText(dataObject, "BI_TYPE");
+                                                        String prompt = "采集成功！";
+                                                        if (!"超期".equals(type)) {
+                                                            mResultTextView.setTextColor(mActivity.getResources().getColor(R.color.black));
+                                                            prompt = "采集成功！";
+                                                        } else {
+                                                            mResultTextView.setTextColor(mActivity.getResources().getColor(R.color.red));
+                                                            prompt = "采集成功！已超期";
                                                         }
-                                                    }
 
-                                                    @Override
-                                                    public void onFail(int flag, String failStr) throws Exception {
-                                                        alertDialog.dismiss();
-                                                        mBarcodeEditText.setText("");
-                                                        progressDialog.dismiss();
-                                                        CommonUtil.toastNoRepeat(mActivity, failStr);
                                                         mResultTextView.setVisibility(View.VISIBLE);
-                                                        mResultTextView.setText(failStr);
+                                                        mResultTextView.setText(prompt
+                                                                + "\n物料：" + FastjsonUtil.getText(dataObject, "BI_PRODCODE")
+                                                                //                                        + "\n品牌：" + FastjsonUtil.getText(dataObject, "BI_BRAND")
+                                                                //                                        + "\nLOTNO：" + FastjsonUtil.getText(dataObject, "BI_LOTNO")
+                                                                //                                        + "\nDC：" + FastjsonUtil.getText(dataObject, "BI_DATECODE")
+                                                                + "\n型号：" + FastjsonUtil.getText(dataObject, "PR_ORISPECCODE")
+                                                                + "\n条码号：" + FastjsonUtil.getText(dataObject, "BI_BARCODE")
+                                                                + "\n数量：" + FastjsonUtil.getText(dataObject, "BI_INQTY")
+                                                        );
                                                     }
-                                                });
+                                                } catch (Exception e) {
+                                                    e.printStackTrace();
+                                                }
                                             }
-                                        })
-                                        .setView(dialogView)
-                                        .create();
-
-
-                                // 禁用屏幕外点击
-                                alertDialog.setCancelable(false);
-                                alertDialog.setCanceledOnTouchOutside(false);
-
-//                                alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
-//                                    @Override
-//                                    public void onClick(View view) {
-//
-//                                    }
-//                                });
-                                alertDialog.show();
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
 
-                        @Override
-                        public void onFail(int flag, String failStr) throws Exception {
-                            mBarcodeEditText.setText("");
-                            progressDialog.dismiss();
-                            CommonUtil.toastNoRepeat(mActivity, failStr);
-                            mResultTextView.setVisibility(View.VISIBLE);
-                            mResultTextView.setText(failStr);
-                        }
-                    });
+                                            @Override
+                                            public void onFail(int flag, String failStr) throws Exception {
+                                                alertDialog.dismiss();
+                                                mBarcodeEditText.setText("");
+                                                progressDialog.dismiss();
+                                                CommonUtil.toastNoRepeat(mActivity, failStr);
+                                                mResultTextView.setVisibility(View.VISIBLE);
+                                                mResultTextView.setText(failStr);
+                                            }
+                                        });
+                                    }
+                                })
+                                .setView(dialogView)
+                                .create();
+
 
+                        // 禁用屏幕外点击
+                        alertDialog.setCancelable(false);
+                        alertDialog.setCanceledOnTouchOutside(false);
+                        alertDialog.show();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
-            }
-        });
 
-        mCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                getDataList();
-            }
-        });
+                @Override
+                public void onFail(int flag, String failStr) throws Exception {
+                    mBarcodeEditText.setText("");
+                    progressDialog.dismiss();
+                    CommonUtil.toastNoRepeat(mActivity, failStr);
+                    mResultTextView.setVisibility(View.VISIBLE);
+                    mResultTextView.setText(failStr);
+                }
+            });
+
+        }
     }
 
     @Override
@@ -405,6 +413,8 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
                 .method(Request.Method.POST)
                 .addParam("code", pi_id)
                 .addParam("showall", mCheckBox.isChecked() ? "-1" : "0")
+                .addParam("prodcode", cet_liaohao.getText().toString().trim())
+                .addParam("location", cet_chuweibianhao.getText().toString().trim())
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -428,6 +438,7 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
                                 inventoryCollctBean.setSTD_BATCHQTY(FastjsonUtil.getDouble(dataObject, "STD_BATCHQTY"));
                                 inventoryCollctBean.setSTD_ACTQTY(FastjsonUtil.getDouble(dataObject, "STD_ACTQTY"));
                                 inventoryCollctBean.setPR_SPEC(FastjsonUtil.getText(dataObject, "PR_SPEC"));
+                                inventoryCollctBean.setPOS(i + 1);
                                 mStockTaskMultipleBeans.add(inventoryCollctBean);
                             }
                         }
@@ -449,7 +460,7 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
     }
 
     private void setTableData(List<InventoryCollctBean> filterTableData) {
-        mTableData = new TableData<InventoryCollctBean>("出库单列表", filterTableData,
+        mTableData = new TableData<InventoryCollctBean>("出库单列表", filterTableData,mPosColumn,
                 ST_WHCODE, STD_PRODCODE, PR_DETAIL, BAR_LOCATION, STD_BATCHQTY, STD_ACTQTY, PR_SPEC);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
@@ -553,6 +564,9 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
                 String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
                 mBarcodeEditText.setText(result);
                 mBarcodeEditText.setSelection(result.length());
+                if (result.length() > 13){
+                    getBarcodedata();
+                }
             }
         }
     }

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

@@ -253,6 +253,7 @@ public class GloableParams {
     public static String ADDRESS_GET_PRE_MATERIAL_LIST;
 
     public static String ADDRESS_GET_INVENTORY_BARCODE_DATA;     //库存条码打印
+    public static String ADDRESS_GET_INVENTORY_BARCODE_FREEZE;     //库存条码冻结
 
 
 
@@ -703,6 +704,9 @@ public class GloableParams {
     //条码库存打印
     private static final String ADDRESSTAIL_GET_INVENTORY_BARCODE_DATA = "/api/pda/batch/getBarcodeData.action";
 
+    //库存条码冻结
+    private static final String ADDRESSTAIL_GET_INVENTORY_BARCODE_FREEZE = "/scm/reserve/freezeBarcodeByPDA.action";
+
 
 
     /***********************************************************************************************/
@@ -754,14 +758,18 @@ public class GloableParams {
     public static final String GRIDNAME_MODIFY_QUANTITY = "条码数量修改";
     public static final String GRIDNAME_BOM_CHECK = "BOM校验";
     public static final String MENU_STORAGE_STOCK_INFO_COLLECT = "库存条码绑定";
+    public static final String MENU_STORAGE_BARCODE_FREEZE = "库存条码冻结";
     public static final String[] storageGridNames = {GRIDNAME_GOOD_SEARCH, GRIDNAME_BATCH_OPRATION,
-            GRIDNAME_STORAGE_TRANSFER, GRIDNAME_MODIFY_QUANTITY, GRIDNAME_WORK_INVENTORY, GRIDNAME_BOM_CHECK,MENU_STORAGE_STOCK_INFO_COLLECT};
+            GRIDNAME_STORAGE_TRANSFER, GRIDNAME_MODIFY_QUANTITY, GRIDNAME_WORK_INVENTORY,
+            GRIDNAME_BOM_CHECK,MENU_STORAGE_STOCK_INFO_COLLECT,MENU_STORAGE_BARCODE_FREEZE};
     public static final int[] storageGridImgs = {R.drawable.storage_good_search,
             R.drawable.storage_bach_operation, R.drawable.storage_transfer,
             R.drawable.storage_work_inventory,
             R.drawable.ic_modify_quantity,
             R.drawable.storage_msd_manager,
-            R.drawable.storage_transfer};
+            R.drawable.storage_transfer,
+            R.drawable.kucuntiaomadongjie
+    };
     //DETAIL:搜索备料单号，下拉列表
     public static final String SPINNER_PREPARE_SEARCH = "搜索备料单号";
     public static final String SPINNER_MAKECODE_SEARCH = "搜索制造单号";
@@ -1108,6 +1116,7 @@ public class GloableParams {
         GloableParams.ADDRESS_GET_PRE_MATERIAL_LIST = uriHead + GloableParams.ADDRESSTAIL_GET_PRE_MATERIAL_LIST;
 
         GloableParams.ADDRESS_GET_INVENTORY_BARCODE_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_INVENTORY_BARCODE_DATA;
+        GloableParams.ADDRESS_GET_INVENTORY_BARCODE_FREEZE = uriHead + GloableParams.ADDRESSTAIL_GET_INVENTORY_BARCODE_FREEZE;
 
 
 

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

@@ -92,6 +92,42 @@
     </LinearLayout>
 
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/inputItemCaption"
+            android:text="料号" />
+
+        <com.uas.pda_smart_com.view.ClearableEditText
+            android:id="@+id/cet_liaohao"
+            style="@style/inputItemValue"
+            android:hint="请输入料号" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/inputItemCaption"
+            android:text="储位编号" />
+
+        <com.uas.pda_smart_com.view.ClearableEditText
+            android:id="@+id/cet_chuweibianhao"
+            style="@style/inputItemValue"
+            android:hint="请输入储位编号" />
+
+    </LinearLayout>
+
+
+
     <TextView
         android:id="@+id/inventory_collect_result_tv"
         android:layout_width="match_parent"
@@ -125,6 +161,16 @@
             android:textSize="14sp"
             tools:text="YS1506002" />
 
+        <TextView
+            android:id="@+id/tv_chaxun"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="查询"
+            android:textSize="14sp"
+            android:textColor="@color/blue"
+            android:layout_marginEnd="10dp"
+            />
+
         <CheckBox
             android:id="@+id/stock_data_summary_cb"
             android:layout_width="wrap_content"

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

@@ -7,450 +7,457 @@
             android:id="@+id/include_menuactionbar"
             layout="@layout/actionbar_withback" />-->
 
-    <LinearLayout
+    <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
+        >
 
-            <Button
-                android:id="@+id/btn_oneprint"
-                android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <RelativeLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/text_btn_print"
-                />
+                >
 
-            <Button
-                android:layout_alignParentEnd="true"
-                android:id="@+id/bt_inventory_barcode_printing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/Inventory_barcode_printing"
-                />
-        </RelativeLayout>
+                <Button
+                    android:id="@+id/btn_oneprint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/text_btn_print"
+                    />
 
-        <!--no use-->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:orientation="horizontal"
-            android:padding="10dp"
-            android:visibility="gone">
-
-            <RadioGroup
-                android:id="@+id/iocout_collect_rg"
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_weight="2"
+                <Button
+                    android:layout_alignParentEnd="true"
+                    android:id="@+id/bt_inventory_barcode_printing"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Inventory_barcode_printing"
+                    />
+            </RelativeLayout>
+
+            <!--no use-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
                 android:orientation="horizontal"
+                android:padding="10dp"
                 android:visibility="gone">
 
-                <RadioButton
-                    android:id="@+id/iocout_collect_barcode_rb"
+                <RadioGroup
+                    android:id="@+id/iocout_collect_rg"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:layout_weight="2"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <RadioButton
+                        android:id="@+id/iocout_collect_barcode_rb"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_collect_type_bg"
+                        android:button="@null"
+                        android:checked="true"
+                        android:clickable="true"
+                        android:gravity="center"
+                        android:text="条码号"
+                        android:textColor="@color/selector_collect_type_text"
+                        android:textSize="18sp" />
+
+                    <RadioButton
+                        android:id="@+id/iocout_collect_box_rb"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@drawable/selector_collect_type_bg"
+                        android:button="@null"
+                        android:clickable="true"
+                        android:gravity="center"
+                        android:text="外箱号"
+                        android:textColor="@color/selector_collect_type_text"
+                        android:textSize="18sp" />
+                </RadioGroup>
+
+                <Spinner
+                    android:id="@+id/iocout_material_type_sp"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/selector_collect_type_bg"
-                    android:button="@null"
-                    android:checked="true"
-                    android:clickable="true"
-                    android:gravity="center"
-                    android:text="条码号"
-                    android:textColor="@color/selector_collect_type_text"
-                    android:textSize="18sp" />
-
-                <RadioButton
-                    android:id="@+id/iocout_collect_box_rb"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/bg_blue_spinner"
+                    android:gravity="center">
+
+                </Spinner>
+
+                <Button
+                    android:id="@+id/iocout_collect_model_btn"
+                    style="@style/ButtonStyle"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
+                    android:layout_margin="0dp"
                     android:layout_weight="1"
-                    android:background="@drawable/selector_collect_type_bg"
-                    android:button="@null"
-                    android:clickable="true"
-                    android:gravity="center"
-                    android:text="外箱号"
-                    android:textColor="@color/selector_collect_type_text"
-                    android:textSize="18sp" />
-            </RadioGroup>
-
-            <Spinner
-                android:id="@+id/iocout_material_type_sp"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginRight="10dp"
-                android:layout_weight="2"
-                android:background="@drawable/bg_blue_spinner"
-                android:gravity="center">
-
-            </Spinner>
-
-            <Button
-                android:id="@+id/iocout_collect_model_btn"
-                style="@style/ButtonStyle"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_margin="0dp"
-                android:layout_weight="1"
-                android:text="在线"
-                android:visibility="gone" />
-        </LinearLayout>
-
+                    android:text="在线"
+                    android:visibility="gone" />
+            </LinearLayout>
 
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
 
-            <LinearLayout
+            <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="@dimen/padding_normal">
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="单号："
-                        android:textColor="@color/body_text_1"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_pi_inoutno"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textColor="@color/body_text_1"
-                        android:textSize="14sp"
-                        tools:text="YS1506002" />
-
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="仓库："
-                        android:textColor="@color/body_text_1"
-                        android:textSize="14sp"
-                        android:visibility="gone" />
-
-                    <TextView
-                        android:id="@+id/tv_pd_whcode"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textColor="@color/body_text_1"
-                        android:textSize="14sp"
-                        android:visibility="gone"
-                        tools:text="01" />
+                    android:orientation="vertical"
+                    android:padding="@dimen/padding_normal">
 
-                    <CheckBox
-                        android:id="@+id/stock_data_summary_cb"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:checked="true"
-                        android:text="未完成" />
-
-                </LinearLayout>
-
-                <TableLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/spacing_big"
-                    android:stretchColumns="1">
-
-                    <TableRow>
+                        android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/iocout_material_type_tv"
-                            style="@style/tl_tv_style"
-                            android:layout_height="match_parent"
-                            android:background="@color/gray_light"
-                            android:drawableLeft="@drawable/switch_model"
-                            android:drawablePadding="5dp"
-                            android:gravity="center_vertical"
-                            android:padding="10dp"
-                            android:text="条码"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="单号："
                             android:textColor="@color/body_text_1"
-                            android:textSize="16sp" />
-                        <!--<TextView-->
-                        <!--android:id="@+id/iocout_material_type_tv"-->
-                        <!--style="@style/tl_tv_style"-->
-                        <!--android:layout_height="match_parent"-->
-                        <!--android:background="@color/gray_light"-->
-                        <!--android:gravity="center_vertical"-->
-                        <!--android:padding="10dp"-->
-                        <!--android:text="条码"-->
-                        <!--android:textColor="@color/body_text_1"-->
-                        <!--android:textSize="16sp" />-->
-
-                        <com.uas.pda_smart_com.view.ClearableEditText
-                            android:id="@+id/et_bar_code"
-                            style="@style/EditTextStyle"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:hint="@string/please_collect_barcode"
-                            android:textColor="@color/black" />
-                    </TableRow>
+                            android:textSize="14sp" />
 
-                </TableLayout>
-                 <!--no use-->
-                <Button
-                    android:id="@+id/btn_confirm"
-                    style="@style/ButtonStyle"
-                    android:enabled="false"
-                    android:text="@string/confirm"
-                    android:visibility="gone" />
+                        <TextView
+                            android:id="@+id/tv_pi_inoutno"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:textColor="@color/body_text_1"
+                            android:textSize="14sp"
+                            tools:text="YS1506002" />
 
-                <TableLayout
-                    android:id="@+id/iocout_collect_barcode_tl"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginTop="@dimen/spacing_big"
-                    android:background="@drawable/bg_button_enabled"
-                    android:padding="10dp"
-                    android:stretchColumns="1"
-                    android:visibility="gone"
-                    tools:visibility="visible">
 
-                    <TableRow>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="仓库："
+                            android:textColor="@color/body_text_1"
+                            android:textSize="14sp"
+                            android:visibility="gone" />
 
                         <TextView
-                            android:id="@+id/tv_barcode_collection_success"
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="10dp"
-                            android:textColor="@color/white"
+                            android:id="@+id/tv_pd_whcode"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:textColor="@color/body_text_1"
+                            android:textSize="14sp"
                             android:visibility="gone"
-                            tools:visibility="visible"/>
-                    </TableRow>
+                            tools:text="01" />
 
-                    <TableRow>
+                        <CheckBox
+                            android:id="@+id/stock_data_summary_cb"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:checked="true"
+                            android:text="未完成" />
 
-                        <TextView
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/text_barcode_tailback" />
+                    </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/iocout_bar_code_tv"
-                            style="@style/tv"
-                            android:layout_marginLeft="3dp" />
-                    </TableRow>
-
-                    <TableRow>
+                    <TableLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/spacing_big"
+                        android:stretchColumns="1">
+
+                        <TableRow>
+
+                            <TextView
+                                android:id="@+id/iocout_material_type_tv"
+                                style="@style/tl_tv_style"
+                                android:layout_height="match_parent"
+                                android:background="@color/gray_light"
+                                android:drawableLeft="@drawable/switch_model"
+                                android:drawablePadding="5dp"
+                                android:gravity="center_vertical"
+                                android:padding="10dp"
+                                android:text="条码"
+                                android:textColor="@color/body_text_1"
+                                android:textSize="16sp" />
+                            <!--<TextView-->
+                            <!--android:id="@+id/iocout_material_type_tv"-->
+                            <!--style="@style/tl_tv_style"-->
+                            <!--android:layout_height="match_parent"-->
+                            <!--android:background="@color/gray_light"-->
+                            <!--android:gravity="center_vertical"-->
+                            <!--android:padding="10dp"-->
+                            <!--android:text="条码"-->
+                            <!--android:textColor="@color/body_text_1"-->
+                            <!--android:textSize="16sp" />-->
+
+                            <com.uas.pda_smart_com.view.ClearableEditText
+                                android:id="@+id/et_bar_code"
+                                style="@style/EditTextStyle"
+                                android:focusable="true"
+                                android:focusableInTouchMode="true"
+                                android:hint="@string/please_collect_barcode"
+                                android:textColor="@color/black" />
+                        </TableRow>
+
+                    </TableLayout>
+                    <!--no use-->
+                    <Button
+                        android:id="@+id/btn_confirm"
+                        style="@style/ButtonStyle"
+                        android:enabled="false"
+                        android:text="@string/confirm"
+                        android:visibility="gone" />
 
-                        <TextView
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/bar_remain" />
+                    <TableLayout
+                        android:id="@+id/iocout_collect_barcode_tl"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="@dimen/spacing_big"
+                        android:background="@drawable/bg_button_enabled"
+                        android:padding="10dp"
+                        android:stretchColumns="1"
+                        android:visibility="gone"
+                        tools:visibility="visible">
+
+                        <TableRow>
+
+                            <TextView
+                                android:id="@+id/tv_barcode_collection_success"
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginLeft="10dp"
+                                android:textColor="@color/white"
+                                android:visibility="gone"
+                                tools:visibility="visible"/>
+                        </TableRow>
+
+                        <TableRow>
+
+                            <TextView
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/text_barcode_tailback" />
+
+                            <TextView
+                                android:id="@+id/iocout_bar_code_tv"
+                                style="@style/tv"
+                                android:layout_marginLeft="3dp" />
+                        </TableRow>
+
+                        <TableRow>
+
+                            <TextView
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/bar_remain" />
+
+                            <TextView
+                                android:id="@+id/iocout_bar_remain_tv"
+                                style="@style/tv"
+                                android:layout_marginLeft="3dp" />
+                        </TableRow>
+
+                        <TableRow>
+
+                            <TextView
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/text_procode_tailback" />
+
+                            <TextView
+                                android:id="@+id/iocout_bar_prodcode_tv"
+                                style="@style/tv"
+                                android:layout_marginLeft="3dp" />
+                        </TableRow>
+                    </TableLayout>
+
+                    <TableLayout
+                        android:id="@+id/iocout_collect_box_tl"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="@dimen/spacing_big"
+                        android:background="@drawable/bg_button_enabled"
+                        android:padding="10dp"
+                        android:stretchColumns="1"
+                        android:visibility="gone"
+                        tools:visibility="visible"
+                        >
+
+                        <TableRow>
+
+                            <TextView
+                                android:id="@+id/tv_box_collection_success"
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginLeft="10dp"
+                                android:textColor="@color/white"
+                                android:visibility="gone" />
+                        </TableRow>
+
+                        <TableRow>
+
+                            <TextView
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:text="箱号：" />
+
+                            <TextView
+                                android:id="@+id/iocout_box_tv"
+                                style="@style/tv"
+                                android:layout_marginLeft="3dp" />
+                        </TableRow>
+
+                        <TableRow>
+
+                            <TextView
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:text="箱内总数：" />
+
+                            <TextView
+                                android:id="@+id/iocout_box_num_tv"
+                                style="@style/tv"
+                                android:layout_marginLeft="3dp" />
+                        </TableRow>
+
+                        <TableRow>
+
+                            <TextView
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/text_procode_tailback" />
+
+                            <TextView
+                                android:id="@+id/iocout_box_prodcode_tv"
+                                style="@style/tv"
+                                android:layout_marginLeft="3dp" />
+                        </TableRow>
+
+                        <TableRow>
+
+                            <TextView
+                                style="@style/tl_tv_style"
+                                android:layout_gravity="center_vertical"
+                                android:text="仓库：" />
+
+                            <TextView
+                                android:id="@+id/iocout_box_whcode_tv"
+                                style="@style/tv"
+                                android:layout_marginLeft="3dp" />
+                        </TableRow>
+                    </TableLayout>
 
-                        <TextView
-                            android:id="@+id/iocout_bar_remain_tv"
-                            style="@style/tv"
-                            android:layout_marginLeft="3dp" />
-                    </TableRow>
+                    <TextView
+                        android:id="@+id/iocout_collect_result"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/spacing_big"
+                        android:background="@drawable/shape_msg_block"
+                        android:padding="10dp"
+                        android:visibility="gone"
+                        tools:text="boxResultboxResultboxResultboxResult"
+                        tools:visibility="visible"/>
 
-                    <TableRow>
+                    <TextView
+                        android:visibility="gone"
+                        android:id="@+id/iocout_next_material_information"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/spacing_big"
+                        android:background="@drawable/shape_msg_block"
+                        android:padding="10dp"
+                        tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,仓位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
+                </LinearLayout>
 
-                        <TextView
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/text_procode_tailback" />
+            </ScrollView>
 
-                        <TextView
-                            android:id="@+id/iocout_bar_prodcode_tv"
-                            style="@style/tv"
-                            android:layout_marginLeft="3dp" />
-                    </TableRow>
-                </TableLayout>
+            <LinearLayout
+                android:id="@+id/line_tab"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
 
                 <TableLayout
-                    android:id="@+id/iocout_collect_box_tl"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginTop="@dimen/spacing_big"
-                    android:background="@drawable/bg_button_enabled"
-                    android:padding="10dp"
-                    android:stretchColumns="1"
-                    android:visibility="gone"
-                    tools:visibility="visible"
-                    >
+                    android:layout_marginTop="@dimen/space_top_8"
+                    style="@style/CardWhiteStyle_wrapheight">
 
                     <TableRow>
-
                         <TextView
-                            android:id="@+id/tv_box_collection_success"
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginLeft="10dp"
-                            android:textColor="@color/white"
-                            android:visibility="gone" />
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:text="未备料数"/>
+                        <TextView
+                            android:id="@+id/tv_pd_restqty"
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:textColor="@color/text_search"/>
                     </TableRow>
 
                     <TableRow>
-
                         <TextView
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:text="箱号：" />
-
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:text="需求数"/>
                         <TextView
-                            android:id="@+id/iocout_box_tv"
-                            style="@style/tv"
-                            android:layout_marginLeft="3dp" />
+                            android:id="@+id/tv_pd_ouqty"
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:textColor="@color/text_search"/>
                     </TableRow>
 
                     <TableRow>
-
                         <TextView
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:text="箱内总数：" />
-
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:text="@string/text_fragment_whcheck_pd_prodcode"/>
                         <TextView
-                            android:id="@+id/iocout_box_num_tv"
-                            style="@style/tv"
-                            android:layout_marginLeft="3dp" />
+                            android:id="@+id/tv_pd_prodcode"
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:textColor="@color/text_search"/>
                     </TableRow>
-
                     <TableRow>
-
                         <TextView
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/text_procode_tailback" />
-
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:text="@string/text_fragment_whcheck_pr_detail"/>
                         <TextView
-                            android:id="@+id/iocout_box_prodcode_tv"
-                            style="@style/tv"
-                            android:layout_marginLeft="3dp" />
+                            android:id="@+id/tv_pr_detail"
+                            android:textSize="@dimen/textsize_12"
+                            style="@style/CardContentTextStylepopu"
+                            android:textColor="@color/text_search"/>
                     </TableRow>
-
                     <TableRow>
-
                         <TextView
-                            style="@style/tl_tv_style"
-                            android:layout_gravity="center_vertical"
-                            android:text="仓库：" />
-
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:text="@string/text_fragment_whcheck_pr_spec" />
                         <TextView
-                            android:id="@+id/iocout_box_whcode_tv"
-                            style="@style/tv"
-                            android:layout_marginLeft="3dp" />
+                            android:id="@+id/tv_pr_spec"
+                            style="@style/CardContentTextStylepopu"
+                            android:textSize="@dimen/textsize_12"
+                            android:textColor="@color/text_search" />
                     </TableRow>
                 </TableLayout>
 
-                <TextView
-                    android:id="@+id/iocout_collect_result"
+                <com.bin.david.form.core.SmartTable
+                    android:id="@+id/st_data"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/spacing_big"
-                    android:background="@drawable/shape_msg_block"
-                    android:padding="10dp"
-                    android:visibility="gone"
-                    tools:text="boxResultboxResultboxResultboxResult"
-                    tools:visibility="visible"/>
-
-                <TextView
-                    android:visibility="gone"
-                    android:id="@+id/iocout_next_material_information"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/spacing_big"
-                    android:background="@drawable/shape_msg_block"
-                    android:padding="10dp"
-                    tools:text="物料：PD_PRODCODE, 名称规格：PR_DETAIL || PR_SPEC未备料数: PD_RESTQTY,最小包装数：PR_ZXBZS,仓位：BAR_LOCATION,有PD_BATCHCODE 则显示批号：PD_BATCHCODE" />
-            </LinearLayout>
-
-        </ScrollView>
-
-        <LinearLayout
-            android:id="@+id/line_tab"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <TableLayout
-                android:layout_marginTop="@dimen/space_top_8"
-                style="@style/CardWhiteStyle_wrapheight">
-
-                <TableRow>
-                    <TextView
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:text="未备料数"/>
-                    <TextView
-                        android:id="@+id/tv_pd_restqty"
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:textColor="@color/text_search"/>
-                </TableRow>
-
-                <TableRow>
-                    <TextView
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:text="需求数"/>
-                    <TextView
-                        android:id="@+id/tv_pd_ouqty"
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:textColor="@color/text_search"/>
-                </TableRow>
-
-                <TableRow>
-                    <TextView
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:text="@string/text_fragment_whcheck_pd_prodcode"/>
-                    <TextView
-                        android:id="@+id/tv_pd_prodcode"
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:textColor="@color/text_search"/>
-                </TableRow>
-                <TableRow>
-                    <TextView
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:text="@string/text_fragment_whcheck_pr_detail"/>
-                    <TextView
-                        android:id="@+id/tv_pr_detail"
-                        android:textSize="@dimen/textsize_12"
-                        style="@style/CardContentTextStylepopu"
-                        android:textColor="@color/text_search"/>
-                </TableRow>
-                <TableRow>
-                    <TextView
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:text="@string/text_fragment_whcheck_pr_spec" />
-                    <TextView
-                        android:id="@+id/tv_pr_spec"
-                        style="@style/CardContentTextStylepopu"
-                        android:textSize="@dimen/textsize_12"
-                        android:textColor="@color/text_search" />
-                </TableRow>
-            </TableLayout>
-
-            <com.bin.david.form.core.SmartTable
-                android:id="@+id/st_data"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                    android:layout_height="match_parent" />
 
+            </LinearLayout>
 
         </LinearLayout>
 
+    </android.support.v4.widget.NestedScrollView>
+
 
-    </LinearLayout>
 
 </RelativeLayout>

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

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RadioGroup
+            android:id="@+id/rg_hui"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/rb_freeze"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="冻结"
+                android:textSize="@dimen/sp_14"/>
+
+            <RadioButton
+                android:id="@+id/rb_release"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="释放"/>
+        </RadioGroup>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/sp_16"
+            android:paddingRight="@dimen/sp_16">
+
+            <TextView
+                style="@style/inputItemCaption"
+                android:text="条码号"
+                android:textColor="@color/red"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext">
+
+                <com.uas.pda_smart_com.view.ClearableEditText
+                    android:id="@+id/cet_barcode_enter"
+                    style="@style/EditTextStyle"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:hint="请输入条码号"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/line_hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@drawable/shape_msg_block"
+            android:orientation="vertical"
+            android:padding="@dimen/sp_16"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_hint1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="提示"
+                android:textColor="@color/black"/>
+
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/bt_ok"
+            style="@style/ButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            android:text="确认" />
+
+    </LinearLayout>
+
+
+</RelativeLayout>

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 39,
-            versionName      : "v2.3.7"
+            versionCode      : 45,
+            versionName      : "v2.4.3"
     ]
 
     depsVersion = [