出库采集界面增加显示明细，入库绑定界面bug修改，更新修改

app/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
         android:name="com.uas.hy_electronic.application.PdaApplication"
@@ -71,7 +72,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.uas.hy_electronic"
+            android:authorities="com.uas.hy_electronic.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

app/src/main/java/com/uas/hy_electronic/adapter/PopWinWHCheckMakeMaterialListAdapter.java

@@ -48,10 +48,10 @@ public class PopWinWHCheckMakeMaterialListAdapter extends BaseAdapter {
         TextView tvColumn4 = (TextView) view.findViewById(R.id.tv_table_4);
         tvColumn4.setVisibility(View.VISIBLE);
         WHMakeMaterialProduct tmpProduct = (WHMakeMaterialProduct) getItem(position);
-        tvColumn1.setText("" + tmpProduct.getBAR_WHCODE());
-        tvColumn2.setText("" + tmpProduct.getBAR_LOCATION());
-        tvColumn3.setText("" + tmpProduct.getREMAIN());
-        tvColumn4.setText("" + tmpProduct.getMADEDATE());
+        tvColumn1.setText("" + tmpProduct.getBAR_WHCODE()== null ? "" : tmpProduct.getBAR_WHCODE());
+        tvColumn2.setText("" + tmpProduct.getBAR_LOCATION()== null ? "" : tmpProduct.getBAR_LOCATION());
+        tvColumn3.setText("" + tmpProduct.getREMAIN()== null ? "" : tmpProduct.getREMAIN());
+        tvColumn4.setText("" + tmpProduct.getMADEDATE()== null ? "" : tmpProduct.getMADEDATE());
         int[] colors = {Color.WHITE, Color.rgb(219, 238, 244)};
         view.setBackgroundColor(colors[position % 2]);
         return view;

app/src/main/java/com/uas/hy_electronic/adapter/StorageRechargeAdapter.java

@@ -6,12 +6,21 @@ import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.EditText;
+import android.widget.ListView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.hy_electronic.R;
 import com.uas.hy_electronic.bean.StorageRechargeListBean;
+import com.uas.hy_electronic.bean.WarehouseCacheBean;
+import com.uas.hy_electronic.tools.SharedPreUtil;
+import com.uas.hy_electronic.util.CommonUtil;
+import com.uas.hy_electronic.util.Constants;
+import com.uas.hy_electronic.util.FastjsonUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,11 +28,11 @@ import java.util.List;
 public class StorageRechargeAdapter extends BaseAdapter {
 
     private List<StorageRechargeListBean> objects = new ArrayList<StorageRechargeListBean>();
-
     private Context context;
     private LayoutInflater layoutInflater;
     private OnQuantityModifyListener mOnQuantityModifyListener;
-
+    private ListView mWarehouseListView;
+    private View mPopView;
     public void setOnQuantityModifyListener(OnQuantityModifyListener onQuantityModifyListener) {
         mOnQuantityModifyListener = onQuantityModifyListener;
     }
@@ -58,34 +67,94 @@ public class StorageRechargeAdapter extends BaseAdapter {
         initializeViews((StorageRechargeListBean) getItem(position), (ViewHolder) convertView.getTag(), position);
         return convertView;
     }
-
-    private void initializeViews(StorageRechargeListBean object, ViewHolder holder, final int position) {
+    private List<WarehouseCacheBean> mWarehouseCacheBeans;
+    private WarehouseCacheAdapter mWarehouseCacheAdapter;
+    private AlertDialog mWarehouseDialog;
+    private void initializeViews(StorageRechargeListBean object, ViewHolder holder, final int nums) {
         holder.listStorageRechargeOrdercodeTv.setText(object.getOrdercode());
         holder.listStorageRechargeOrdernoTv.setText(object.getOrderNo() + "");
         holder.listStorageRechargeProdcodeTv.setText(object.getProdcode());
         holder.listStorageRechargeQuantityTv.setText(object.getQuantity() + "");
         holder.listStorageRechargeSpecTv.setText(object.getDetail() + "    " + object.getSpec());
+        holder.item_cangku.setText(object.getAnd_whcode());
+
+
+        mPopView = View.inflate(context, R.layout.pop_ip_history, null);
+        mWarehouseListView = (ListView) mPopView.findViewById(R.id.pop_ip_history_lv);
+        mWarehouseCacheBeans = new ArrayList<>();
+        mWarehouseCacheAdapter = new WarehouseCacheAdapter(context, mWarehouseCacheBeans);
+        mWarehouseListView.setAdapter(mWarehouseCacheAdapter);
+        mWarehouseDialog = new AlertDialog.Builder(context).setView(mPopView).create();
+        String allWarehouse = SharedPreUtil.getString(context, Constants.FLAG.ALL_WAREHOUSE_CACHE, null);
+        try {
+            JSONArray warehouseArray = JSON.parseArray(allWarehouse);
+            if (warehouseArray != null) {
+                for (int i = 0; i < warehouseArray.size(); i++) {
+                    JSONObject warehouseObject = warehouseArray.getJSONObject(i);
+                    if (warehouseObject != null) {
+                        WarehouseCacheBean warehouseCacheBean = new WarehouseCacheBean();
+                        warehouseCacheBean.setWhcode(FastjsonUtil.getText(warehouseObject, "WH_CODE"));
+                        warehouseCacheBean.setDescription(FastjsonUtil.getText(warehouseObject, "WH_DESCRIPTION"));
+
+                        mWarehouseCacheBeans.add(warehouseCacheBean);
+                    }
+                }
+                mWarehouseCacheAdapter.notifyDataSetChanged();
+            }
+        } catch (Exception e) {
+
+        }
+
+
 
         holder.quantityModifyTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                View dialogView = View.inflate(context, R.layout.dialog_recharge_modify, null);
-                final EditText modifyEditText = dialogView.findViewById(R.id.recharge_modify_et);
-                final AlertDialog alertDialog = new AlertDialog.Builder(context).setTitle("修改数量")
-                        .setView(dialogView)
-                        .setNegativeButton(R.string.cancel, null)
-                        .setPositiveButton(R.string.confirm, null).create();
-
-                alertDialog.show();
-                alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String s = modifyEditText.getText().toString();
-                        if (mOnQuantityModifyListener != null) {
-                            mOnQuantityModifyListener.onQuantityModify(alertDialog, s, position);
+                if (mWarehouseCacheBeans.size() == 0) {
+                    CommonUtil.toastNoRepeat(context, "仓库列表获取失败，请重新登录获取数据");
+                } else {
+                    mWarehouseListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                        @Override
+                        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                            WarehouseCacheBean warehouseCacheBean = mWarehouseCacheBeans.get(position);
+                            String whcode = warehouseCacheBean.getWhcode();
+                            String description = warehouseCacheBean.getDescription();
+                            mOnQuantityModifyListener.onQuantityModify(mWarehouseDialog, whcode,description, nums);
+                            if (mWarehouseDialog != null) {
+                                mWarehouseDialog.dismiss();
+                            }
                         }
-                    }
-                });
+                    });
+                    mWarehouseDialog.show();
+                }
+
+
+
+
+
+//                View dialogView = View.inflate(context, R.layout.dialog_recharge_modify, null);
+//                final EditText modifyEditText = dialogView.findViewById(R.id.recharge_modify_et);
+//                final AlertDialog alertDialog = new AlertDialog.Builder(context).setTitle("修改数量")
+//                        .setView(dialogView)
+//                        .setNegativeButton(R.string.cancel, null)
+//                        .setPositiveButton(R.string.confirm, null).create();
+//
+//                alertDialog.show();
+//                alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View view) {
+//                        String s = modifyEditText.getText().toString();
+//                        if (mOnQuantityModifyListener != null) {
+//                            mOnQuantityModifyListener.onQuantityModify(alertDialog, s, position);
+//                        }
+//                    }
+//                });
+
+
+
+
+
+
             }
         });
     }
