Browse Source

预加工报工增加工单号选择放大镜

ChengJH 7 months ago
parent
commit
e15ae37a48

+ 17 - 17
app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     android:versionName="1.0">
 
     <application
-        android:name="com.uas.ruiziuasmes.application.PdaApplication"
+        android:name=".application.PdaApplication"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
         android:label="@string/app_name_test"
@@ -14,15 +14,14 @@
         android:usesCleartextTraffic="true"
         tools:replace="allowBackup,label,theme"
         tools:targetApi="m">
-        <activity android:name="com.uas.ruiziuasmes.activity.JumpActivity"
-            android:screenOrientation="portrait">
-        </activity>
-
-        <activity android:name="com.uas.ruiziuasmes.activity.BaseSelectActivity" />
-
-        <activity android:name="com.uas.ruiziuasmes.activity.HomeActivity" />
+        <activity android:name=".WorkOrderSearchActivity"></activity>
+        <activity
+            android:name=".activity.JumpActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity android:name=".activity.BaseSelectActivity" />
+        <activity android:name=".activity.HomeActivity" />
         <activity
-            android:name="com.uas.ruiziuasmes.activity.SplashActivity"
+            android:name=".activity.SplashActivity"
             android:icon="@mipmap/icon"
             android:screenOrientation="portrait"
             android:theme="@style/NoOverLayStyle">
@@ -33,31 +32,32 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.uas.ruiziuasmes.activity.MainActivity"
+            android:name=".activity.MainActivity"
             android:icon="@mipmap/icon"
             android:label="@string/title_activity_menu"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
-            android:name="com.uas.ruiziuasmes.activity.IndexActivity"
+            android:name=".activity.IndexActivity"
             android:label="@string/title_activity_menu"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.uas.ruiziuasmes.activity.FunctionActivity"
+            android:name=".activity.FunctionActivity"
             android:label="@string/title_activity_function"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
-            android:name="com.uas.ruiziuasmes.activity.SearchMaterialActivity"
+            android:name=".activity.SearchMaterialActivity"
             android:label="@string/material_number_search"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.uas.ruiziuasmes.activity.CommonSeclecActivity"
+            android:name=".activity.CommonSeclecActivity"
             android:screenOrientation="portrait" />
-        <activity android:name="com.uas.ruiziuasmes.activity.LineSelectActivity"></activity>
-        <activity android:name="com.uas.ruiziuasmes.activity.SelectNetAcitivty"></activity>
+        <activity android:name=".activity.LineSelectActivity" />
+        <activity android:name=".activity.SelectNetAcitivty" />
+
         <provider xmlns:tools="http://schemas.android.com/tools"
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.uas.ruiziuasmes.fileprovider"
@@ -85,8 +85,8 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <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" />
 
 </manifest>

+ 584 - 0
app/src/main/java/com/uas/ruiziuasmes/WorkOrderSearchActivity.java

