接口对接

app/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'com.android.application'
 android {
     signingConfigs {
         pda_storage {
-            keyAlias 'gd_storage_alias'
+            keyAlias 'uas_mes_alias'
             keyPassword 'pdakeystone'
             storeFile file('C:\\sigin\\gd_storage.jks')
             storePassword 'pdakeystone'
@@ -44,10 +44,10 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "UAS_GD_STORAGE_RELEASE_${releaseInfo}.apk"
+                    fileName = "UAS_MES_STORAGE_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
-                    fileName = "UAS_GD_STORAGE_DEBUG_${debugInfo}.apk"
+                    fileName = "UAS_MES_STORAGE_DEBUG_${debugInfo}.apk"
                 }
                 outputFileName = fileName
             }

app/src/main/java/com/uas/gdstorage/activity/FunctionActivity.java

@@ -15,9 +15,9 @@ import com.android.volley.toolbox.StringRequest;
 import com.uas.gdstorage.R;
 import com.uas.gdstorage.fragment.BaseFragment;
 import com.uas.gdstorage.fragment.ChargingSummaryFragment;
+import com.uas.gdstorage.fragment.ComeInSiteFragment;
 import com.uas.gdstorage.fragment.GdMaterialInFragment;
 import com.uas.gdstorage.fragment.GdTimeReportFragment;
-import com.uas.gdstorage.fragment.GdWorkPauseFragment;
 import com.uas.gdstorage.fragment.GdWorkSwitchFragment;
 import com.uas.gdstorage.fragment.IndexSettingFragment;
 import com.uas.gdstorage.fragment.QualityManageFragment;
@@ -85,14 +85,14 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                     //mFragment = new GdWorkStartFragment();
                     mFragment=new WorkOrderSearchFragment();
                     break;
-                //解除绑定
-                case GloableParams.GRIDNAME_WORK_PAUSE:
-                    mFragment = new GdWorkPauseFragment();
-                    break;
                 //工单切换
                 case GloableParams.GRIDNAME_WORK_SWITCH:
                     mFragment = new GdWorkSwitchFragment();
                     break;
+                //进站
+                case GloableParams.GRIDNAME_COME_IN_SITE:
+                    mFragment = new ComeInSiteFragment();
+                    break;
                 //接料
                 case GloableParams.GRIDNAME_IN_MATERIAL:
                     mFragment = new GdMaterialInFragment();

app/src/main/java/com/uas/gdstorage/activity/IndexActivity.java

@@ -1,6 +1,8 @@
 package com.uas.gdstorage.activity;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.BitmapDrawable;
@@ -24,6 +26,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.gdstorage.R;
@@ -73,6 +76,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private ClearableEditText edit_et;
     private Button mBackButton;
     private StaffUpPopup mStaffUpPopup;
+    private StringRequest mStringRequest;
 
     @Override
     protected void onDestroy() {
@@ -399,7 +403,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             mCurDoc.setText(MACODE);
         } else {
             mCurDoc.setText("");
-            CommonUtil.toastNoRepeat(this, "暂未在线工单，可点击工单启动进行操作");
+            CommonUtil.toastNoRepeat(this, "暂未在线工单，可点击工单绑定进行操作");
         }
         if (!StringUtil.isEmpty(dataObject.getString("UNFINISHQQTY"))) {
             mUnfinish.setText(dataObject.getString("UNFINISHQQTY"));
@@ -436,7 +440,9 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         sc_name=SharedPreUtil.getString(this,Constants.FLAG.GANG_WEI_SOURCE_NAME,"");
         mPositionR.setText(sc_code);
         mScName.setText(sc_name);
-
+//        if (!StringUtil.isEmpty(sc_code)) {
+//            handleCode(sc_code, true);
+//        }
     }
 
     @Override
@@ -482,6 +488,50 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 if(GloableParams.GRIDNAME_STEP_TRANSFER.equals(itemName)
                  ||GloableParams.GRIDNAME_STEP_RECEIVE.equals(itemName)){
                     goFragment(position);
+                }else if(GloableParams.GRIDNAME_WORK_PAUSE.equals(itemName)){//解除绑定
+                    if(TextUtils.isEmpty(workOrder)){
+                        CommonUtil.toastNoRepeat(this, "暂无在线工单，无法进行解除绑定操作");
+                        return;
+                    }
+                    new AlertDialog.Builder(this).setTitle("提示").setMessage("确认解除绑定？\n"+"工单:"+workOrder)
+                            .setPositiveButton(getString(R.string.confirm), new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    progressDialog.show();
+                                    VollyRequest.getInstance().stringRequest(mStringRequest,
+                                            new HttpParams.Builder()
+                                                    .url(GloableParams.ADDRESS_PDA_STOPMA)
+                                                    .method(Request.Method.POST)
+                                                    .tag("stopMa")
+                                                    .flag(0)
+                                                    .addParam("ma_code",workOrder)
+                                                    .addParam("sc_code",sc_code)
+                                                    .build(), new HttpCallback() {
+                                                @Override
+                                                public void onSuccess(int flag, Object o) throws Exception {
+                                                    Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                                                    if (isSuccess){
+                                                        CommonUtil.toastNoRepeat(IndexActivity.this,"解绑成功！");
+                                                        JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
+                                                        Intent intent =  new Intent(IndexActivity.this, IndexActivity.class);
+                                                        intent.putExtra(Constants.FLAG.SC_CODE,sc_code);
+                                                        startActivity(intent);
+                                                    }else{
+                                                        CommonUtil.toastNoRepeat(IndexActivity.this,"解绑失败!");
+                                                    }
+                                                    progressDialog.dismiss();
+                                                }
+
+                                                @Override
+                                                public void onFail(int flag, String failStr) throws Exception {
+                                                    progressDialog.dismiss();
+                                                    CommonUtil.toastNoRepeat(IndexActivity.this, failStr);
+                                                }
+                                            });
+
+                                }
+                            }).setNegativeButton(getString(R.string.cancel), null).create().show();
+
                 }else{
                     if (StringUtil.isEmpty(workOrder)){
                         //工单启动，人员换岗

app/src/main/java/com/uas/gdstorage/fragment/ComeInSiteFragment.java

@@ -0,0 +1,130 @@
+package com.uas.gdstorage.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.gdstorage.R;
+import com.uas.gdstorage.activity.FunctionActivity;
+import com.uas.gdstorage.activity.IndexActivity;
+import com.uas.gdstorage.global.GloableParams;
+import com.uas.gdstorage.util.CommonUtil;
+import com.uas.gdstorage.util.Constants;
+import com.uas.gdstorage.util.FastjsonUtil;
+import com.uas.gdstorage.util.HttpCallback;
+import com.uas.gdstorage.util.HttpParams;
+import com.uas.gdstorage.util.VollyRequest;
+import com.uas.gdstorage.view.ClearableEditText;
+
+public class ComeInSiteFragment extends BaseFragment {
+    private StringRequest mStringRequest;
+    private Boolean canReturn = true;
+    private TextView tv_order_num,tv_location;
+    private ClearableEditText ed_pichi,ed_come_in_num;
+    private Button btn_come_in;
+
+    private String sc_code;
+    private String ma_code;
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_come_in_site;
+    }
+
+    @Override
+    protected void initViews() {
+        ((FunctionActivity) getActivity()).setTitle("进站");
+        tv_order_num=root.findViewById(R.id.tv_order_num);
+        tv_location=root.findViewById(R.id.tv_location);
+        ed_pichi=root.findViewById(R.id.ed_pichi);
+        ed_come_in_num=root.findViewById(R.id.ed_come_in_num);
+        btn_come_in=root.findViewById(R.id.btn_come_in);
+    }
+    @Override
+    protected void initEvents() {
+        mActivity.findViewById(R.id.btn_actionbar_withback).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(canReturn){
+                    getActivity().finish();
+                }
+                progressDialog.dismiss();
+            }
+        });
+        btn_come_in.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String pichi=ed_pichi.getText().toString();
+                String comeInNum=ed_come_in_num.getText().toString();
+
+                if(TextUtils.isEmpty(pichi)){
+                    CommonUtil.toastNoRepeat(mActivity,"生产批次不能为空");
+                    return;
+                }
+                if(TextUtils.isEmpty(comeInNum)){
+                    CommonUtil.toastNoRepeat(mActivity,"进站数量不能为空");
+                    return;
+                }
+                if(Integer.parseInt(comeInNum)<=0){
+                    CommonUtil.toastNoRepeat(mActivity,"进站数量必须大于0");
+                    return;
+                }
+                progressDialog.show();
+                VollyRequest.getInstance().stringRequest(mStringRequest,
+                        new HttpParams.Builder()
+                                .url(GloableParams.ADDRESS_PDA_GETSTEPIN)
+                                .method(Request.Method.POST)
+                                .tag(TAG + "stepIn")
+                                .flag(0)
+                                .addParam("sc_code",sc_code)
+                                .addParam("ma_code",ma_code)
+                                .addParam("lotno",pichi)
+                                .addParam("inqty",comeInNum)
+                                .build(), new HttpCallback() {
+                            @Override
+                            public void onSuccess(int flag, Object o) throws Exception {
+                                Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
+                                if (isSuccess) {
+                                    CommonUtil.toastNoRepeat(mActivity, "进站成功!");
+                                    Intent intent = new Intent(mActivity, IndexActivity.class);
+                                    intent.putExtra(Constants.FLAG.SC_CODE, sc_code);
+                                    startActivity(intent);
+                                }
+                                progressDialog.dismiss();
+                            }
+                            @Override
+                            public void onFail(int flag, String failStr) throws Exception {
+                                progressDialog.dismiss();
+                                CommonUtil.toastNoRepeat(mActivity, failStr);
+                            }
+                        });
+            }
+        });
+    }
+
+    @Override
+    protected void initDatas() {
+        Bundle bundle = getArguments();//从activity传过来的Bundle
+        if(bundle!=null){
+            sc_code = bundle.getString(Constants.FLAG.SC_CODE);
+            ma_code = bundle.getString(Constants.FLAG.MA_CODE);
+            tv_location.setText(sc_code);
+            tv_order_num.setText(ma_code);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

app/src/main/java/com/uas/gdstorage/fragment/GdMaterialInFragment.java

@@ -308,7 +308,7 @@ public class GdMaterialInFragment extends BaseFragment implements View.OnClickLi
             case R.id.edit_im:
                 initEditPopupWindow(v);
                 break;
-            case R.id.sure_btn:
+            case R.id.sure_btn://接料
                 doFeeding();
                 break;
             case R.id.scan_order_im:

app/src/main/java/com/uas/gdstorage/fragment/GdTimeReportFragment.java

@@ -3,6 +3,7 @@ package com.uas.gdstorage.fragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
@@ -20,6 +21,7 @@ import com.uas.gdstorage.R;
 import com.uas.gdstorage.activity.FunctionActivity;
 import com.uas.gdstorage.activity.IndexActivity;
 import com.uas.gdstorage.global.GloableParams;
+import com.uas.gdstorage.listener.MyEditorActionListener;
 import com.uas.gdstorage.tools.SharedPreUtil;
 import com.uas.gdstorage.util.CommonUtil;
 import com.uas.gdstorage.util.Constants;
@@ -56,6 +58,9 @@ public class GdTimeReportFragment extends BaseFragment {
     private double unitNumber = 1000;
     private double lastunitNumber = 1000;
     private double lastunreportqty = 0.00;
+    private ClearableEditText ed_pichi;
+    private String  reportNum="";
+    private TextView tv_report_name;
 
     @Override
     protected int getLayout() {
@@ -72,6 +77,8 @@ public class GdTimeReportFragment extends BaseFragment {
         mOlUnuseEt = root.findViewById(R.id.ol_unuse_et);
         mOlRemarkEt = root.findViewById(R.id.ol_remark_et);
         mOlExChangeBtn = root.findViewById(R.id.ol_pause_btn);
+        ed_pichi=root.findViewById(R.id.ed_pichi);
+        tv_report_name=root.findViewById(R.id.tv_report_name);
         String name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME,null);
         mOlNameTv.setText(name);
     }
@@ -79,6 +86,17 @@ public class GdTimeReportFragment extends BaseFragment {
     @Override
     protected void initEvents() {
         initUnitView();
+        //批次号Enter键
+        CommonUtil.setEditorActionListener(ed_pichi, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                LogUtil.i("mCodeet", "mCodeet");
+                if (ed_pichi.getText().toString().length()> 0) {
+                    String codeyStr = ed_pichi.getText().toString().trim();
+                    ChechCode(codeyStr);
+                }
+            }
+        });
         mOlExChangeBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -119,8 +137,53 @@ public class GdTimeReportFragment extends BaseFragment {
                }
             }
         });