@@ -97,6 +166,7 @@ public class StorageRechargeAdapter extends BaseAdapter {
         private TextView listStorageRechargeQuantityTv;
         private TextView listStorageRechargeSpecTv;
         private TextView quantityModifyTv;
+        private TextView item_cangku;
 
         public ViewHolder(View view) {
             listStorageRechargeOrdercodeTv = (TextView) view.findViewById(R.id.list_storage_recharge_ordercode_tv);
@@ -105,10 +175,11 @@ public class StorageRechargeAdapter extends BaseAdapter {
             listStorageRechargeQuantityTv = (TextView) view.findViewById(R.id.list_storage_recharge_quantity_tv);
             listStorageRechargeSpecTv = (TextView) view.findViewById(R.id.list_storage_recharge_spec_tv);
             quantityModifyTv = (TextView) view.findViewById(R.id.list_storage_recharge_quantity_modify_tv);
+            item_cangku = (TextView) view.findViewById(R.id.item_cangku);
         }
     }
 
     public interface OnQuantityModifyListener {
-        void onQuantityModify(DialogInterface dialogInterface, String text, int position);
+        void onQuantityModify(DialogInterface dialogInterface, String text, String description, int position);
     }
 }

app/src/main/java/com/uas/hy_electronic/bean/MaterialInformationBean.java

