怎么加IQC检验

app/src/main/java/com/uas/uas_mes_standard/fragment/StorageIQCInFragment.java

@@ -21,6 +21,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -80,12 +82,34 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
     private WarehouseCacheAdapter mWarehouseCacheAdapter;
     private View mPopView;
     private int mVeId = 0;
+    private String text_rb= "合格";
 
     private StringRequest mStringRequest;
     private PopupWindow mMenuPopupWindow;
     private Fragment mFragment;
     private SpanUtils mSpanUtils;
     private double mOkQty;
+    private TextView tv_barcode;
+    private TextView tv_veCode;
+    private TextView tv_vadCode;
+    private TextView tv_prodcode;
+    private TextView tv_prDetail;
+    private TextView tv_prSpec;
+    private TextView tv_veOrderCode;
+    private TextView tv_veOrderNo;
+    private TextView tv_veVendName;
+    private TextView tv_testMethod;
+    private TextView tv_testResult;
+    private TextView tv_vadQty;
+    private TextView tv_checkQty;
+    private TextView tv_mOkQty;
+    private TextView tv_ngQty;
+    private TextView tv_status;
+    private RadioGroup rg_yesorno;
+    private RadioButton rb_yse;
+    private RadioButton rb_no;
+    private Button btn_shen;
+    private String datastring;
 
     @Override
     public void onDestroyView() {
@@ -120,6 +144,30 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
         mErrorTextView = (TextView) root.findViewById(R.id.storage_iqc_in_error_tv);
         mErrorScrollView = (ScrollView) root.findViewById(R.id.storage_iqc_in_error_sv);
 
+        tv_barcode = root.findViewById(R.id.tv_barcode);
+        tv_veCode = root.findViewById(R.id.tv_veCode);
+        tv_vadCode = root.findViewById(R.id.tv_vadCode);
+        tv_prodcode = root.findViewById(R.id.tv_prodcode);
+        tv_prDetail = root.findViewById(R.id.tv_prDetail);
+        tv_prSpec = root.findViewById(R.id.tv_prSpec);
+        tv_veOrderCode = root.findViewById(R.id.tv_veOrderCode);
+        tv_veOrderNo = root.findViewById(R.id.tv_veOrderNo);
+        tv_veVendName = root.findViewById(R.id.tv_veVendName);
+        tv_testMethod = root.findViewById(R.id.tv_testMethod);
+        tv_testResult = root.findViewById(R.id.tv_testResult);
+        tv_vadQty = root.findViewById(R.id.tv_vadQty);
+        tv_checkQty = root.findViewById(R.id.tv_checkQty);
+        tv_mOkQty = root.findViewById(R.id.tv_mOkQty);
+        tv_ngQty = root.findViewById(R.id.tv_ngQty);
+        tv_status = root.findViewById(R.id.tv_status);
+        rg_yesorno = root.findViewById(R.id.rg_yesorno);
+        rb_yse = root.findViewById(R.id.rb_yse);
+        rb_no = root.findViewById(R.id.rb_no);
+        btn_shen = root.findViewById(R.id.btn_shen);
+
+
+
+
         mCaptionValueBeans = new ArrayList<>();
         mCaptionValueItemAdapter = new CaptionValueItemAdapter(mActivity, mCaptionValueBeans);
         mDataListView.setAdapter(mCaptionValueItemAdapter);
@@ -157,8 +205,122 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
                 return false;
             }
         });
+        rg_yesorno.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+                if (checkedId == R.id.rb_yse) {
+                    text_rb="合格";
+                } else if (checkedId == R.id.rb_no) {
+                    text_rb="不合格";
+                }
+            }
+        });
+        btn_shen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                new AlertDialog.Builder(mActivity)
+                        .setMessage("确定是否是要审核")
+                        .setPositiveButton("是", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Yessehn();
+                            }
+                        })
+                        .setNegativeButton("否", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                dialog.dismiss();
+                            }
+                        }).create().show();
+
+            }
+        });
     }