+    }
+    /**
+     * 检测生产批次号
+     */
+    private void ChechCode(String piCode) {
+        if (StringUtil.isEmpty(piCode)) return;
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDA_GETUNREPORTQTY)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getUnreportQty")
+                        .flag(0)
+                        .addParam("sc_code", sc_code)
+                        .addParam("lotno", piCode)
+                        .addParam("ma_code", ma_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        try {
+                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
+                            if (isSuccess) {
+                                JSONObject barcode_dataObject = FastjsonUtil.getJSONObject(o.toString(), "data");
+                                if(barcode_dataObject!=null){
+                                    reportNum=barcode_dataObject.getInteger("V_QTY")+"";
+                                    mOlNumbersEt.setText(reportNum);
+                                }
+                            }else{
+                                mOlNumbersEt.setText("");
+                            }
 
+                        } catch (Exception e) {
+                            mOlNumbersEt.setText("");
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                        mOlNumbersEt.setText("");
+                    }
+                });
     }
+
+
     @Override
     protected void initDatas() {
         Bundle bundle = getArguments();//从activity传过来的Bundle
@@ -128,7 +191,8 @@ public class GdTimeReportFragment extends BaseFragment {
             sc_code = bundle.getString(Constants.FLAG.SC_CODE);
             ma_code = bundle.getString(Constants.FLAG.MA_CODE);
             mOlIdTv.setText(ma_code +"");
-            getUnreportqty();
+            tv_report_name.setText(sc_code);
+           // getUnreportqty();
         }
 
     }