@@ -54,6 +54,15 @@ public class MaterialInformationBean {
         private String PD_BATCHCODE;
         private double BAR_REMAIN;
         private String DC;
+        private String PD_OUQTY;
+
+        public String getPD_OUQTY() {
+            return PD_OUQTY;
+        }
+
+        public void setPD_OUQTY(String PD_OUQTY) {
+            this.PD_OUQTY = PD_OUQTY;
+        }
 
         public String getPR_ORISPECCODE() {
             return PR_ORISPECCODE;

app/src/main/java/com/uas/hy_electronic/bean/StorageRechargeListBean.java

@@ -14,6 +14,15 @@ public class StorageRechargeListBean {
     private double mQuantity;
     private String mSpec;
     private String mDetail;
+    private String and_whcode;
+
+    public String getAnd_whcode() {
+        return and_whcode;
+    }
+
+    public void setAnd_whcode(String and_whcode) {
+        this.and_whcode = and_whcode;
+    }
 
     public long getAndId() {
         return mAndId;

app/src/main/java/com/uas/hy_electronic/bean/VersionUpgradeBean.java

@@ -0,0 +1,52 @@
+package com.uas.hy_electronic.bean;
+
+/**
+ * Created by cjh-sail on 2023-06-25
+ */
+public class VersionUpgradeBean {
+    public String PP_PDACODE;
+    public String PP_VERSIONNUM;
+    public String PP_ATTACH;
+    public String PP_REMARK;
+    public String PP_VERSIONNAME;
+
+    public String getPP_PDACODE() {
+        return PP_PDACODE;
+    }
+
+    public void setPP_PDACODE(String PP_PDACODE) {
+        this.PP_PDACODE = PP_PDACODE;
+    }
+
+    public String getPP_VERSIONNUM() {
+        return PP_VERSIONNUM;
+    }
+
+    public void setPP_VERSIONNUM(String PP_VERSIONNUM) {
+        this.PP_VERSIONNUM = PP_VERSIONNUM;
+    }
+
+    public String getPP_ATTACH() {
+        return PP_ATTACH;
+    }
+
+    public void setPP_ATTACH(String PP_ATTACH) {
+        this.PP_ATTACH = PP_ATTACH;
+    }
+
+    public String getPP_REMARK() {
+        return PP_REMARK;
+    }
+
+    public void setPP_REMARK(String PP_REMARK) {
+        this.PP_REMARK = PP_REMARK;
+    }
+
+    public String getPP_VERSIONNAME() {
+        return PP_VERSIONNAME;
+    }
+
+    public void setPP_VERSIONNAME(String PP_VERSIONNAME) {
+        this.PP_VERSIONNAME = PP_VERSIONNAME;
+    }
+}

app/src/main/java/com/uas/hy_electronic/fragment/BarcodeGenerationFragment.java

@@ -357,7 +357,7 @@ public class BarcodeGenerationFragment extends BaseFragment implements View.OnCl
                                             Intent intent = new Intent(Intent.ACTION_VIEW);
                                             File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(mActivity, "PrinterShare.apk");
                                             if (Build.VERSION.SDK_INT >= 24) {
-                                                Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.hy_electronic", assetsFileToCacheDir);
+                                                Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.hy_electronic.fileprovider", assetsFileToCacheDir);
                                                 //Granting Temporary Permissions to a URI
                                                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                                 intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/com/uas/hy_electronic/fragment/BarcodeInfoCollectFragment.java

@@ -15,6 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.google.gson.Gson;
 import com.uas.hy_electronic.R;
@@ -30,7 +31,6 @@ import com.uas.hy_electronic.util.FastjsonUtil;
 import com.uas.hy_electronic.util.HttpCallback;
 import com.uas.hy_electronic.util.HttpParams;
 import com.uas.hy_electronic.util.NullUtil;
-import com.uas.hy_electronic.util.StringUtil;
 import com.uas.hy_electronic.util.VolleyRequest;
 import com.uas.hy_electronic.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -133,19 +133,20 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
             }
         });
 
-        String ischecheds = SharedPreUtil.getString(mActivity, Constants.BARCODECHECKBOX, null);
-        if (StringUtil.isEmpty(ischecheds)){
-            checkbox_barcode.setChecked(true);
-            SharedPreUtil.saveString(mActivity, Constants.BARCODECHECKBOX, "true");
-        }else {
-            if ("true".equals(ischecheds)){
-                checkbox_barcode.setChecked(true);
-                line__collect_old.setVisibility(View.VISIBLE);
-            }else {
-                checkbox_barcode.setChecked(false);
-                line__collect_old.setVisibility(View.GONE);
-            }
-        }
+//        String ischecheds = SharedPreUtil.getString(mActivity, Constants.BARCODECHECKBOX, null);
+//        if (StringUtil.isEmpty(ischecheds)){
+//            checkbox_barcode.setChecked(true);
+//            SharedPreUtil.saveString(mActivity, Constants.BARCODECHECKBOX, "true");
+//        }else {
+//            if ("true".equals(ischecheds)){
+//                checkbox_barcode.setChecked(true);
+//                line__collect_old.setVisibility(View.VISIBLE);
+//            }else {
+//                checkbox_barcode.setChecked(false);
+//                line__collect_old.setVisibility(View.GONE);
+//            }
+//        }
+        checkbox_barcode.setChecked(false);
         checkbox_barcode.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -577,12 +578,17 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
                 @Override
                 public void onSuccess(int flag, Object o) throws Exception {
                     progressDialog.dismiss();
+                    JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
+                    String locations = dataObject.getString("LOCATIONS") == null ? "-" : dataObject.getString("LOCATIONS");
+                    mResultTextView.setVisibility(View.VISIBLE);
+                    mResultTextView.setText(locations);
                     if (!material_in_collect_old_et.getText().toString().isEmpty()
                             &&!mLotEditText.getText().toString().isEmpty()
                             &&!mDateEditText.getText().toString().isEmpty()
                             &&!mLocationEditText.getText().toString().isEmpty()){
                         mBarcodeEditText.requestFocus();
                         mBarcodeEditText.setSelection(mBarcodeEditText.getText().toString().length());
+
                     }else {
                         BarcodeischeckData();
                     }

app/src/main/java/com/uas/hy_electronic/fragment/BarcodeSupplePrintFragment.java

@@ -213,7 +213,7 @@ public class BarcodeSupplePrintFragment extends BaseFragment {
                                             Intent intent = new Intent(Intent.ACTION_VIEW);
                                             File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(mActivity, "PrinterShare.apk");
                                             if (Build.VERSION.SDK_INT >= 24) {
-                                                Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.hy_electronic", assetsFileToCacheDir);
+                                                Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.hy_electronic.fileprovider", assetsFileToCacheDir);
                                                 //Granting Temporary Permissions to a URI
                                                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                                 intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

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

@@ -53,6 +53,7 @@ import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.StringRequest;
 import com.uas.hy_electronic.R;
 import com.uas.hy_electronic.activity.FunctionActivity;
+import com.uas.hy_electronic.adapter.PopWinWHCheckMakeMaterialListAdapter;
 import com.uas.hy_electronic.application.PdaApplication;
 import com.uas.hy_electronic.bean.ErrorMsg;
 import com.uas.hy_electronic.bean.IOCOutMakeMaterialOperMsd;
@@ -60,10 +61,12 @@ import com.uas.hy_electronic.bean.IOCOutmakeMaterialSplitBean;
 import com.uas.hy_electronic.bean.MaterialInformationBean;
 import com.uas.hy_electronic.bean.SubmitNotParam;
 import com.uas.hy_electronic.bean.WHBreakingBatchBreakingBtnClickEvent;
+import com.uas.hy_electronic.bean.WHMakeMaterialProduct;
 import com.uas.hy_electronic.database.DBManager;
 import com.uas.hy_electronic.global.GloableParams;
 import com.uas.hy_electronic.table.TableLBARCODEIO;
 import com.uas.hy_electronic.table.TableLPRODIONEEDGET;
+import com.uas.hy_electronic.tools.DataSourceManager;
 import com.uas.hy_electronic.tools.SharedPreUtil;
 import com.uas.hy_electronic.tools.VolleyUtil;
 import com.uas.hy_electronic.util.CameraUtil;
@@ -103,7 +106,8 @@ import okhttp3.OkHttpClient;
  * Created by RaoMeng on 2016/7/27.
  * 材料出库采集页面
  */
-public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener, HttpCallback {
+public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener, HttpCallback , DataSourceManager.NotifyData,
+        VolleyUtil.VolleyFinishListener{
     private static final int SCAN_BARCODE_CODE = 103;
     private static final int SPLIT_BARCODE_SUCCESS = 104;
     private static final int SPLIT_BARCODE_FAIL = 105;
@@ -344,10 +348,19 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     if (materialInformationBean.getPD_BATCHCODE() != null) {
                                         materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                     }
-                                    mMaterialInforTextView.setText(materialInfo);
+//                                    mMaterialInforTextView.setText(materialInfo);
+                                    tv_pd_restqty.setText(materialInformationBean.getPD_RESTQTY());
+                                    tv_bar_location.setText(materialInformationBean.getBAR_LOCATION());
+                                    tv_pd_ouqty.setText(materialInformationBean.getPD_OUTQTY());
+
+                                    line_tab.setVisibility(View.VISIBLE);
+                                    tv_pd_prodcode.setText(materialInformationBean.getPD_PRODCODE());
+                                    VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(mActivity, GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
+                                            requestType, materialInformationBean.getPD_PRODCODE(), "");
                                 }
                             } else {
                                 mMaterialInforTextView.setText("该出库单已经完成备料");
+                                line_tab.setVisibility(View.GONE);
                             }
                         }
 
@@ -421,6 +434,14 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private TextView mCollectBarProdcodeTv;
     private CheckBox special_check;
     private TextView text_finishno;
+    private TextView tv_pd_prodcode;
+    private TextView tv_pr_detail;
+    private TextView tv_pr_spec;
+    private ListView lvDetail;
+    private LinearLayout line_tab;
+    private TextView tv_pd_restqty;
+    private TextView tv_bar_location;
+    private TextView tv_pd_ouqty;
 
     @Override
     protected int getLayout() {
@@ -456,6 +477,18 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
         text_finishno = root.findViewById(R.id.text_finishno);
 
+        tv_pd_prodcode = root.findViewById(R.id.tv_pd_prodcode);
+        tv_pr_detail = root.findViewById(R.id.tv_pr_detail);
+        tv_pr_spec = root.findViewById(R.id.tv_pr_spec);
+        lvDetail = root.findViewById(R.id.lv_detail_whmm);
+        line_tab = root.findViewById(R.id.line_tab);
+
+
+        tv_pd_restqty = root.findViewById(R.id.tv_pd_restqty);
+        tv_bar_location = root.findViewById(R.id.tv_bar_location);
+        tv_pd_ouqty = root.findViewById(R.id.tv_pd_ouqty);
+
+
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.out_material_collect));
 //        ((FunctionActivity) getActivity()).fragment = new IOCOutMakeMaterialOper();
         ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
@@ -538,9 +571,20 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
 
     }
-
+    int requestType = -1;
+    PopWinWHCheckMakeMaterialListAdapter adapter;
+    List<WHMakeMaterialProduct> detailItemList;
     @Override
     protected void initEvents() {
+        VolleyUtil.getVolleyUtil().setOnVolleyFinishListener(this);
+        DataSourceManager.getDataSourceManager().setNotifyData(this);
+        detailItemList = DataSourceManager.getDataSourceManager().getMakeMaterialCheckItemList();
+        adapter = new PopWinWHCheckMakeMaterialListAdapter(detailItemList, mActivity);
+        lvDetail.setAdapter(adapter);
+
+        requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK;
+
+
         btnActionbarRight.setOnClickListener(this);
         etBarCode.addTextChangedListener(watcher);
         mCollectTypeRadioGroup.setOnCheckedChangeListener(this);
@@ -706,10 +750,21 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 materialInfo = materialInfo + "; 批号：" + materialInformationBean.getData().getPD_BATCHCODE();
                             }
                             if (mMaterialInforTextView != null)
-                                mMaterialInforTextView.setText(materialInfo);
+//                                mMaterialInforTextView.setText(materialInfo);
+                                tv_pd_restqty.setText(materialInformationBean.getData().getPD_RESTQTY());
+                                tv_bar_location.setText(materialInformationBean.getData().getBAR_LOCATION());
+                                tv_pd_ouqty.setText(materialInformationBean.getData().getPD_OUTQTY());
+
+
+                            line_tab.setVisibility(View.VISIBLE);
+                            tv_pd_prodcode.setText(materialInformationBean.getData().getPD_PRODCODE());
+                            VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(mActivity, GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
+                                    requestType, materialInformationBean.getData().getPD_PRODCODE(), "");
+
                         } else {
                             if (mMaterialInforTextView != null)
                                 mMaterialInforTextView.setText("该出库单当前的仓库已经完成备料");
+                            line_tab.setVisibility(View.GONE);
                         }
                     }
                 },