@@ -0,0 +1,584 @@
+package com.uas.ruiziuasmes;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.AdapterView;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+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.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.uas.ruiziuasmes.activity.BaseActivity;
+import com.uas.ruiziuasmes.adapter.MyaddAdapter;
+import com.uas.ruiziuasmes.bean.AddworkorderBean;
+import com.uas.ruiziuasmes.global.GloableParams;
+import com.uas.ruiziuasmes.tools.SharedPreUtil;
+import com.uas.ruiziuasmes.util.CommonUtil;
+import com.uas.ruiziuasmes.util.Constants;
+import com.uas.ruiziuasmes.util.FastjsonUtil;
+import com.uas.ruiziuasmes.util.HttpCallback;
+import com.uas.ruiziuasmes.util.HttpParams;
+import com.uas.ruiziuasmes.util.LogUtil;
+import com.uas.ruiziuasmes.util.MyArrayAdapter;
+import com.uas.ruiziuasmes.util.StringUtil;
+import com.uas.ruiziuasmes.util.VollyRequest;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WorkOrderSearchActivity extends BaseActivity {
+    private static String TAG ="WorkOrderSearchActivity";
+    private AutoCompleteTextView mSearch;
+    private StringRequest mStringRequest;
+    private RefreshLayout mRefreshLayout;
+    private List<FuzzyBean> fuzzyBeans;
+    private FuzzySearchAdapter fuzzyAdapter;
+    private Button startBtn;
+    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 String sc_code;
+    private int mFocusId;
+    private static final int SCAN_BARCODE_CODE = 201;
+    private String ifneedmj;
+    private AutoCompleteTextView ce_moju;
+    private TextView tv_mju;
+    private LinearLayout line_mju;
+    private boolean chentrueorflase = true;
+    private ArrayList<AddworkorderBean> mFilterStorageInBeans;
+    private RecyclerView recyclerView;
+    private MyArrayAdapter autoStringAdapter;
+    private ImageView clean_iv;
+    private ImageView sear_iv;
+    private MyArrayAdapter searStringAdapter;
+    private String boolea;
+    private TextView tv_actionbar_withback;
+    private Button btn_actionbar_withback;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_work_order_search);
+        initStartView();
+        mSearch = findViewById(R.id.fl_search_actext);
+        tv_actionbar_withback = findViewById(R.id.tv_actionbar_withback);
+        btn_actionbar_withback = findViewById(R.id.btn_actionbar_withback);
+        mRefreshLayout = findViewById(R.id.SmartRefreshLayout_id);
+        ce_moju = findViewById(R.id.ce_moju);
+        tv_mju = findViewById(R.id.tv_mju);
+        line_mju = findViewById(R.id.line_mju);
+        clean_iv = findViewById(R.id.clean_iv);
+        sear_iv = findViewById(R.id.sear_iv);
+
+        fuzzyBeans = new ArrayList<>();
+        fuzzyAdapter = new FuzzySearchAdapter(fuzzyBeans);
+        fuzzyAdapter.setmList(fuzzyBeans);
+
+        recyclerView = findViewById(R.id.id_item_remove_recyclerview);
+        tv_actionbar_withback.setText("工单绑定");
+
+        mRefreshLayout.setEnableRefresh(false);
+        mRefreshLayout.setEnableLoadMore(false);
+        Intent intent = getIntent();
+        if(intent!=null){
+            sc_code = intent.getStringExtra(Constants.FLAG.SC_CODE);
+        }
+        btn_actionbar_withback.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        clean_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ce_moju.setText("");
+                ce_moju.requestFocus();
+            }
+        });
+        sear_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mSearch.setText("");
+                mSearch.requestFocus();
+            }
+        });
+
+
+        mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(RefreshLayout refreshLayout) {
+                mRefreshLayout.finishRefresh();
+            }
+        });
+
+        mSearch.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    // 输入框获取到焦点时的处理逻辑
+                    fuzzySearchMa(mSearch.getText().toString().trim());
+                } else {
+                    // 输入框失去焦点时的处理逻辑
+                }
+            }
+        });
+
+        mSearch.addTextChangedListener(searchNoTextWatcher);
+
+        mSearch.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                String code = mSearch.getText().toString().trim();
+                if (actionId == EditorInfo.IME_ACTION_UNSPECIFIED && !StringUtil.isEmpty(code)){
+                    getLastBean(code);
+                }
+                return false;
+            }
+        });
+        mSearch.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                getLastBean(mSearch.getText().toString().trim());
+            }
+        });
+        //----------模具模糊搜索------------------------
+        ce_moju.addTextChangedListener(inOutNoTextWatcher);
+
+        ce_moju.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                mSearch.requestFocus();
+                mSearch.setSelection(mSearch.getText().length());
+            }
+        });
+
+
+
+
+
+
+        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("");
+                }
+
+
+            }
+        });
+
+
+        mFilterStorageInBeans = new ArrayList<>();
+
+
+
+        //启动按钮启动事件
+        startBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mFilterStorageInBeans==null||mFilterStorageInBeans.size()==0){
+                    CommonUtil.toastNoRepeat(WorkOrderSearchActivity.this, "请采集工单号");
+                    return;
+                }
+                StringBuilder stringtext = new StringBuilder();
+                for (int i=0;i<mFilterStorageInBeans.size();i++) {
+                    stringtext.append(mFilterStorageInBeans.get(i).getLOTNO()).append(",");
+                }
+                Intent resultIntent = new Intent();
+                resultIntent.putExtra("ITEM_DATA",stringtext.toString());
+                setResult(1847,resultIntent);
+                finish();
+
+
+            }
+        });
+
+
+
+
+        ifneedmj = SharedPreUtil.getString(this, Constants.FLAG.GANG_WEI_SOURCE_ifneedmj, null);
+        mSearch.setThreshold(0);
+        if (!StringUtil.isEmpty(ifneedmj)){
+            if (!ifneedmj.equals("0")){
+                line_mju.setVisibility(View.VISIBLE);
+                tv_mju.setTextColor(getResources().getColor(R.color.red));
+                ce_moju.requestFocus();
+                ce_moju.setThreshold(0);
+            }else {
+                line_mju.setVisibility(View.GONE);
+                tv_mju.setTextColor(getResources().getColor(R.color.blue));
+                mSearch.requestFocus();
+            }
+        }
+
+
+
+    }
+    private void initStartView() {
+        startBtn = findViewById(R.id.start_btn);
+        startLlS = findViewById(R.id.start_ll);
+        gongdanhaoTv = findViewById(R.id.gongdanhao_tv);
+        gongdanshuTv = findViewById(R.id.gongdanshu_tv);
+        yibaogongTv = findViewById(R.id.yibaogong_tv);
+        changpingTv = findViewById(R.id.changping_tv);
+        mingchenTv = findViewById(R.id.mingchen_tv);
+        guigeTv = findViewById(R.id.guige_tv);
+    }
+
+    @Override
+    protected void initViews() {
+
+    }
+
+    @Override
+    protected void initEvents() {
+
+    }
+
+    //工单细查询
+    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");
+//                            JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(),"data");
+                            showDetailOneOrder(dataObject);
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(WorkOrderSearchActivity.this, failStr);
+
+                    }
+
+                });
+
+    }
+
+    private void showDetailOneOrder(JSONObject dataObject) {
+        if (dataObject == null){
+            CommonUtil.toastNoRepeat(this,"暂无工单详细信息");
+            startLlS.setVisibility(View.GONE);
+            return;
+        }else {
+//            startLlS.setVisibility(View.VISIBLE);
+            fuzzyBeans.clear();
+            detailOne = dataObject;
+            if (StringUtil.isEmpty(detailOne.getString("MA_CODE"))){
+                CommonUtil.toastNoRepeat(this,"暂无工单详细信息");
+                return;
+            }
+
+
+
+            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")+"");
+            yibaogongTv.setText(dataObject.getInteger("MA_MADEQTY") == null ? "-": dataObject.getInteger("MA_MADEQTY")+"");
+
+            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")+"");
+
+            for (int i=0;i<mFilterStorageInBeans.size();i++){
+                if (mFilterStorageInBeans.get(i).getLOTNO().equals(detailOne.getString("MA_CODE"))){
+                    CommonUtil.toastNoRepeat(this, "工单重复");
+                    return;
+                }
+            }
+            AddworkorderBean jltStorageInBean = new AddworkorderBean();
+            jltStorageInBean.setLOTNO(detailOne.getString("MA_CODE"));
+            jltStorageInBean.setQTY(detailOne.getString("MA_QTY"));
+            jltStorageInBean.setMA_PRODCODE(dataObject.getString("MA_PRODCODE"));
+            jltStorageInBean.setPR_DETAIL(dataObject.getString("PR_DETAIL"));
+            jltStorageInBean.setPR_SPEC(dataObject.getString("PR_SPEC"));
+            jltStorageInBean.setMA_KIND(dataObject.getString("MA_KIND"));
+            mFilterStorageInBeans.add(jltStorageInBean);
+            MyaddAdapter addadapter = new MyaddAdapter(this, mFilterStorageInBeans);
+            recyclerView.setLayoutManager(new LinearLayoutManager(this));
+            recyclerView.setAdapter(addadapter);
+            mSearch.requestFocus();
+            mSearch.setText("");
+
+        }
+    }
+    @Override
+    protected void initDatas() {
+
+    }
+    private TextWatcher inOutNoTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            //当字数超过3个,自动弹出输入提示框
+            if (charSequence.length() >= 1) {
+                LogUtil.i("mSearchStr",ce_moju.getText().toString().trim());
+                fuzzySearchMould(ce_moju.getText().toString().trim());
+
+            }
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+            if (editable.length() == 0) {
+                clean_iv.setVisibility(View.GONE);
+            } else {
+                clean_iv.setVisibility(View.VISIBLE);
+            }
+        }
+    };
+
+
+    public static String removeTrailingDash(String str) {
+        return str.replaceFirst("\n[^\n]*$", "");
+    }
+
+    private TextWatcher searchNoTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+//            当字数超过3个,自动弹出输入提示框
+//            if (charSequence.length() >= 3) {
+            if (mSearch.getText().toString().trim().contains("\n")){
+                String s = removeTrailingDash(mSearch.getText().toString().trim());
+                mSearch.setText(s);
+            }
+
+            LogUtil.i("mSearchStr",mSearch.getText().toString().trim());
+
+            fuzzySearchMa(mSearch.getText().toString().trim());
+//            }
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+            if (editable.length() == 0) {
+                sear_iv.setVisibility(View.GONE);
+            } else {
+                sear_iv.setVisibility(View.VISIBLE);
+            }
+        }
+    };
+
+
+    //模糊查询工单号
+    private void fuzzySearchMa(String code){
+        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)
+                        .addParam("sc_code", sc_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(WorkOrderSearchActivity.this,"未搜索到匹配数据");
+                                return;
+                            }
+                            List<String> autoStrings = new ArrayList<>();
+                            autoStrings.clear();
+                            searStringAdapter = new MyArrayAdapter<String>(WorkOrderSearchActivity.this, R.layout.myarry_item, autoStrings);
+                            if (mSearch != null) {
+                                mSearch.setAdapter(searStringAdapter);
+                            }
+                            for (Object index : dataArray){
+                                JSONObject data = (JSONObject) index;
+//                                String newString = data.getString("MA_CODE").replaceFirst("^-*", "");
+                                searStringAdapter.add(data.getString("MA_CODE")+"\n"+data.getString("PR_DETAIL")+"\n"+data.getString("MA_KIND"));
+                            }
+                        }else {
+
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(WorkOrderSearchActivity.this, failStr);
+                    }
+
+                });
+
+    }
+    //查询模具
+    private void fuzzySearchMould(String code){
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_FUZZYSEARCHMOULD)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "fuzzySearchMa")
+                        .flag(0)
+                        .addParam("mouldcode", code)
+                        .addParam("sc_code", sc_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(WorkOrderSearchActivity.this,"未搜索到匹配数据");
+                                return;
+                            }
+                            List<String> autoStrings = new ArrayList<>();
+                            autoStrings.clear();
+                            autoStringAdapter = new MyArrayAdapter<String>(WorkOrderSearchActivity.this, android.R.layout.simple_dropdown_item_1line, autoStrings);
+
+                            if (ce_moju != null) {
+                                ce_moju.setAdapter(autoStringAdapter);
+                            }
+                            for (Object index : dataArray){
+
+                                JSONObject data = (JSONObject) index;
+//                                bean = new FuzzyBean(,data.getString("DE_NAME"));
+                                autoStringAdapter.add(data.getString("DE_CODE"));
+                            }
+                        }else {
+
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(WorkOrderSearchActivity.this, failStr);
+                    }
+
+                });
+
+    }
+
+
+
+    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) {
+            if (StringUtil.isEmpty(item.getDE_NAME())){
+                helper.setText(R.id.macode_Tv,item.getMA_CODE());
+            }else {
+                helper.setText(R.id.macode_Tv,item.getMA_CODE()+"-"+item.getDE_NAME());
+            }
+
+        }
+    }
+
+    private class FuzzyBean{
+        String MA_CODE = null;
+        String DE_NAME = null;
+
+        public FuzzyBean(String MA_CODE) {
+            this.MA_CODE = MA_CODE;
+        }
+
+        public FuzzyBean(String MA_CODE, String DE_NAME) {
+            this.MA_CODE = MA_CODE;
+            this.DE_NAME = DE_NAME;
+        }
+
+        public String getDE_NAME() {
+            return DE_NAME;
+        }
+
+        public String getMA_CODE() {
+            return MA_CODE;
+        }
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.fl_search_actext) {
+                    mSearch.setText(result);
+                    mSearch.setSelection(result.length());
+                }
+            }
+        }
+    }
+    @Override
+    public void onPointerCaptureChanged(boolean hasCapture) {
+
+    }
+}