@@ -170,42 +234,28 @@ public class GdTimeReportFragment extends BaseFragment {
 
     private void dosubmitClick() {
         Map<Object,String> exchangeData = new HashMap<>();
-
-        String madeqty = mOlNumbersEt.getText().toString();
-        String scrapqty = mOlUnuseEt.getText().toString();
-        String remark = mOlRemarkEt.getText().toString();
-
-        if(madeqty.length() == 0 || madeqty == ""){
-            CommonUtil.toastNoRepeat(mActivity,"请输入报工数");
+        String pici = ed_pichi.getText().toString();//批次号
+        String madeqty = mOlNumbersEt.getText().toString();//报工数
+        String scrapqty = mOlUnuseEt.getText().toString();//报废数
+        String remark = mOlRemarkEt.getText().toString();//备注
+        if(TextUtils.isEmpty(pici)){
+            CommonUtil.toastNoRepeat(mActivity,"生产批次不能为空");
             return;
         }
-        if (madeqty.equals("0.0")) madeqty = "0";
-        if(scrapqty.length() == 0 || scrapqty == ""){
-            scrapqty = "0";
-//            CommonUtil.toastNoRepeat(mActivity,"请输入报废数");
-//            return;
+        if(madeqty.length() == 0 || madeqty == ""){
+            CommonUtil.toastNoRepeat(mActivity,"报工数不能为空");
+            return;
         }
-//        if(remark.length() == 0 || remark == ""){
-//            CommonUtil.toastNoRepeat(mActivity,"请输入备注");
-//            return;
-//        }
-/*
-        Double thisNumber = (Double.valueOf(scrapqty) + Double.valueOf(madeqty))*unitNumber;
-        Double lastUnNumber = lastunreportqty*lastunitNumber;
-        if (thisNumber> lastUnNumber){
-            CommonUtil.toastNoRepeat(mActivity,"报工数与报废数之和不可以大于上一工序报工数");
+        if(Integer.parseInt(madeqty)<=0){
+            CommonUtil.toastNoRepeat(mActivity,"报工数必须大于0");
             return;
-        }*/
-
+        }
+        exchangeData.put("lotno",pici);
         exchangeData.put("madeqty",madeqty);
         exchangeData.put("scrapqty",scrapqty);
         exchangeData.put("remark",remark+"");
-        exchangeData.put("unit",unitSelctStr);
         LogUtil.i(TAG,JSON.toJSONString(exchangeData));
-
-//        if (1 < 2) return;
         progressDialog.show();
-
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
                         .url(GloableParams.ADDRESS_PDA_REPORTMA)
@@ -220,13 +270,10 @@ public class GdTimeReportFragment extends BaseFragment {
                     public void onSuccess(int flag, Object o) throws Exception {
                         Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
                         if (isSuccess){
-//                            SharedPreUtil.saveString(mActivity,Constants.FLAG.REPORT_UNIT,unitSelctStr);
-                            CommonUtil.toastNoRepeat(mActivity,"实时报工成功");
+                            CommonUtil.toastNoRepeat(mActivity,"报工成功");
                             Intent intent =  new Intent(mActivity, IndexActivity.class);
                             intent.putExtra("SC_CODE",sc_code);
                             startActivity(intent);
-                        }else {
-
                         }
                     }
 
@@ -234,9 +281,7 @@ public class GdTimeReportFragment extends BaseFragment {
                     public void onFail(int flag, String failStr) throws Exception {
                         progressDialog.dismiss();
                         CommonUtil.toastNoRepeat(mActivity, failStr);
-
                     }
-
                 });
     }
 

app/src/main/java/com/uas/gdstorage/fragment/GdWorkSwitchFragment.java

@@ -3,6 +3,10 @@ package com.uas.gdstorage.fragment;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
@@ -10,13 +14,17 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.uas.gdstorage.R;
 import com.uas.gdstorage.activity.CommonSeclecActivity;
 import com.uas.gdstorage.activity.FunctionActivity;
@@ -37,11 +45,10 @@ import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickListener {
+    private TextView tv_gangwei;
     private TextView mOlIdTv;
     private TextView mOlNUmbersTv;
     private TextView mOlNameTv;
@@ -58,12 +65,23 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
     private ArrayAdapter<String> unitAdapter;
     private String unitSelctStr = "PCS";
     private String lastUnit = "PCS";
-
     private double unitNumber = 1000;
     private double lastunitNumber = 1000;
     private double lastunreportqty = 0.00;
-
-
+    //
+    private ClearableEditText mSearch;
+    private RecyclerView fuzzyRv;
+    private List<FuzzyBean> fuzzyBeans;
+    private FuzzySearchAdapter fuzzyAdapter;
+    private LinearLayout startLlS;
+    private TextView gongdanhaoTv;
+    private TextView gongdanshuTv;
+    private TextView yibaogongTv;
+    private TextView changpingTv;
+    private TextView mingchenTv;
+    private TextView guigeTv;
+    private JSONObject detailOne;
+    private Button startBtn;
     @Override
     protected int getLayout() {
         return R.layout.fragment_gd_work_switch;
@@ -72,6 +90,14 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
     @Override
     protected void initViews() {
         ((FunctionActivity) getActivity()).setTitle("工单切换");
+        startBtn = root.findViewById(R.id.start_btn);
+        startLlS = root.findViewById(R.id.start_ll);
+        gongdanhaoTv = root.findViewById(R.id.gongdanhao_tv);
+        gongdanshuTv = root.findViewById(R.id.gongdanshu_tv);
+        yibaogongTv = root.findViewById(R.id.yibaogong_tv);
+        changpingTv = root.findViewById(R.id.changping_tv);
+        mingchenTv = root.findViewById(R.id.mingchen_tv);
+        guigeTv = root.findViewById(R.id.guige_tv);
 
         mOlIdTv = root.findViewById(R.id.ol_id_tv);
         mOlNUmbersTv = root.findViewById(R.id.olun_numbers_tv);
@@ -83,13 +109,54 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         mOlNextEt = root.findViewById(R.id.ol_next_et);
         root.findViewById(R.id.scan_code_im).setOnClickListener(this);
         root.findViewById(R.id.ol_next_im).setOnClickListener(this);
+        tv_gangwei=root.findViewById(R.id.tv_gangwei);
         String name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME, null);
         mOlNameTv.setText(name);
+        mSearch = root.findViewById(R.id.fl_search_actext);
+        startLlS = root.findViewById(R.id.start_ll);
+        //模糊查询展示的工单号列表
+        fuzzyRv = root.findViewById(R.id.fuzzy_rv);
+        fuzzyRv.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+        fuzzyRv.setLayoutManager(new LinearLayoutManager(mActivity));
+        fuzzyBeans = new ArrayList<>();
+        fuzzyAdapter = new FuzzySearchAdapter(fuzzyBeans);
+        fuzzyAdapter.setmList(fuzzyBeans);
+        fuzzyRv.setAdapter(fuzzyAdapter);
     }
 
     @Override
     protected void initEvents() {
         initUnitView();
+        mSearch.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) { }
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.length() >= 3) {
+                    String mSearchStr = s.toString().trim();
+                    LogUtil.i("mSearchStr",mSearchStr);
+                    fuzzySearchMa(mSearchStr);
+                } else {
+                    fuzzyBeans.clear();
+                    setfuzzyAdapter(fuzzyBeans);
+                    return;
+                }
+            }
+        });
+        fuzzyAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                FuzzyBean bean = fuzzyAdapter.getBeanByPositon(position);
+                String macode = bean.getMA_CODE();
+                if (macode.length() > 0){
+                    getLastBean(macode);
+                    mSearch.setText("");
+                }
+            }
+        });
+
         mOlExChangeBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -104,7 +171,6 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
                 LogUtil.i("unitSelctStr", unitSelctStr);
                 upDateUnitNumber();
             }