@@ -720,6 +775,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         String errorMsg = CommonUtil.showErrorToast(volleyError);
                         if (mMaterialInforTextView != null)
                             mMaterialInforTextView.setText(errorMsg);
+                        line_tab.setVisibility(View.GONE);
                     }
                 }) {
             @Override
@@ -970,10 +1026,20 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 if (materialInformationBean.getPD_BATCHCODE() != null) {
                                     materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                 }
-                                mMaterialInforTextView.setText(materialInfo);
+//                                mMaterialInforTextView.setText(materialInfo);
+
+                                tv_pd_restqty.setText(materialInformationBean.getPD_RESTQTY());
+                                tv_bar_location.setText(materialInformationBean.getBAR_LOCATION());
+                                tv_pd_ouqty.setText(materialInformationBean.getPD_OUTQTY());
+
+                                line_tab.setVisibility(View.VISIBLE);
+                                tv_pd_prodcode.setText(materialInformationBean.getPD_PRODCODE());
+                                VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(mActivity, GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
+                                        requestType, materialInformationBean.getPD_PRODCODE(), "");
                             }
                         } else {
                             mMaterialInforTextView.setText("该出库单已经完成备料");
+                            line_tab.setVisibility(View.GONE);
                         }
                     }
 
@@ -1138,6 +1204,24 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             CommonUtil.toastNoRepeat(mActivity, failStr);
         }
     }