+ 1 - 0
app/src/main/java/com/uas/ruiziuasmes/activity/FunctionActivity.java

@@ -228,6 +228,7 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
             mbundle.putString("de_location", de_location);
             mbundle.putString(Constants.FLAG.MLIST, listsize);
             mbundle.putSerializable("mListdata",(Serializable)mList);
+            mbundle.putString("boolea","no");//跳转工单绑定界面,用于区分父级界面
             if (mFragment != null) {
                 mFragment.setArguments(mbundle);
                 getSupportFragmentManager().beginTransaction()

+ 16 - 0
app/src/main/java/com/uas/ruiziuasmes/bean/MoreEventBusLontonbean.java

@@ -0,0 +1,16 @@
+package com.uas.ruiziuasmes.bean;
+
+public class MoreEventBusLontonbean {
+    private String stringlotno;
+    public MoreEventBusLontonbean(String stringlotno) {
+        this.stringlotno=stringlotno;
+    }
+
+    public String getStringlotno() {
+        return stringlotno;
+    }
+
+    public void setStringlotno(String stringlotno) {
+        this.stringlotno = stringlotno;
+    }
+}

+ 42 - 8
app/src/main/java/com/uas/ruiziuasmes/fragment/PreProcessingReportFragment.java

@@ -20,6 +20,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
@@ -31,6 +32,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.uas.ruiziuasmes.R;
+import com.uas.ruiziuasmes.WorkOrderSearchActivity;
 import com.uas.ruiziuasmes.activity.FunctionActivity;
 import com.uas.ruiziuasmes.bean.CaiPiBlueBean;
 import com.uas.ruiziuasmes.bean.MaintainitemBean;
@@ -79,6 +81,11 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
     private JSONArray dataArray;
     private Button btn_oneprint;
     private ClearableEditText ol_remark_et;
+    private ImageView iv_search;
+    private String sccode;
+    private String macode;
+    private String mouldcode;
+    private String stringlotno;
 
     @Override
     protected int getLayout() {
@@ -95,10 +102,10 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         ct_sum = root.findViewById(R.id.ct_sum);
         btn_oneprint = root.findViewById(R.id.btn_oneprint);
         ol_remark_et = root.findViewById(R.id.ol_remark_et);
+        iv_search = root.findViewById(R.id.iv_search);
         jlt_storage_in_barcode_save_btn = root.findViewById(R.id.jlt_storage_in_barcode_save_btn);
     }
 
-
     public static String removeBrackets(String input) {
         // 去除前后的中括号
         if (input.startsWith("[") && input.endsWith("]")) {
@@ -108,6 +115,12 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
     }
     @Override
     protected void initEvents() {
+        Bundle arguments = getArguments();
+        sccode = arguments.getString(Constants.FLAG.SC_CODE);
+        macode = arguments.getString(Constants.FLAG.MA_CODE);
+        mouldcode = arguments.getString(Constants.FLAG.MOULDCODE);
+
+
         getPrintTemplate();
         btn_oneprint.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -121,8 +134,15 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
                 }
             }
         });