-
             @Override
             public void onNothingSelected(AdapterView<?> parent) {
             }
@@ -135,6 +201,119 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
                 }
             }
         });
+        //启动按钮启动事件
+        startBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                doExChangeClick();
+            }
+        });
+    }
+    //工单细查询
+    private void getLastBean(String clickCode) {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDA_GETMACODE)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getMaCode")
+                        .flag(0)
+                        .addParam("code", clickCode)
+                        .addParam("sc_code",sc_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        progressDialog.dismiss();
+                        if (isSuccess){
+                            JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(),"data");
+                            if (dataObject == null){
+                                CommonUtil.toastNoRepeat(mActivity,"暂无工单详细信息");
+                                startLlS.setVisibility(View.GONE);
+                                fuzzyRv.setVisibility(View.VISIBLE);
+                                return;
+                            }else {
+                                startLlS.setVisibility(View.VISIBLE);
+                                fuzzyRv.setVisibility(View.GONE);
+                                fuzzyBeans.clear();
+                                detailOne = dataObject;
+                                gongdanhaoTv.setText(dataObject.getString("MA_CODE") == null ? "-" :dataObject.getString("MA_CODE"));
+                                gongdanshuTv.setText(dataObject.getInteger("MA_QTY") == null ? "-":dataObject.getInteger("MA_QTY")+"");
+                                yibaogongTv.setText(dataObject.getInteger("MA_REPORTYQTY") == null ? "-": dataObject.getInteger("MA_REPORTYQTY")+"");
+                                changpingTv.setText(dataObject.getString("MA_PRODCODE") == null ? "-" :dataObject.getString("MA_PRODCODE"));
+                                mingchenTv.setText(dataObject.getString("PR_DETAIL") == null ? "-" : dataObject.getString("PR_DETAIL"));
+                                guigeTv.setText(dataObject.getString("PR_SPEC") == null ? "-" :dataObject.getString("PR_SPEC")+"");
+                            }
+                        }
+                    }
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+    private void setfuzzyAdapter(List<FuzzyBean> mList) {
+        fuzzyRv.setVisibility(View.VISIBLE);
+        LogUtil.i("mList2", JSON.toJSONString(mList));
+        if (fuzzyAdapter == null){
+            fuzzyAdapter = new FuzzySearchAdapter(mList);
+            fuzzyRv.setAdapter(fuzzyAdapter);
+        }else {
+            fuzzyAdapter.setmList(mList);
+            fuzzyAdapter.notifyDataSetChanged();
+        }
+    }
+
+    //模糊查询
+    private void fuzzySearchMa(String code){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDA_FUZZYSEARCHMA)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "fuzzySearchMa")
+                        .flag(0)
+                        .addParam("ma_code", code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                        if (isSuccess){
+                            JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                            if (dataArray == null || dataArray.size() == 0){
+                                CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                                fuzzyBeans.clear();
+                                setfuzzyAdapter(fuzzyBeans);
+                                return;
+                            }
+                            FuzzyBean bean = null;
+                            if (fuzzyBeans.size() > 0) fuzzyBeans.clear();
+                            for (Object index : dataArray){
+                                JSONObject data = (JSONObject) index;
+                                bean = new FuzzyBean(data.getString("MA_CODE"));
+                                fuzzyBeans.add(bean);
+                            }
+                            setfuzzyAdapter(fuzzyBeans);
+                            startLlS.setVisibility(View.GONE);
+                            fuzzyRv.setVisibility(View.VISIBLE);
+
+                        }else {
+
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+
+                });
+
     }
 
     private void upDateUnitNumber() {
@@ -155,58 +334,10 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
             default:
                 break;
         }