+    /*=====================Volley回调接口==========================================*/
+    @Override
+    public void NotifyDataChanged(int noticeType) {
+        //修改信息显示区域的信息
+        String strDetail = detailItemList.get(0).getPR_DETAIL();
+        String strSpec = detailItemList.get(0).getPR_SPEC();
+
+        //信息区域显示
+        tv_pr_detail.setText("" + strDetail);
+        tv_pr_spec.setText("" + strSpec);
+        //table数据源修改
+        adapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onVolleyFinish(int isSuccess, Object result) {
+
+    }
 
     /**
      * popupWindow 设置适配器
@@ -1745,10 +1829,19 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 if (materialInformationBean.getPD_BATCHCODE() != null) {
                                     materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                 }
-                                mMaterialInforTextView.setText(materialInfo);
+//                                mMaterialInforTextView.setText(materialInfo);
+                                tv_pd_restqty.setText(materialInformationBean.getPD_RESTQTY());
+                                tv_bar_location.setText(materialInformationBean.getBAR_LOCATION());
+                                tv_pd_ouqty.setText(materialInformationBean.getPD_OUTQTY());
+
+                                line_tab.setVisibility(View.VISIBLE);
+                                tv_pd_prodcode.setText(materialInformationBean.getPD_PRODCODE());
+                                VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(mActivity, GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
+                                        requestType, materialInformationBean.getPD_PRODCODE(), "");
                             }
                         } else {
                             mMaterialInforTextView.setText("该出库单已经完成备料");
+                            line_tab.setVisibility(View.GONE);
                         }
                     }
 

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

@@ -1105,6 +1105,9 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                         jlt_edit_dataecode.setText(datecode);
                         jlt_edit_dc.setText(dc);
                         jlt_edit_qty.setText(qty);
+                        String locations = dataObject.getString("LOCATIONS") == null ? "-" : dataObject.getString("LOCATIONS");
+                        mResultTextView.setVisibility(View.VISIBLE);
+                        mResultTextView.setText(locations);
                     }
                     if (jlt_check_ok.isChecked()==true&&jlt_storage_in_barcode_et.getText().toString().trim().isEmpty()){
                         jlt_storage_in_barcode_et.requestFocus();

app/src/main/java/com/uas/hy_electronic/fragment/MSDSplitFragment.java

@@ -293,7 +293,7 @@ public class MSDSplitFragment extends BaseFragment implements View.OnClickListen
                                     Intent intent = new Intent(Intent.ACTION_VIEW);
                                     File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(getActivity(), "PrinterShare.apk");
                                     if (Build.VERSION.SDK_INT >= 24) {
-                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.hy_electronic", assetsFileToCacheDir);
+                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.hy_electronic.fileprovider", assetsFileToCacheDir);
                                         //Granting Temporary Permissions to a URI
                                         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                         intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/com/uas/hy_electronic/fragment/MaterialInCollectFragment.java

@@ -362,13 +362,13 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                     {
 //                        CommonUtil.toastNoRepeat(mActivity, "料号校验不一致");
 //                        mNumEditText.setText(null);
-                        mNumEditText.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                mNumEditText.requestFocus();
-
-                            }
-                        }, 100);
+//                        mNumEditText.postDelayed(new Runnable() {
+//                            @Override
+//                            public void run() {
+//                                mNumEditText.requestFocus();
+//
+//                            }
+//                        }, 100);
                         getcollectData();
 
 
@@ -554,6 +554,18 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 new Response.Listener<String>() {
                     @Override
                     public void onResponse(String s) {
+                        com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(s);
+                        com.alibaba.fastjson.JSONObject dataObject = resultObject.getJSONObject("data");
+                        String locations = dataObject.getString("LOCATIONS") == null ? "-" : dataObject.getString("LOCATIONS");
+                        mResultTextView.setVisibility(View.VISIBLE);
+                        mResultTextView.setText(locations);
+                        String barcode = mBarcodeEditText.getText().toString().trim();
+                        String lotno = mLotNoEditText.getText().toString().trim();
+                        String datecode = mDateCodeEditText.getText().toString().trim();
+                        final String num = mNumEditText.getText().toString().trim();
+                        String old = mOldEditText.getText().toString().trim();
+                        String location = mLocationEditText.getText().toString().trim();
+                        String dc = mDcEditText.getText().toString().trim();
                         if (mNumCheck)
 //                            && !TextUtils.isEmpty(mNumEditText.getText().toString().trim())
 //                            && !mNumEditText.getText().toString().trim().equals(mCheckProdcode))
@@ -584,6 +596,14 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                             mDcEditText.requestFocus();
                             mDcEditText.setSelection(mNumEditText.getText().toString().length());
                         }
+                        if (mLotnoCheck && !TextUtils.isEmpty(lotno)
+                                ||mDateCodeCheck && !TextUtils.isEmpty(datecode)
+                                ||mNumCheck && !TextUtils.isEmpty(num)
+                                ||mOldCheck && !TextUtils.isEmpty(old)
+                                ||mLocationCheck && !TextUtils.isEmpty(location)
+                                ||mDcCheck && TextUtils.isEmpty(dc)){
+                            confirmEvent();
+                        }
 
                     }
                 },

app/src/main/java/com/uas/hy_electronic/fragment/StockDataSummaryFragment.java

@@ -40,7 +40,7 @@ import java.util.List;
  */
 public class StockDataSummaryFragment extends BaseFragment implements OnColumnItemClickListener<String> {
     private SmartTable mSmartTable;
-    private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn;
+    private Column<String> mProdcodeColumn, mOutqtyColumn;
     private Column<Double> mPdaqtyColumn, mDetailColumn;
     private TableData<StockTaskMultipleBean> mTableData;
     private TextView mNumTextView;
@@ -68,7 +68,7 @@ public class StockDataSummaryFragment extends BaseFragment implements OnColumnIt
         mSmartTable = root.findViewById(R.id.stock_data_summary_st);
 
         CommonUtil.getDefaultTable(mActivity, mSmartTable);
-        mTypeColumn = new Column<String>("  型号  ", "PR_ORISPECCODE");
+//        mTypeColumn = new Column<String>("  型号  ", "PR_ORISPECCODE");
         mProdcodeColumn = new Column<String>("物料编号", "PD_PRODCODE");
         mOutqtyColumn = new Column<String>("名称", "PR_DETAIL");
         mPdaqtyColumn = new Column<Double>("出库数量", "PD_OUTQTY", new IFormat<Double>() {
@@ -114,7 +114,7 @@ public class StockDataSummaryFragment extends BaseFragment implements OnColumnIt
 
     private void setTableData(List<StockTaskMultipleBean> filterTableData) {
         mTableData = new TableData<StockTaskMultipleBean>("出库单列表", filterTableData,
-                mOutqtyColumn, mProdcodeColumn, mTypeColumn,mPdaqtyColumn, mDetailColumn);
+                mOutqtyColumn, mProdcodeColumn,mPdaqtyColumn, mDetailColumn);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
             @Override

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

@@ -556,6 +556,9 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
                         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);

app/src/main/java/com/uas/hy_electronic/fragment/StorageRechargeFragment.java

@@ -53,6 +53,7 @@ import java.util.List;
 
 public class StorageRechargeFragment extends BaseFragment implements View.OnClickListener, HttpCallback {
     private static final int SCAN_BARCODE_CODE = 111;
+    private static final int SCAN_BARCODE = 222;
     private static final int FLAG_GET_BARCODE = 0x01;
     private static final int FLAG_TURN_VERIFY = 0x02;
     private static final int FLAG_TURN_QC = 0x03;
@@ -74,6 +75,8 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
     private StringRequest mStringRequest;
     private PopupWindow mMenuPopupWindow;
     private Fragment mFragment;
+    private ClearableEditText ce_prodcode;
+    private ImageView prodcode_iv;
 
     @Override
     protected int getLayout() {
@@ -87,7 +90,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
 
         mMenuButton = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
         mBarcodeEditText = (ClearableEditText) root.findViewById(R.id.storage_recharge_collect_et);
-        mBarcodeEditText.requestFocus();
+//        mBarcodeEditText.requestFocus();
         mScanImageView = (ImageView) root.findViewById(R.id.storage_recharge_scan_iv);
         mTransferButton = (Button) root.findViewById(R.id.storage_recharge_transfer_btn);
         mDataLinearLayout = (LinearLayout) root.findViewById(R.id.storage_recharge_data_ll);
@@ -95,7 +98,9 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
         mErrorTextView = (TextView) root.findViewById(R.id.storage_recharge_error_tv);
         mErrorScrollView = (ScrollView) root.findViewById(R.id.storage_recharge_error_sv);
         mChangeButton = (Button) root.findViewById(R.id.storage_recharge_purchase_change_btn);
-
+        ce_prodcode = root.findViewById(R.id.ce_Prodcode);
+        prodcode_iv = root.findViewById(R.id.Prodcode_iv);
+        ce_prodcode.requestFocus();
         View headerView = View.inflate(mActivity, R.layout.header_storage_recharge_list, null);
         mHeaderBarcodeTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_barcode_tv);
         mHeaderReceiptTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_receipt_tv);
@@ -167,6 +172,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
         mScanImageView.setOnClickListener(this);
         mTransferButton.setOnClickListener(this);
         mChangeButton.setOnClickListener(this);
+        prodcode_iv.setOnClickListener(this);
 
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -181,43 +187,47 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                 return false;
             }
         });