-
-
+        Bundle mbundle = new Bundle();
+        iv_search.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(mActivity, WorkOrderSearchActivity.class);
+                intent.putExtra(Constants.FLAG.SC_CODE, sccode);
+                startActivityForResult(intent, Constants.FLAG.GET_COMMON_ITEM);
+            }
+        });
 
 
         jlt_storage_in_barcode_save_btn.setOnClickListener(new View.OnClickListener() {
@@ -149,9 +169,10 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         });
         ma_code = SharedPreUtil.getString(mActivity, "MA_CODE", null);
         sc_code = SharedPreUtil.getString(mActivity, "SC_CODE", null);
-        tv_ma_code.setText(ma_code);
+//        tv_ma_code.setText(ma_code);
     }
 
+
     @Override
     protected void initDatas() {
         mFeededList = new ArrayList<>();
@@ -163,10 +184,10 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         mRecyclerView.setItemAnimator(new DefaultItemAnimator());
         setAdapter(mFeededList);
         mRecyclerView.setAdapter(myAdapter);
-        getNewVersionMsg();
+//        getNewVersionMsg(ma_code);
     }
 
-    private void getNewVersionMsg() {
+    private void getNewVersionMsg(String ma_code) {
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
@@ -226,7 +247,7 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
                 new HttpParams.Builder()
                         .url(GloableParams.ADDRESS_MODIFYMAPRODS)
                         .method(Request.Method.GET)
-                        .addParam("ma_code",ma_code)
+                        .addParam("ma_code",tv_ma_code.getText().toString().trim())
                         .addParam("sc_code",sc_code)
                         .addParam("prods",prods)
                         .addParam("decode",ct_qty.getText().toString().trim())
@@ -485,6 +506,12 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+    }
+
     @SuppressLint("NonConstantResourceId")
     @Override
     public void onClick(View v) {
@@ -494,8 +521,15 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode != Activity.RESULT_OK) {
-            return;
         }
+        //不良代码选择之后回调
+        if (requestCode == Constants.FLAG.GET_COMMON_ITEM && resultCode == 1847) {
+            String result = data.getStringExtra("ITEM_DATA");
+            tv_ma_code.setText(result+"");
+            getNewVersionMsg(result);
+        }
+
+
 
     }
     public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