-//            if(!StringUtil.isEmpty(mOlNumbersEt.getText().toString())){
-//                mOlNumbersEt.setText(Double.valueOf(Double.valueOf(mOlNumbersEt.getText().toString())/unitNumber)+"");
-//            }
-//            if(!StringUtil.isEmpty(mOlUnuseEt.getText().toString())){
-//                mOlUnuseEt.setText(Double.valueOf(Double.valueOf(mOlUnuseEt.getText().toString())/unitNumber)+"");
-//            }
-
     }
 
     private void doExChangeClick() {
-        Map<Object, String> exchangeData = new HashMap<>();
-
-        String madeqty = mOlNumbersEt.getText().toString();
-        String scrapqty = mOlUnuseEt.getText().toString();
-        String remark = mOlRemarkEt.getText().toString();
-        String nextol = mOlNextEt.getText().toString();
-
-        if (madeqty.length() == 0 || madeqty == "") {
-            CommonUtil.toastNoRepeat(mActivity, "请输入报工数");
-            return;
-        }
-        if (madeqty.equals("0.0")) madeqty = "0";
-        if (scrapqty.length() == 0 || scrapqty == "") {
-            scrapqty = "0";
-//            CommonUtil.toastNoRepeat(mActivity,"请输入报废数");
-//            return;
-        }
-//        if(remark.length() == 0 || remark == ""){
-//            CommonUtil.toastNoRepeat(mActivity,"请输入备注");
-//            return;
-//        }
-        if (nextol.length() == 0 || nextol == "") {
-            CommonUtil.toastNoRepeat(mActivity, "请输入下一工单");
-            return;
-        }
-/*
-        Double thisNumber = (Double.valueOf(scrapqty) + Double.valueOf(madeqty))*unitNumber;
-        Double lastUnNumber = lastunreportqty*lastunitNumber;
-        if (thisNumber> lastUnNumber){
-            CommonUtil.toastNoRepeat(mActivity,"报工数与报废数之和不可以大于上一工序报工数");
-            return;
-        }*/
-        exchangeData.put("madeqty", madeqty);
-        exchangeData.put("scrapqty", scrapqty);
-        exchangeData.put("remark", remark);
-        exchangeData.put("unit", unitSelctStr);
-//        exchangeData.put("next_macode",nextol);
-
         progressDialog.show();
-
-//        next_macode = SharedPreUtil.getString(mActivity,"MA_CODE",null).equals("BZMB20181227007") ? "BZMB20181225001" : "BZMB20181227007";
-
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
                         .url(GloableParams.ADDRESS_PDA_CHANGEMA)
@@ -215,32 +346,25 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
                         .flag(0)
                         .addParam("ma_code", mOlIdTv.getText().toString())
                         .addParam("sc_code", sc_code)
-                        .addParam("next_macode", nextol)
-                        .addParam("data", JSON.toJSONString(exchangeData))
+                        .addParam("next_macode", gongdanhaoTv.getText().toString())
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
                         Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
                         if (isSuccess) {
-//                            SharedPreUtil.saveString(mActivity,"MA_CODE",next_macode);
-//                            SharedPreUtil.saveString(mActivity,Constants.FLAG.REPORT_UNIT,unitSelctStr);
+                            CommonUtil.toastNoRepeat(mActivity, "工单切换成功!");
                             Intent intent = new Intent(mActivity, IndexActivity.class);
                             intent.putExtra(Constants.FLAG.SC_CODE, sc_code);
                             startActivity(intent);
-                        } else {
-
                         }
                         progressDialog.dismiss();
-
                     }
 
                     @Override
                     public void onFail(int flag, String failStr) throws Exception {
                         progressDialog.dismiss();
                         CommonUtil.toastNoRepeat(mActivity, failStr);
-
                     }
-
                 });
 
     }
@@ -252,13 +376,13 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
             sc_code = bundle.getString(Constants.FLAG.SC_CODE);
             ma_code = bundle.getString(Constants.FLAG.MA_CODE);
             mOlIdTv.setText(ma_code + "");
-            getUnreportqty();
+            tv_gangwei.setText(sc_code);
+           // getUnreportqty();
         }
 
     }
 
     private void initUnitView() {
-//        unitSelctStr = SharedPreUtil.getString(mActivity,Constants.FLAG.REPORT_UNIT,"空");
         mUnitspinner = root.findViewById(R.id.unit_spinner);
         unitList = new ArrayList<>();
         unitList.add("KPCS");
@@ -271,7 +395,6 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
 
     //获取当前线别在线工单、当前登录人员名称、工单未报工数
     private void getUnreportqty() {
-
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
@@ -389,4 +512,40 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         }
 
     }
+    private class FuzzySearchAdapter extends BaseQuickAdapter<FuzzyBean, BaseViewHolder> {
+        private List<FuzzyBean> mList;
+
+        public List<FuzzyBean> getmList() {
+            return mList;
+        }
+
+        public void setmList(List<FuzzyBean> mList) {
+            this.mList = mList;
+        }
+        public FuzzyBean getBeanByPositon(int position){
+            return mList.get(position);
+        }
+        private FuzzySearchAdapter(@Nullable List<FuzzyBean> data) {
+            super(R.layout.fuzzy_search_item, data);
+        }
+        @Override
+        protected void convert(BaseViewHolder helper,FuzzyBean item) {
+            helper.setText(R.id.macode_Tv,item.getMA_CODE());
+        }
+    }
+
+
+
+
+    private class FuzzyBean{
+        String MA_CODE = null;
+
+        public FuzzyBean(String MA_CODE) {
+            this.MA_CODE = MA_CODE;
+        }
+
+        public String getMA_CODE() {
+            return MA_CODE;
+        }
+    }
 }

app/src/main/java/com/uas/gdstorage/fragment/ReportDetailFragment.java

@@ -1,15 +1,30 @@
 package com.uas.gdstorage.fragment;
 
+import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
 import com.uas.gdstorage.R;
 import com.uas.gdstorage.activity.FunctionActivity;