+    private static final int FLAG_UPDATEANDINQTY = 0x05;
+    public void Yessehn(){
+        if (mVeId == 0) {
+            CommonUtil.toastNoRepeat(mActivity, "单据id获取失败，请重新获取条码信息");
+            return;
+        }
+
+        if (TextUtils.isEmpty(mGoodWarehouse) && mOkQty > 0) {
+            CommonUtil.toastNoRepeat(mActivity, "该检验单存在合格数,良品仓必填\n");
+            return;
+        }
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_AUTIQC)
+                        .method(Request.Method.POST)
+                        .tag(TAG + "updateandinqty")
+                        .flag(FLAG_UPDATEANDINQTY)
+                        .addParam("ve_id", mVeId+"")
+                        .addParam("ve_result", text_rb)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        String result = o.toString();
+                        JSONObject resultObject = JSON.parseObject(result);
+                        datastring = FastjsonUtil.getText(resultObject, "data");
+                        CommonUtil.toastNoRepeat(mActivity, datastring);
+//                        mDataLinearLayout.setVisibility(View.GONE);
+//                        mErrorScrollView.setVisibility(View.VISIBLE);
+                        if (!CommonUtil.isNetWorkConnected(mActivity)) {
+                            CommonUtil.toastNoRepeat(mActivity, mActivity.getString(R.string.net_not_connect));
+                        } else {
+
+                            if (!CommonUtil.isRepeatClick()) {
 
+                                hideAllViews();
+                                YessehnSTORAGE();
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+    public void YessehnSTORAGE(){
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_TURNPURCBARCODE)
+                        .method(Request.Method.POST)
+                        .flag(FLAG_IQC_IN)
+                        .tag(TAG + "turnQc")
+                        .addParam("ve_id", mVeId + "")
+                        .addParam("okwh", mGoodWarehouse)
+                        .addParam("ngwh", mBadWarehouse)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        try {
+                            progressDialog.dismiss();
+                            String result = o.toString();
+                            JSONObject resultObject = JSON.parseObject(result);
+                            JSONObject dataObject = resultObject.getJSONObject("data");
+                            Log.e("dataObject===",dataObject.toString());
+                            if (dataObject != null) {
+                                CommonUtil.toastNoRepeat(mActivity, "入库单"+FastjsonUtil.getText(dataObject, "okNO")+"生成成功");
+
+                            }
+                        } catch (Exception e) {
+
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
     @Override
     protected void initDatas() {
         //        mBadWarehouse = SharedPreUtil.getString(mActivity
@@ -365,13 +527,57 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
 
     @Override
     public void onSuccess(final int flag, Object o) throws Exception {
+        progressDialog.dismiss();
         switch (flag) {
             case FLAG_GET_BARCODE:
                 mBarcodeEditText.setText("");
-                progressDialog.dismiss();
                 try {
+                    progressDialog.dismiss();
                     String result = o.toString();
-                    analysisGetBarcode(result);
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONObject dataObject = resultObject.getJSONObject("data");
+                    if (dataObject != null) {
+                        mVeId = FastjsonUtil.getInt(dataObject, "VE_ID");
+                        String barcode = FastjsonUtil.getText(dataObject, "barcode");
+                        String veCode = FastjsonUtil.getText(dataObject, "VE_CODE");
+                        String vadCode = FastjsonUtil.getText(dataObject, "VAD_CODE");
+                        String prodcode = FastjsonUtil.getText(dataObject, "VAD_PRODCODE");
+                        String prDetail = FastjsonUtil.getText(dataObject, "PR_DETAIL");
+                        String prSpec = FastjsonUtil.getText(dataObject, "PR_SPEC");
+                        String veOrderCode = FastjsonUtil.getText(dataObject, "VE_ORDERCODE");
+                        String veOrderNo = FastjsonUtil.getText(dataObject, "VE_ORDERDETNO");
+                        String veVendName = FastjsonUtil.getText(dataObject, "VAD_VENDNAME");
+                        String testMethod = FastjsonUtil.getText(dataObject, "VE_METHOD");
+                        String testResult = FastjsonUtil.getText(dataObject, "VE_RESULT");
+                        String vadQty = FastjsonUtil.getText(dataObject, "VAD_QTY");
+                        String checkQty = FastjsonUtil.getText(dataObject, "CHECKQTY");
+                        mOkQty = FastjsonUtil.getDouble(dataObject, "OKQTY");
+                        String ngQty = FastjsonUtil.getText(dataObject, "NGQTY");
+                        String status = FastjsonUtil.getText(dataObject, "VE_STATUS");
+                        String goodWhcode = FastjsonUtil.getText(dataObject, "DEFAULTWHCODE");
+                        String goodWhname = FastjsonUtil.getText(dataObject, "DEFAULTWHNAME");
+                        String vad_whcode = FastjsonUtil.getText(dataObject, "vad_whcode");
+                        mGoodWarehouse = vad_whcode;
+                        mGoodEditText.setText(mGoodWarehouse);
+                        tv_barcode.setText(barcode);
+                        tv_veCode.setText(veCode);
+                        tv_vadCode.setText(vadCode);
+                        tv_prodcode.setText(prodcode);
+                        tv_prDetail.setText(prDetail);
+                        tv_prSpec.setText(prSpec);
+                        tv_veOrderCode.setText(veOrderCode);
+                        tv_veOrderNo.setText(veOrderNo);
+                        tv_veVendName.setText(veVendName);
+                        tv_testMethod.setText(testMethod);
+                        tv_vadQty.setText(vadQty);
+                        tv_checkQty.setText(checkQty);
+                        tv_mOkQty.setText(mOkQty+"");
+                        tv_ngQty.setText(ngQty);
+                        tv_status.setText(status);
+                    }
+                    mErrorScrollView.setVisibility(View.GONE);
+                    mDataLinearLayout.setVisibility(View.VISIBLE);
+//                    analysisGetBarcode(result);
                 } catch (Exception e) {
                     mDataLinearLayout.setVisibility(View.GONE);
                     mErrorTextView.setText("条码数据获取异常，请重新获取");
@@ -379,11 +585,12 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
                 }
                 break;
             case FLAG_IQC_IN:
-                progressDialog.dismiss();
                 try {
+                    progressDialog.dismiss();
                     String result = o.toString();
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONObject dataObject = resultObject.getJSONObject("data");
+                    Log.e("dataObject===",dataObject.toString());
                     if (dataObject != null) {
                         final JSONObject okNoObject = dataObject.getJSONObject("okNO");
                         if (okNoObject == null) {
@@ -434,6 +641,7 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
 
     @Override
     public void onFail(int flag, String failStr) throws Exception {
+
         switch (flag) {
             case FLAG_GET_BARCODE:
                 mBarcodeEditText.setText("");
@@ -555,7 +763,7 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
         mErrorTextView.setText("");
         mErrorScrollView.setVisibility(View.GONE);
         mCaptionValueBeans.clear();
-        mCaptionValueItemAdapter.notifyDataSetChanged();
+//        mCaptionValueItemAdapter.notifyDataSetChanged();
     }
 
     @Override

app/src/main/java/com/uas/uas_mes_standard/fragment/StorageInFragment.java

@@ -73,6 +73,7 @@ public class StorageInFragment extends BaseFragment implements View.OnClickListe
                     case GloableParams.MENU_STORAGE_IQC_STORAGE_IN:
                         //IQC入库
                         mFragment = new StorageIQCInFragment();
+
                         break;
                     case GloableParams.MENU_STORAGE_MATERIAL_STORAGE_IN:
                         //单据入库

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

@@ -267,6 +267,8 @@ public class GloableParams {
     public static String ADDRESS_INVENTORYBINDING;
     public static String ADDRESS_INVENTORYBINDING2;
     public static String ADDRESS_ADDRESSTAIL_PRINTSUMLABEL;
+    public static String ADDRESS_DOCUMENTLIBRARY_AUTIQC;
+    public static String ADDRESS_TURNPURCBARCODE;
 
 
     //连接服务器请求地址
@@ -754,6 +756,10 @@ public class GloableParams {
     private static final String ADDRESSTAIL_RECEIVING_INVENTORYBINDING2 = "/api/pda/receiving/stocksaveBarcode2.action";
     private static String ADDRESSTAIL_GET_PRINTSUMLABEL="/api/pda/outMaterial/printSumLabel.action";
 
+    private static String ADDRESSTAIL_RECHARGE_AUTIQC = "/api/pda/QCToPurcCheckin/autiQc.action";
+    private static String ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE = "/api/pda/QCToPurcCheckin/turnPurcBarCode.action";
+
+
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
     //主界面
@@ -858,17 +864,18 @@ public class GloableParams {
     //-->入库管理
     public static final String MENU_STORAGE_RECHARGE = "收料";
     public static final String MENU_STORAGE_INSPECTION = "送检";
-    public static final String MENU_STORAGE_IQC_STORAGE_IN = "IQC入库";
+//    public static final String MENU_STORAGE_IQC_STORAGE_IN = "IQC入库";
     public static final String MENU_STORAGE_MATERIAL_STORAGE_IN = "入库绑定";
     //    public static final String MENU_STORAGE_PRODUCT_CHECK = "成品检验";
     public static final String MENU_STORAGE_PRODUCT_STORAGE_IN = "完工品入库";
     public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
     public static final String MENU_STORAGE_BARCODE_IN = "入库采集";
     public static final String MENU_STORAGE_RECHARGE_LIST = "收料单列表";
+    public static final String MENU_STORAGE_IQC_STORAGE_IN = "IQC检验";
     public static final String[] storageInMenuNames = {
             MENU_STORAGE_RECHARGE,
 //            MENU_STORAGE_INSPECTION,
-//            MENU_STORAGE_IQC_STORAGE_IN,
+            MENU_STORAGE_IQC_STORAGE_IN,
             MENU_STORAGE_MATERIAL_STORAGE_IN,
 //            MENU_STORAGE_PRODUCT_STORAGE_IN,
 //            MENU_STORAGE_RANDOM_CHECK,
@@ -880,7 +887,7 @@ public class GloableParams {
     public static final int[] storageInMenuImgs = {
             R.drawable.ic_storage_recharge,
 //            R.drawable.ic_storage_inspection,
-//            R.drawable.ic_storage_iqc,
+            R.drawable.ic_storage_iqc,
             R.drawable.ic_storage_material_in,
 //            R.drawable.ic_storage_finish_in,
 //            R.drawable.ic_storage_random_check,
@@ -1194,6 +1201,8 @@ public class GloableParams {
         GloableParams.ADDRESS_INVENTORYBINDING= uriHead + GloableParams.ADDRESSTAIL_INVENTORYBINDING;
         GloableParams.ADDRESS_INVENTORYBINDING2= uriHead + GloableParams.ADDRESSTAIL_RECEIVING_INVENTORYBINDING2;
         GloableParams.ADDRESS_ADDRESSTAIL_PRINTSUMLABEL= uriHead + GloableParams.ADDRESSTAIL_GET_PRINTSUMLABEL;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_AUTIQC= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_AUTIQC;
+        GloableParams.ADDRESS_TURNPURCBARCODE= uriHead + GloableParams.ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE;
 
     }
 }

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

@@ -32,144 +32,550 @@
             android:clickable="false"
             android:src="@drawable/ic_edittext_scan" />
     </LinearLayout>
-
-    <FrameLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="12dp">
-
-        <LinearLayout
-            android:id="@+id/storage_iqc_in_data_ll"
+        android:layout_height="wrap_content">
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible"
-           >
-
-            <ListView
-                android:id="@+id/storage_iqc_in_data_lv"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:divider="@null" />
+            android:layout_marginTop="12dp">
 
             <LinearLayout
+                android:id="@+id/storage_iqc_in_data_ll"
                 android:layout_width="match_parent"
-                android:layout_height="36dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingBottom="3dp"
-                android:paddingLeft="12dp"
-                android:paddingRight="15dp"
-                android:paddingTop="3dp">
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="条码号:" />
 
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:text="良品仓:"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="5">
+                    <TextView
+                        android:id="@+id/tv_barcode"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="检验单号:" />
 
                     <TextView
-                        android:id="@+id/storage_iqc_good_warehouse_et"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@drawable/bg_line_edittext"
-                        android:gravity="center_vertical"
-                        android:hint="请选择"
-                        android:paddingLeft="10dp"
-                        android:paddingRight="10dp"
+                        android:id="@+id/tv_veCode"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="收料单号:" />
+
+                    <TextView
+                        android:id="@+id/tv_vadCode"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="物料编号:" />
+
+                    <TextView
+                        android:id="@+id/tv_prodcode"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="物料名称:" />
+
+                    <TextView
+                        android:id="@+id/tv_prDetail"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="物料规格:" />
+
+                    <TextView
+                        android:id="@+id/tv_prSpec"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="采购单:" />
+
+                    <TextView
+                        android:id="@+id/tv_veOrderCode"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="序号:" />
+
+                    <TextView
+                        android:id="@+id/tv_veOrderNo"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="供应商:" />
+
+                    <TextView
+                        android:id="@+id/tv_veVendName"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="检验方式:" />
+
+                    <TextView
+                        android:id="@+id/tv_testMethod"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_gravity="center"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="检验结果:" />
+                    <RadioGroup
+                        android:id="@+id/rg_yesorno"
+                        android:orientation="horizontal"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3">
+                        <RadioButton
+                            android:id="@+id/rb_yse"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="14sp"
+                            android:checked="true"
+                            android:text="合格">
+                        </RadioButton>
+                        <RadioButton
+                            android:id="@+id/rb_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="14sp"
+                            android:text="不合格">
+                        </RadioButton>
+                    </RadioGroup>
+                    <TextView
+                        android:id="@+id/tv_testResult"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" "
+                        android:visibility="gone"/>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="收料数:" />
+
+                    <TextView
+                        android:id="@+id/tv_vadQty"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_gravity="center"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="送检数:" />
+
+
+                    <TextView
+                        android:id="@+id/tv_checkQty"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="合格数:" />
+
+                    <TextView
+                        android:id="@+id/tv_mOkQty"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="不合格数:" />
+
+                    <TextView
+                        android:id="@+id/tv_ngQty"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:text="状态:" />
+
+                    <TextView
+                        android:id="@+id/tv_status"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="4dp"
+                        android:layout_weight="3"
+                        android:textColor="@color/black"
+                        android:textSize="14sp"
+                        android:text=" " />
+                </LinearLayout>
+
+                <ListView
+                    android:visibility="gone"
+                    android:id="@+id/storage_iqc_in_data_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:divider="@null" />
+                <LinearLayout
+
+                    android:layout_width="match_parent"
+                    android:layout_height="36dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingBottom="3dp"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="15dp"
+                    android:paddingTop="3dp">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="良品仓:"
+                        android:textColor="@color/black"
                         android:textSize="14sp" />
 
-                    <ImageView
-                        android:id="@+id/storage_iqc_good_warehouse_iv"
-                        android:layout_width="36dp"
+                    <RelativeLayout
+                        android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:paddingRight="4dp"
-                        android:scaleType="center"
-                        android:src="@drawable/ic_menu_retract" />
-                </RelativeLayout>
-            </LinearLayout>
+                        android:layout_weight="5">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="36dp"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingBottom="3dp"
-                android:paddingLeft="12dp"
-                android:paddingRight="15dp"
-                android:paddingTop="3dp">
+                        <TextView
+                            android:id="@+id/storage_iqc_good_warehouse_et"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/bg_line_edittext"
+                            android:gravity="center_vertical"
+                            android:hint="请选择"
+                            android:paddingLeft="10dp"
+                            android:paddingRight="10dp"
+                            android:textSize="14sp" />
 
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:text="不良品仓:"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
-
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="5">
+                        <ImageView
+                            android:id="@+id/storage_iqc_good_warehouse_iv"
+                            android:layout_width="36dp"
+                            android:layout_height="match_parent"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:paddingRight="4dp"
+                            android:scaleType="center"
+                            android:src="@drawable/ic_menu_retract" />
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <LinearLayout
+
+                    android:layout_width="match_parent"
+                    android:layout_height="36dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingBottom="3dp"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="15dp"
+                    android:paddingTop="3dp">
 
                     <TextView
-                        android:id="@+id/storage_iqc_bad_warehouse_et"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@drawable/bg_line_edittext"
-                        android:gravity="center_vertical"
-                        android:hint="请选择"
-                        android:paddingLeft="10dp"
-                        android:paddingRight="10dp"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:text="不良品仓:"
+                        android:textColor="@color/black"
                         android:textSize="14sp" />
 
-                    <ImageView
-                        android:id="@+id/storage_iqc_bad_warehouse_iv"
-                        android:layout_width="36dp"
+                    <RelativeLayout
+                        android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:paddingRight="4dp"
-                        android:scaleType="center"
-                        android:src="@drawable/ic_menu_retract"
-                        android:visibility="gone" />
-                </RelativeLayout>
-            </LinearLayout>
+                        android:layout_weight="5">
 
-            <Button
-                android:id="@+id/storage_iqc_in_commit_btn"
-                style="@style/ButtonStyle"
-                android:layout_marginTop="10dp"
-                android:text="入库" />
-        </LinearLayout>
+                        <TextView
+                            android:id="@+id/storage_iqc_bad_warehouse_et"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="@drawable/bg_line_edittext"
+                            android:gravity="center_vertical"
+                            android:hint="请选择"
+                            android:paddingLeft="10dp"
+                            android:paddingRight="10dp"
+                            android:textSize="14sp" />
+
+                        <ImageView
+                            android:id="@+id/storage_iqc_bad_warehouse_iv"
+                            android:layout_width="36dp"
+                            android:layout_height="match_parent"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:paddingRight="4dp"
+                            android:scaleType="center"
+                            android:src="@drawable/ic_menu_retract"
+                            android:visibility="gone" />
+                    </RelativeLayout>
+                </LinearLayout>
+                <Button
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:id="@+id/btn_shen"
+                    style="@style/ButtonStyle"
+                    android:layout_marginTop="10dp"
+                    android:text="审核" />
 
-        <ScrollView
-            android:id="@+id/storage_iqc_in_error_sv"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/white"
-            android:visibility="gone">
 
-            <TextView
-                android:id="@+id/storage_iqc_in_error_tv"
+                <Button
+                    android:id="@+id/storage_iqc_in_commit_btn"
+                    style="@style/ButtonStyle"
+                    android:layout_marginTop="10dp"
+                    android:text="入库"
+                    android:visibility="gone"/>
+            </LinearLayout>
+
+            <ScrollView
+                android:id="@+id/storage_iqc_in_error_sv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="10dp"
-                android:textSize="16sp"
-                tools:text="错误信息" />
-        </ScrollView>
-    </FrameLayout>
+                android:background="@color/white"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/storage_iqc_in_error_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="10dp"
+                    android:textSize="16sp"
+                    android:text="错误信息" />
+            </ScrollView>
+        </FrameLayout>
+    </ScrollView>
+
+
 </LinearLayout>