+ 2 - 0
app/src/main/java/com/uas/ruiziuasmes/fragment/WorkOrderSearchFragment.java

@@ -84,6 +84,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
     private ImageView clean_iv;
     private ImageView sear_iv;
     private MyArrayAdapter searStringAdapter;
+    private String boolea;
 
     @Override
     protected int getLayout() {
@@ -465,6 +466,7 @@ public class WorkOrderSearchFragment extends BaseFragment {
         Bundle bundle = getArguments();
         if(bundle!=null){
             sc_code = bundle.getString(Constants.FLAG.SC_CODE);
+            boolea = bundle.getString("boolea");
         }
 
         ifneedmj = SharedPreUtil.getString(mActivity, Constants.FLAG.GANG_WEI_SOURCE_ifneedmj, null);

+ 209 - 0
app/src/main/res/layout/activity_work_order_search.xml

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".WorkOrderSearchActivity">
+    <include
+        android:id="@+id/include_menuactionbar"
+        layout="@layout/actionbar_withback" />
+    <ScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="16sp"
+            >
+            <LinearLayout
+                android:visibility="gone"
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    style="@style/inputItemCaption"
+                    android:textColor="@color/red"
+                    android:text="模具号">
+                </TextView>
+                <LinearLayout
+                    android:layout_weight="1"
+                    android:layout_width="match_parent"
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_line_edittext">
+                    <com.uas.ruiziuasmes.view.ClearableEditText
+                        android:id="@+id/storage_recharge_collect_ets"
+                        style="@style/EditTextStyle"
+                        android:layout_height="35dp"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:layout_gravity="center"
+                        android:focusableInTouchMode="true"
+                        android:hint="请输入模具号"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+
+                    <ImageView
+                        android:id="@+id/storage_recharge_scan_ivs"
+                        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>
+                <ImageView
+                    android:id="@+id/iv_change"
+                    android:layout_width="@dimen/dp_40"
+                    android:layout_height="@dimen/dp_40"
+                    android:layout_gravity="center"
+                    android:clickable="false"
+                    android:layout_marginLeft="5dp"
+                    android:src="@drawable/search_48"
+                    android:background="@drawable/bg_button"
+                    />
+
+
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/line_mju"
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:id="@+id/tv_mju"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textColor="@color/black"
+                    android:text="模具">
+                </TextView>
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5">
+                    <AutoCompleteTextView
+                        android:id="@+id/ce_moju"
+                        style="@style/Search"
+                        android:layout_height="35dp"
+                        android:background="@drawable/shape_from_edit"
+                        android:hint="请采集模具编号"
+                        android:padding="6dp"
+                        android:imeOptions="actionSend"
+                        android:gravity="left"
+                        />
+                    <ImageView
+                        android:id="@+id/clean_iv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center|right"
+                        android:layout_marginRight="13dp"
+                        android:src="@drawable/wrong"
+                        android:visibility="gone" />
+                </FrameLayout>
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textColor="@color/red"
+                    android:text="工单">
+                </TextView>
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="5">
+                    <AutoCompleteTextView
+                        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"
+                        />
+
+                    <ImageView
+                        android:id="@+id/sear_iv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center|right"
+                        android:layout_marginRight="13dp"
+                        android:src="@drawable/wrong"
+                        android:visibility="gone" />
+                </FrameLayout>
+
+
+            </LinearLayout>
+
+
+
+
+            <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                android:id="@+id/SmartRefreshLayout_id"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                >
+
+                <com.scwang.smartrefresh.layout.header.ClassicsHeader
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:srlAccentColor="@android:color/darker_gray" />
+
+
+                <com.scwang.smartrefresh.layout.footer.ClassicsFooter
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:srlAccentColor="@android:color/darker_gray" />
+            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+
+            <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"/>
+
+            </LinearLayout>
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/id_item_remove_recyclerview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10">
+            </android.support.v7.widget.RecyclerView>
+        </LinearLayout>
+
+
+    </ScrollView>
+    <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"
+        android:layout_marginBottom="@dimen/dp_10"
+        />
+</LinearLayout>

+ 11 - 2
app/src/main/res/layout/fragment_pre_processing_report.xml

@@ -27,20 +27,29 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/red"
-                android:text="单据编号"
+                android:text="单号"
                 android:layout_marginRight="@dimen/dp_10"
                 android:gravity="right">
             </TextView>
             <TextView
                 android:id="@+id/tv_ma_code"
                 android:layout_gravity="center"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/black"
                 android:text=""
+                android:layout_weight="1"
                 android:layout_marginRight="@dimen/dp_10"
                 android:gravity="left">
             </TextView>
+            <ImageView
+                android:id="@+id/iv_search"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="5dp"
+                android:background="@drawable/bg_button"
+                android:src="@drawable/search_48" />
         </LinearLayout>
 
         <LinearLayout

+ 2 - 2
build.gradle

@@ -51,8 +51,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 15,
-            versionName      : "v1.0.5"
+            versionCode      : 16,
+            versionName      : "v1.0.6"
     ]
 
     depsVersion = [