-import com.uas.gdstorage.util.LogUtil;
+import com.uas.gdstorage.global.GloableParams;
+import com.uas.gdstorage.util.CommonUtil;
+import com.uas.gdstorage.util.Constants;
+import com.uas.gdstorage.util.FastjsonUtil;
+import com.uas.gdstorage.util.HttpCallback;
+import com.uas.gdstorage.util.HttpParams;
+import com.uas.gdstorage.util.VollyRequest;
 
 public class ReportDetailFragment extends BaseFragment {
-
+    private StringRequest mStringRequest;
     private Boolean canReturn = true;
-
+    private TextView tv_pichi,tv_report_num,tv_destory_num,tv_report_man,tv_report_time;
+    private String sc_code;
+    private String ma_code;
     @Override
     protected int getLayout() {
         return R.layout.fragment_report_detail;
@@ -18,13 +33,17 @@ public class ReportDetailFragment extends BaseFragment {
     @Override
     protected void initViews() {
         ((FunctionActivity) getActivity()).setTitle("报工明细");
+        tv_pichi=root.findViewById(R.id.tv_pichi);
+        tv_report_num=root.findViewById(R.id.tv_report_num);
+        tv_destory_num=root.findViewById(R.id.tv_destory_num);
+        tv_report_man=root.findViewById(R.id.tv_report_man);
+        tv_report_time=root.findViewById(R.id.tv_report_time);
     }
     @Override
     protected void initEvents() {
         mActivity.findViewById(R.id.btn_actionbar_withback).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                LogUtil.i(TAG,"按了左上角返回键");
                 if(canReturn){
                     getActivity().finish();
                 }
@@ -36,6 +55,55 @@ public class ReportDetailFragment extends BaseFragment {
 
     @Override
     protected void initDatas() {
+        Bundle bundle = getArguments();//从activity传过来的Bundle
+        if(bundle!=null){
+            sc_code = bundle.getString(Constants.FLAG.SC_CODE);
+            ma_code = bundle.getString(Constants.FLAG.MA_CODE);
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDA_GETREPORTDATA)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getReportData")
+                        .flag(0)
+                        .addParam("sc_code",sc_code)
+                        .addParam("ma_code",ma_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        try {
+                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
+                            if (isSuccess) {
+                                JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(), "data");
+                                if(!TextUtils.isEmpty(dataObject.getString("SP_LOTNO"))){
+                                    tv_pichi.setText(dataObject.getString("SP_LOTNO"));
+                                }
+                                if(!TextUtils.isEmpty(dataObject.getString("SP_QTY"))){
+                                    tv_report_num.setText(dataObject.getString("SP_QTY"));
+                                }
+                                if(!TextUtils.isEmpty(dataObject.getString("SP_NGQTY"))){
+                                    tv_destory_num.setText(dataObject.getString("SP_NGQTY"));
+                                }
+                                if(!TextUtils.isEmpty(dataObject.getString("SP_INMAN"))){
+                                    tv_report_man.setText(dataObject.getString("SP_INMAN"));
+                                }
+                                if(!TextUtils.isEmpty(dataObject.getString("SP_DATE"))){
+                                    tv_report_time.setText(dataObject.getString("SP_DATE"));
+                                }
+                            }
+                        } catch (Exception e) {
+
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
     }
 
     @Override

app/src/main/java/com/uas/gdstorage/fragment/WorkOrderSearchFragment.java

@@ -25,6 +25,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.gdstorage.R;
+import com.uas.gdstorage.activity.FunctionActivity;
 import com.uas.gdstorage.activity.IndexActivity;
 import com.uas.gdstorage.global.GloableParams;
 import com.uas.gdstorage.util.CommonUtil;
@@ -69,6 +70,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
+        FunctionActivity.setTitle("工单绑定");
         initStartView();
         mSearch = root.findViewById(R.id.fl_search_actext);
         mRefreshLayout = root.findViewById(R.id.SmartRefreshLayout_id);
@@ -201,7 +203,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
                         .method(Request.Method.GET)
                         .tag(TAG + "getMaCode")
                         .flag(0)
-                        .addParam("ma_code", clickCode)
+                        .addParam("code", clickCode)
                         .addParam("sc_code",sc_code)
                         .build(), new HttpCallback() {
                     @Override

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

@@ -225,6 +225,9 @@ public class GloableParams {
     public static String ADDRESS_PDA_FUZZYSEARCHMA;
     public static String ADDRESS_PDA_GETMACODE;
     public static String ADDRESS_PDA_STARTMA;
+    public static String ADDRESS_PDA_GETUNREPORTQTY;
+    public static String ADDRESS_PDA_GETREPORTDATA;
+    public static String ADDRESS_PDA_GETSTEPIN;
     public static String ADDRESS_PDA_GETMAREPORTQTY;
     public static String ADDRESS_PDA_STOPMA;
     public static String ADDRESS_PDA_CHANGEMA;
@@ -255,6 +258,7 @@ public class GloableParams {
     public static String ADDRESS_WIPSTEPTURN_SEND;
     public static String ADDRESS_WIPSTEPTURN_ACCEPT;
 
+
     /**
      * 高登
      */
@@ -698,6 +702,12 @@ public class GloableParams {
     private static final String ADDRESSTAIL_PDA_GETMACODE = "/api/pdashop/start/getMaCode.action";
     //工单启动
     private static final String ADDRESSTAIL_PDA_STARTMA = "/api/pdashop/start/startMa.action";
+    //获取报工数
+    private static final String ADDRESSTAIL_PDA_GETUNREPORTQTY = "/api/pdashop/getLotnoUnreportqty.action";
+    //获取报工详情
+    private static final String ADDRESSTAIL_PDA_GETREPORTDATA = "/api/pdashop/getReportData.action";
+    //进站
+    private static final String ADDRESSTAIL_PDA_GETSTEPIN = "/api/pdashop/stepIn.action";
     //获取工单的已报工数
     private static final String ADDRESSTAIL_PDA_GETMAREPORTQTY = "/api/pdashop/getUnreportqty.action";
     //工单暂停
@@ -715,7 +725,7 @@ public class GloableParams {
     //高登上料
     private static final String ADDRESSTAIL_PAD_FEEDEDLOADDING = "/api/pdashop/loading/loading.action";
     //获取当前账号可使用的岗位资源
-    private static final String ADDRESSTAIL_PAD_GETSOURCEBYEMP = "/api/pdashop/getSourceByEmp.action";
+    private static final String ADDRESSTAIL_PAD_GETSOURCEBYEMP = "/api/pdashop/getSource.action";
     /**
      * 工步移交
      */
@@ -746,16 +756,18 @@ public class GloableParams {
     public static final String GRIDNAME_TIME_METRIAL_DETAIL = "物料明细";
     public static final String GRIDNAME_STEP_TRANSFER = "工步移交";
     public static final String GRIDNAME_STEP_RECEIVE = "工步接收";
+    public static final String GRIDNAME_COME_IN_SITE = "进站";
    // public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
     //public static final String GRIDNAME_STAFF_UP = "人员上线";
   //  public static final String GRIDNAME_STAFF_DOWN = "人员下线";
     public static String[] indexMainGridNames = {GRIDNAME_WORK_START,
-            GRIDNAME_WORK_PAUSE, GRIDNAME_WORK_SWITCH, GRIDNAME_IN_MATERIAL, GRIDNAME_TIME_REPORT,
+            GRIDNAME_WORK_PAUSE, GRIDNAME_WORK_SWITCH, GRIDNAME_COME_IN_SITE,GRIDNAME_IN_MATERIAL, GRIDNAME_TIME_REPORT,
            GRIDNAME_TIME_REPORT_DETAIL,GRIDNAME_TIME_METRIAL_DETAIL,
            GRIDNAME_STEP_TRANSFER,GRIDNAME_STEP_RECEIVE};
 
     public static int[] indexMainGridImgs = {
             R.drawable.start, R.drawable.pause, R.drawable.swich,
+            R.drawable.ic_storage_finish_in,
             R.drawable.feeded,R.drawable.report,
             R.drawable.ic_staff_up,R.drawable.ic_staff_down,
             R.drawable.ic_storage_out,R.drawable.ic_storage_in};
@@ -1086,6 +1098,9 @@ public class GloableParams {
         GloableParams.ADDRESS_PDA_FUZZYSEARCHMA = uriHead + GloableParams.ADDRESSTAIL_PDA_FUZZYSEARCHMA;
         GloableParams.ADDRESS_PDA_GETMACODE = uriHead + GloableParams.ADDRESSTAIL_PDA_GETMACODE;
         GloableParams.ADDRESS_PDA_STARTMA = uriHead + GloableParams.ADDRESSTAIL_PDA_STARTMA;
+        GloableParams.ADDRESS_PDA_GETUNREPORTQTY = uriHead + GloableParams.ADDRESSTAIL_PDA_GETUNREPORTQTY;
+        GloableParams.ADDRESS_PDA_GETREPORTDATA = uriHead + GloableParams.ADDRESSTAIL_PDA_GETREPORTDATA;
+        GloableParams.ADDRESS_PDA_GETSTEPIN = uriHead + GloableParams.ADDRESSTAIL_PDA_GETSTEPIN;
         GloableParams.ADDRESS_PDA_GETMAREPORTQTY = uriHead + GloableParams.ADDRESSTAIL_PDA_GETMAREPORTQTY;
         GloableParams.ADDRESS_PDA_STOPMA = uriHead + GloableParams.ADDRESSTAIL_PDA_STOPMA;
         GloableParams.ADDRESS_PDA_CHANGEMA = uriHead + GloableParams.ADDRESSTAIL_PDA_CHANGEMA;

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

@@ -26,12 +26,12 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="30dp"
                     android:orientation="vertical">
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="30dp"
                         android:gravity="center_vertical">
                         <LinearLayout
                             android:layout_width="0dp"
@@ -76,7 +76,6 @@
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-
                             android:layout_weight="1"
                             android:orientation="horizontal">
                             <LinearLayout
@@ -87,7 +86,8 @@
                                 >
 
                                 <TextView
-                                    style="@style/captiontext"
+                                    android:layout_width="40dp"
+                                    android:layout_height="wrap_content"
                                     android:text="岗位:"
                                     android:textColor="#333333"
                                     android:textSize="12sp" />
@@ -97,12 +97,16 @@
                                     style="@style/valuetext"
                                     android:layout_width="wrap_content"
                                     android:textColor="#333333"
+                                    android:singleLine="true"
+                                    android:ellipsize="end"
                                     android:textSize="12sp"
                                     tools:text="3AAA" />
 
                                 <TextView
                                     android:id="@+id/scname_tv"
                                     style="@style/valuetext"
+                                    android:singleLine="true"
+                                    android:ellipsize="end"
                                     android:layout_width="wrap_content"
                                     android:paddingLeft="10dp" />
                             </LinearLayout>
@@ -122,7 +126,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="25dp"
                     android:paddingLeft="20dp"
                     android:paddingRight="20dp">
 
@@ -165,7 +169,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="20dp"
                     android:layout_marginTop="10dp"
                     android:paddingLeft="20dp"
                     android:paddingRight="20dp">

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

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="20dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="56dp"
+                android:layout_height="wrap_content"
+                android:text="工单："
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_order_num"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="56dp"
+                android:layout_height="wrap_content"
+                android:text="岗位："
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_location"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:gravity="center"
+                android:text="生产批次 "
+                android:textColor="@color/red"
+                android:textSize="14sp" />
+
+            <com.uas.gdstorage.view.ClearableEditText
+                android:id="@+id/ed_pichi"
+                style="@style/EditTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_weight="1"
+                android:hint="请输入"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:gravity="center"
+                android:text="进站数量"
+                android:textColor="@color/red"
+                android:textSize="14sp" />
+
+            <com.uas.gdstorage.view.ClearableEditText
+                android:id="@+id/ed_come_in_num"
+                style="@style/EditTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_marginLeft="3dp"
+                android:layout_weight="1"
+                android:hint="请输入(必填)"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                android:inputType="numberDecimal"/>
+        </LinearLayout>
+        <Button
+            android:id="@+id/btn_come_in"
+            style="@style/ButtonStyle"
+            android:text="确认进站" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -76,7 +76,6 @@
             android:textSize="14sp"
             android:background="@drawable/bg_edittext"
             android:textColorHint="@color/gray_light"
-
             />
 
         <ImageView

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

@@ -29,12 +29,13 @@
             android:textSize="14sp"
             tools:text="YS1506002" />
     </LinearLayout>
-
+    <!--GONE-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="80dp"
@@ -53,20 +54,18 @@
             android:textSize="14sp"
             tools:text="YS1506002" />
     </LinearLayout>
-
+    <!--GONE-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
         android:orientation="horizontal">
-
         <TextView
             android:layout_width="80dp"
             android:layout_height="match_parent"
             android:text="报工人："
             android:textColor="@color/body_text_1"
             android:textSize="14sp" />
-
         <TextView
             android:id="@+id/ol_name_tv"
             android:layout_width="match_parent"
@@ -76,13 +75,58 @@
             android:textColor="@color/body_text_1"
             android:textSize="14sp"
             tools:text="YS1506002" />
+        <TextView
+            android:layout_width="75dp"
+            android:layout_height="match_parent"
+            android:text="报工岗位:"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_report_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_weight="1"
+            android:paddingLeft="6dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="YS1506002" />
     </LinearLayout>
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="14dp"
+
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/tl_tv_style"
+            android:layout_height="match_parent"
+            android:width="80dp"
+            android:gravity="center"
+            android:padding="10dp"
+            android:text="生产批次"
+            android:textColor="@color/red"
+            android:textSize="14sp" />
+
+        <com.uas.gdstorage.view.ClearableEditText
+            android:id="@+id/ed_pichi"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:paddingLeft="16dp"
+            android:layout_weight="1"
+            android:hint="请输入"
+            android:textColor="@color/black"
+            android:textSize="14sp"
+            android:background="@drawable/bg_edittext"
+            android:textColorHint="@color/gray_light"/>
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
         android:orientation="horizontal">
 
@@ -136,10 +180,12 @@
             android:textSize="14sp"
             android:inputType="numberDecimal"/>
     </LinearLayout>
+    <!--GONE-->
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="horizontal"
+       android:visibility="gone"
        >
        <TextView
            style="@style/tl_tv_style"
@@ -159,6 +205,7 @@
            android:textSize="14sp"
            />
    </LinearLayout>
+    <!--GONE-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -5,20 +5,16 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="16dp">
-
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-
         <TextView
             android:layout_width="80dp"
             android:layout_height="wrap_content"
-            android:text="工单："
+            android:text="当前工单："
             android:textColor="@color/body_text_1"
             android:textSize="14sp" />
-
         <TextView
             android:id="@+id/ol_id_tv"
             android:layout_width="wrap_content"
@@ -29,12 +25,34 @@
             android:textSize="14sp"
             tools:text="YS1506002" />
     </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="5dp"
         android:orientation="horizontal">
+        <TextView
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:text="岗位："
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp" />
+        <TextView
+            android:id="@+id/tv_gangwei"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingLeft="6dp"
+            android:textColor="@color/body_text_1"
+            android:textSize="14sp"
+            tools:text="YS1506002" />
+    </LinearLayout>
+    <!--GONE-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="80dp"
@@ -53,12 +71,12 @@
             android:textSize="14sp"
             tools:text="YS1506002" />
     </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="80dp"
@@ -77,14 +95,13 @@
             android:textSize="14sp"
             tools:text="YS1506002" />
     </LinearLayout>
-
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="14dp"
         android:layout_marginBottom="4dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <TextView
             style="@style/tl_tv_style"
@@ -107,13 +124,13 @@
             android:inputType="numberDecimal"/>
 
     </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <TextView
             style="@style/tl_tv_style"
@@ -139,6 +156,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:visibility="gone"
         >
         <TextView
             style="@style/tl_tv_style"
@@ -163,7 +181,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="1dp"
         android:layout_marginBottom="4dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <TextView
             style="@style/tl_tv_style"
@@ -184,22 +203,20 @@
             android:textColor="@color/black"
             android:textSize="14sp" />
     </LinearLayout>
-
+    <!--GONE-->
     <CheckBox
         android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
         android:text="自动送检" />
-
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="1dp"
         android:layout_marginBottom="4dp"
-        android:orientation="horizontal">
-
+        android:orientation="horizontal"
+        android:visibility="gone">
         <TextView
             style="@style/tl_tv_style"
             android:layout_height="match_parent"
@@ -209,7 +226,6 @@
             android:text="下一工单"
             android:textColor="@color/red"
             android:textSize="14sp" />
-
         <com.uas.gdstorage.view.ClearableEditText
             android:id="@+id/ol_next_et"
             style="@style/EditTextStyle"
@@ -238,6 +254,65 @@
             android:background="@drawable/scan_code_im" />
     </LinearLayout>
 
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:gravity="center"
+                android:text="下一工单:"
+                android:textColor="@color/red"
+                android:textSize="14sp" />
+
+            <com.uas.gdstorage.view.ClearableEditText
+                android:id="@+id/fl_search_actext"
+                style="@style/Search"
+                android:layout_height="35dp"
+                android:background="@drawable/shape_from_edit"
+                android:hint="请采集需要启动的工单号"
+                android:padding="6dp"
+                android:imeOptions="actionSend"
+                android:gravity="left"
+                />
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/fuzzy_rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+
+        <LinearLayout
+            android:id="@+id/start_ll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:visibility="gone"
+            >
+
+            <include layout="@layout/start_detail_one"/>
+
+            <Button
+                android:id="@+id/start_btn"
+                android:text="工单切换"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                style="@style/ButtonStyle"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textsize_20"
+                />
+        </LinearLayout>
+
+    </LinearLayout>
+
     <Button
         android:id="@+id/ol_exchange_btn"
         style="@style/ButtonStyle"

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

@@ -9,156 +9,104 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="8dp">
-
-
+        android:padding="20dp">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="7"
+            android:layout_marginTop="6dp"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="90dp"
+                android:layout_height="match_parent"
+                android:text="生产批次号："
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_pichi"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="12dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-                    <TextView
-                        android:id="@+id/em_name_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#333333"
-                        />
-                    <TextView
-                        android:id="@+id/em_code_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#333333"
-                        android:layout_marginLeft="10dp"
-                        />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="10dp">
-
-                        <TextView
-                            android:text="岗位："
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="#333333"
-                            />
-                        <TextView
-                            android:id="@+id/ol_resource_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="#333333"
-                            android:text="CC"
-                            />
-                        <TextView
-                            android:text="非上料的岗位资源名称CCCCCCCCCCCCCCCC"
-                            android:id="@+id/scname_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="#333333"
-                            android:layout_marginLeft="10dp"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="10dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="未完数："
-                        android:textColor="#333333" />
+                android:layout_weight="1"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
 
-                    <TextView
-                        android:id="@+id/unfinish_number_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="#333333" />
-                </LinearLayout>
-            </LinearLayout>
         </LinearLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="4dp"
+            android:layout_marginTop="15dp"
             android:orientation="horizontal">
-
             <TextView
-                style="@style/tl_tv_style"
+                android:layout_width="80dp"
                 android:layout_height="match_parent"
-                android:width="80dp"
-                android:gravity="center"
-                android:padding="10dp"
-                android:text="账号"
-                android:textColor="@color/red"
+                android:text="报工数："
+                android:textColor="@color/body_text_1"
                 android:textSize="14sp" />
-
-            <com.uas.gdstorage.view.ClearableEditText
-                android:id="@+id/account_et"
-                style="@style/EditTextStyle"
-                android:layout_width="0dp"
+            <TextView
+                android:id="@+id/tv_report_num"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:hint="请输入"
-                android:textColor="@color/black"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
+            <TextView
+                android:layout_width="75dp"
+                android:layout_height="match_parent"
+                android:text="报废数:"
+                android:textColor="@color/body_text_1"
                 android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_destory_num"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:layout_weight="1"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
         </LinearLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
+            android:layout_marginTop="15dp"
             android:orientation="horizontal">
-
             <TextView
-                style="@style/tl_tv_style"
+                android:layout_width="80dp"
                 android:layout_height="match_parent"
-                android:width="80dp"
-                android:gravity="center"
-                android:padding="10dp"
-                android:text="密码"
-                android:textColor="@color/red"
+                android:text="报工人："
+                android:textColor="@color/body_text_1"
                 android:textSize="14sp" />
-
-            <com.uas.gdstorage.view.ClearableEditText
-                android:id="@+id/password_et"
-                style="@style/EditTextStyle"
-                android:layout_width="0dp"
+            <TextView
+                android:id="@+id/tv_report_man"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:hint="请输入"
-                android:textColor="@color/black"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
+            <TextView
+                android:layout_width="75dp"
+                android:layout_height="match_parent"
+                android:text="报工时间:"
+                android:textColor="@color/body_text_1"
                 android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_report_time"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:layout_weight="1"
+                android:paddingLeft="6dp"
+                android:textColor="@color/body_text_1"
+                android:textSize="14sp"
+                tools:text="YS1506002" />
         </LinearLayout>
-
-        <CheckBox
-            android:id="@+id/ischecked_ck"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:text="切换人员岗位资源不变"
-            android:checked="false"
-            />
-
-        <Button
-            android:id="@+id/surechange_brn"
-            style="@style/ButtonStyle"
-            android:text="确认切换人员" />
     </LinearLayout>
 </LinearLayout>