+        ce_prodcode.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 barcode = ce_prodcode.getText().toString().trim();
+                    if (barcode.isEmpty()){
+                        CommonUtil.toastNoRepeat(mActivity, "请输入通知单号");
+                    }else {
+                        mBarcodeEditText.requestFocus();
+                    }
 
+                    return true;
+                }
+                return false;
+            }
+        });
         mStorageRechargeAdapter.setOnQuantityModifyListener(new StorageRechargeAdapter.OnQuantityModifyListener() {
             @Override
-            public void onQuantityModify(final DialogInterface dialogInterface, String text, final int position) {
-                double quantity = -1;
-                try {
-                    quantity = Double.parseDouble(text);
-                } catch (Exception e) {
-                    CommonUtil.toastNoRepeat(mActivity, "请输入正确的数字");
-//                    dialogInterface.dismiss();
-                    return;
-                }
+            public void onQuantityModify(final DialogInterface dialogInterface, String text, String description,final int position) {
+                if (text.isEmpty()||description.isEmpty()){
 
-                if (quantity <= 0) {
-                    CommonUtil.toastNoRepeat(mActivity, "数量必须大于0");
-//                    dialogInterface.dismiss();
                     return;
                 }
-
+                Log.e("descr22iption",text);
                 progressDialog.show();
-                final double finalQuantity = quantity;
                 VolleyRequest.getInstance().stringRequest(mStringRequest,
                         new HttpParams.Builder()
-                                .url(GloableParams.ADDRESS_RECHARGE_UPDATEANDINQTY)
+                                .url(GloableParams.ADDRESS_UPDATEANDWHCODE)
                                 .method(Request.Method.POST)
                                 .tag(TAG + "updateandinqty")
                                 .flag(FLAG_UPDATEANDINQTY)
                                 .addParam("and_id", mStorageRechargeListBeans.get(position).getAndId() + "")
-                                .addParam("qty", quantity + "")
+                                .addParam("whcode", text)
                                 .build(), new HttpCallback() {
                             @Override
                             public void onSuccess(int flag, Object o) throws Exception {
                                 progressDialog.dismiss();
                                 dialogInterface.dismiss();
-
-                                mStorageRechargeListBeans.get(position).setQuantity(finalQuantity);
-
+                                mStorageRechargeListBeans.get(position).setAnd_whcode(text+"("+description+")");
                                 mStorageRechargeAdapter.notifyDataSetChanged();
                             }
 
@@ -242,6 +252,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.storage_recharge_scan_iv:
+                mBarcodeEditText.requestFocus();
                 if (CameraUtil.hasCamera()) {
                     if (root.findFocus() != null) {
                         mFocusId = root.findFocus().getId();
@@ -255,6 +266,21 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                     CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
                 }
                 break;
+            case R.id.Prodcode_iv:
+                ce_prodcode.requestFocus();
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE);
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+                break;
             case R.id.btn_actionbar_more:
                 CommonUtil.setBackgroundAlpha(getActivity(), 0.5f);
                 mMenuPopupWindow.showAsDropDown(mMenuButton);
@@ -268,7 +294,14 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                         return;
                     }
                     if (!CommonUtil.isRepeatClick()) {
-                        hideAllViews();
+                        for (int i=0;i<mStorageRechargeListBeans.size();i++){
+                            Log.e("mSteListBeans",mStorageRechargeListBeans.get(i).getAnd_whcode());
+                            if (mStorageRechargeListBeans.get(i).getAnd_whcode().isEmpty()){
+                                CommonUtil.toastNoRepeat(mActivity, "请检查是否有明细未选择仓库");
+                                return;
+                            }
+                        }
+
                         progressDialog.show();
                         VolleyRequest.getInstance().stringRequest(mStringRequest,
                                 new HttpParams.Builder()
@@ -314,6 +347,18 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                 }
             }
         }
+        if (requestCode == SCAN_BARCODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.storage_recharge_collect_et) {
+                    if (result.isEmpty()){
+                        CommonUtil.toastNoRepeat(mActivity, "请输入通知单号");
+                    }else {
+                        mBarcodeEditText.requestFocus();
+                    }
+                }
+            }
+        }
     }
 
     private void closeMenuPopupWindow() {
@@ -385,6 +430,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONArray dataArray = resultObject.getJSONArray("data");
                     if (dataArray != null) {
+                        hideAllViews();
                         String successMsg = "送检成功";
                         for (int i = 0; i < dataArray.size(); i++) {
                             JSONObject dataObject = dataArray.getJSONObject(i);
@@ -494,6 +540,11 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
             JSONObject mainObject = dataObject.getJSONObject("main");
             if (mainObject != null) {
                 mMainId = FastjsonUtil.getInt(mainObject, "AN_ID");
+                if (!FastjsonUtil.getText(mainObject, "AN_CODE").equals(ce_prodcode.getText().toString().trim())){
+                    CommonUtil.toastNoRepeat(mActivity, "通知单号不匹配");
+                    return;
+                }
+                mBarcodeEditText.requestFocus();
                 mHeaderReceiptTextView.setText(FastjsonUtil.getText(mainObject, "AN_CODE"));
                 mHeaderSupplierTextView.setText(FastjsonUtil.getText(mainObject, "AN_VENDNAME"));
                 mHeaderStateTextView.setText(FastjsonUtil.getText(mainObject, "AN_STATUS"));
@@ -503,6 +554,9 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                 for (int i = 0; i < detailArray.size(); i++) {
                     JSONObject detailObject = detailArray.getJSONObject(i);
                     if (detailObject != null) {
+                        if (FastjsonUtil.getText(detailObject, "AND_PRODCODE").equals("")){
+
+                        }
                         StorageRechargeListBean storageRechargeListBean = new StorageRechargeListBean();
                         storageRechargeListBean.setAndId(FastjsonUtil.getLong(detailObject, "AND_ID"));
                         storageRechargeListBean.setProdcode(FastjsonUtil.getText(detailObject, "AND_PRODCODE"));
@@ -511,6 +565,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                         storageRechargeListBean.setQuantity(FastjsonUtil.getDouble(detailObject, "AND_INQTY"));
                         storageRechargeListBean.setDetail(FastjsonUtil.getText(detailObject, "PR_DETAIL"));
                         storageRechargeListBean.setSpec(FastjsonUtil.getText(detailObject, "PR_SPEC"));
+                        storageRechargeListBean.setAnd_whcode(FastjsonUtil.getText(detailObject, "AND_WHCODE"));
                         mStorageRechargeListBeans.add(storageRechargeListBean);
                     }
                 }

app/src/main/java/com/uas/hy_electronic/fragment/VersionUpgradeFragment.java

@@ -106,7 +106,7 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_OUTMATERIAL_GETPDAVERSION)
                 .method(Request.Method.GET)
-                .addParam("code", "UAS_SMART")
+                .addParam("code", "UAS仓库管理")
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {

app/src/main/java/com/uas/hy_electronic/fragment/WHCombineBatchFragment.java

@@ -347,7 +347,7 @@ public class WHCombineBatchFragment extends BaseFragment implements View.OnClick
                                     Intent intent = new Intent(Intent.ACTION_VIEW);
                                     File assetsFileToCacheDir = FileUtils.getAssetsFileToCacheDir(getActivity(), "PrinterShare.apk");
                                     if (Build.VERSION.SDK_INT >= 24) {
-                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.hy_electronic", assetsFileToCacheDir);
+                                        Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.hy_electronic.fileprovider", assetsFileToCacheDir);
                                         //Granting Temporary Permissions to a URI
                                         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                                         intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

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

@@ -266,6 +266,7 @@ public class GloableParams {
     public static String ADDRESS_INVENTORYBINDING;
     public static String ADDRESS_INVENTORYBINDING2;
     public static String ADDRESS_TURNPURCBARCODE;
+    public static String ADDRESS_UPDATEANDWHCODE;
 
 
 
@@ -285,7 +286,8 @@ public class GloableParams {
     //下载附件
     private static final String ADDRESSTAIL_COMMON_DOWNLOADBYID = "/common/downloadbyId.action";
     //获取应用版本信息
-    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
+//    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/outMaterial/getPdaVersion.action";
+    private static final String ADDRESSTAIL_OUTMATERIAL_GETPDAVERSION = "/api/pda/getPdaVersion.action";
 
     /**
      * 条码信息采集
@@ -712,6 +714,7 @@ public class GloableParams {
     private static String ADDRESSTAIL_IQC_TURN_PURC_STORAGE = "/api/pda/QCToPurcCheckin/turnPurcStorage.action";
     private static String ADDRESSTAIL_IQC_GETLIST_NEEDGET = "/api/pda/QCToPurcCheckin/getNeedGetList.action";
     private static String ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE = "/api/pda/QCToPurcCheckin/turnPurcBarCode.action";
+    private static String ADDRESSTAIL_IQC_GETLIST_UPDATEANDWHCODE = "/api/pda/acceptNToVerify/updateAndWhcode.action";
 
     /**
      * MSD管理
@@ -828,7 +831,7 @@ public class GloableParams {
             GRIDNAME_MODIFY_QUANTITY,
 //            GRIDNAME_WORK_INVENTORY,
             MENU_STORAGE_BARCODE_INFO_COLLECT,
-            MENU_STORAGE_STOCK_INFO_COLLECT
+//            MENU_STORAGE_STOCK_INFO_COLLECT
 //            GRIDNAME_BOM_CHECK,
 //            GRIDNAME_FINISHED_PRODUCT_STORAGE,
 //            GRIDNAME_FINISHED_PRODUCT_OUTBOUND,
@@ -842,7 +845,7 @@ public class GloableParams {
 //            R.drawable.storage_transfer,
             R.drawable.storage_work_inventory,
             R.drawable.ic_modify_quantity,
-            R.drawable.storage_transfer
+//            R.drawable.storage_transfer
 //            R.drawable.storage_msd_manager,
 //            R.drawable.ic_finished_product_storage,
 //            R.drawable.ic_finished_product_outbound,
@@ -1225,6 +1228,7 @@ public class GloableParams {
         GloableParams.ADDRESS_INVENTORYBINDING= uriHead + GloableParams.ADDRESSTAIL_INVENTORYBINDING;
         GloableParams.ADDRESS_INVENTORYBINDING2= uriHead + GloableParams.ADDRESSTAIL_RECEIVING_INVENTORYBINDING2;
         GloableParams.ADDRESS_TURNPURCBARCODE= uriHead + GloableParams.ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE;
+        GloableParams.ADDRESS_UPDATEANDWHCODE= uriHead + GloableParams.ADDRESSTAIL_IQC_GETLIST_UPDATEANDWHCODE;
 
     }
 }

app/src/main/java/com/uas/hy_electronic/util/Constants.java

@@ -12,7 +12,7 @@ public interface Constants {
         String PRINT_SHARE_PACKAGE = "com.dynamixsoftware.printershare";
         String PRINT_FILE_NAME = "print.pdf";
         String PRINT_FILE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + "/UASPDA/printFile";
-        String APK_FILE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + "/hy_electronic/apk";
+        String APK_FILE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + "/uas_mes/apk";
         String APK_FILE_NAME = "hy_electronic.apk";
 
         String APP_ICON_URL = "http://zhbj.qianlong.com/logo.png";

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

@@ -22,7 +22,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="6dp"
-            android:text="物料一致性校验" />
+            android:text="物料一致性校验"
+            android:checked="false"
+            android:visibility="gone"/>
     </LinearLayout>
     <LinearLayout
         android:orientation="vertical"
@@ -60,7 +62,8 @@
             android:layout_marginTop="5dp"
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:visibility="gone">
             <TextView
                 android:id="@+id/material_in_collect_old_tv"
                 android:layout_width="110dp"

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

@@ -339,6 +339,7 @@
                     tools:visibility="visible"/>
 
                 <TextView
+                    android:visibility="gone"
                     android:id="@+id/iocout_next_material_information"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -355,10 +356,153 @@
                     android:background="@drawable/shape_msg_block"
                     android:padding="10dp"
                     tools:text="" />
-
             </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_bar_location"
+                        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>
+            <LinearLayout
+                style="@style/CardWhiteSytle_fillheight"
+                android:background="@color/white">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/button_normal"
+                    android:orientation="horizontal">
+                    <View
+                        android:layout_width="0.5px"
+                        android:layout_height="fill_parent"
+                        android:background="#B8B8B8" />
+                    <!--第一列-->
+                    <TextView
+                        android:id="@+id/tv_table_1"
+                        style="@style/CardContentTextStyle"
+                        android:layout_weight="1"
+                        android:text="仓库"
+                        android:textSize="@dimen/space_top_line_15"/>
+
+                    <View
+                        android:layout_width="0.5px"
+                        android:layout_height="fill_parent"
+                        android:background="#B8B8B8" />
+                    <!--第二列-->
+                    <TextView
+                        android:id="@+id/tv_table_2"
+                        style="@style/CardContentTextStyle"
+                        android:layout_weight="1"
+                        android:text="储位"
+                        android:textSize="@dimen/space_top_line_15"/>
+
+                    <View
+                        android:layout_width="0.5px"
+                        android:layout_height="fill_parent"
+                        android:background="#B8B8B8" />
+                    <!--第三列-->
+                    <TextView
+                        android:id="@+id/tv_table_3"
+                        style="@style/CardContentTextStyle"
+                        android:layout_weight="1"
+                        android:text="数量"
+                        android:textSize="@dimen/space_top_line_15"/>
+
+                    <View
+                        android:layout_width="0.5px"
+                        android:layout_height="fill_parent"
+                        android:background="#B8B8B8" />
+                    <TextView
+                        android:id="@+id/tv_table_4"
+                        style="@style/CardContentTextStyle"
+                        android:layout_weight="1"
+                        android:text="DC"
+                        android:textSize="@dimen/space_top_line_15"/>
+
+                </LinearLayout>
+                <!--信息列表-->
+                <ListView
+                    android:id="@+id/lv_detail_whmm"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/transparent"/>
+            </LinearLayout>
+        </LinearLayout>
     </LinearLayout>
 
 </RelativeLayout>

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

@@ -43,7 +43,8 @@
             android:id="@+id/jlt_check_ok"
             android:text="采集唯一码"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:visibility="gone">
         </CheckBox>
 
     </LinearLayout>

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

@@ -43,8 +43,7 @@
                 android:id="@+id/storage_iqc_in_data_ll"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:visibility="gone">
+                android:orientation="vertical">
                 <LinearLayout
                     android:layout_marginTop="5dp"
                     android:orientation="horizontal"

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

@@ -6,9 +6,34 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="16dp">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_line_edittext">
+
+        <com.uas.hy_electronic.view.ClearableEditText
+            android:id="@+id/ce_Prodcode"
+            style="@style/EditTextStyle"
+            android:layout_weight="1"
+            android:background="@null"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:hint="请采集通知单号"
+            android:imeOptions="actionSend"
+            android:textColor="@color/black" />
 
+        <ImageView
+            android:id="@+id/Prodcode_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginRight="10dp"
+            android:clickable="false"
+            android:src="@drawable/ic_edittext_scan" />
+    </LinearLayout>
 
     <LinearLayout
+        android:layout_marginTop="@dimen/space_left_5"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_line_edittext">
@@ -31,7 +56,8 @@
             android:layout_gravity="center"
             android:layout_marginRight="10dp"
             android:clickable="false"
-            android:src="@drawable/ic_edittext_scan" />
+            android:src="@drawable/ic_edittext_scan"
+            />
     </LinearLayout>
 
     <FrameLayout

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

@@ -16,7 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/body_text_1"
-            android:textSize="20sp"
+            android:textSize="@dimen/sp_16"
             tools:text="YS1506606" />
 
         <TextView
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:textColor="@color/body_text_1"
-            android:textSize="20sp"
+            android:textSize="@dimen/sp_16"
             tools:text="采购验收单" />
     </RelativeLayout>
 

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

@@ -102,4 +102,18 @@
             android:textSize="14sp"
             tools:text="名称+规格" />
     </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="4dp">
+        <TextView
+            android:id="@+id/item_cangku"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_weight="1"
+            android:textSize="14sp"
+            tools:text="仓库" />
+    </LinearLayout>
 </LinearLayout>

app/src/main/res/xml/file_paths.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-path path="Android/data/com.uas.hy_electronic/"        name="files_root" />
-    <external-path path="." name="external_storage_root" />
+    <external-path path="Android/data/com.uas.hy_electronic/"
+        name="files_root" />
+    <external-path
+        name="external_storage_root"
+        path="." />
 </paths>

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 10,
-            versionName      : "v1.0"
+            versionCode      : 13,
+            versionName      : "v1.0.3"
     ]
 
     depsVersion = [