所有功能增加人员编号及其放大镜，修改工单提交报错异常

app/src/main/java/com/uas/hycollection/bean/LinecodeBean.java

@@ -11,8 +11,19 @@ public class LinecodeBean {
     private String MA_BOMVERSION;
     private String SR_LINECODE;
     private String SR_BADNAME;
+
+    private String SR_NGQTY;    //不良数量
     private boolean checked;
 
+
+    public String getSR_NGQTY() {
+        return SR_NGQTY;
+    }
+
+    public void setSR_NGQTY(String SR_NGQTY) {
+        this.SR_NGQTY = SR_NGQTY;
+    }
+
     public String getSR_LINECODE() {
         return SR_LINECODE;
     }

app/src/main/java/com/uas/hycollection/fragment/BreakdownRepairFragment.java

@@ -73,6 +73,7 @@ import com.uas.hycollection.util.StringUtil;
 import com.uas.hycollection.util.VolleyRequest;
 import com.uas.hycollection.util.VollyRequest;
 import com.uas.hycollection.view.ClearableEditText;
+import com.umeng.commonsdk.debug.E;
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
@@ -158,6 +159,7 @@ public class BreakdownRepairFragment extends BaseFragment{
     private GetLinePortAdapter getLinePortAdapter;
     private String li_personne_id;
     private RecyclerView rv_getline_ip_port_data;
+    private String SR_NGQTY = "-1";
 
     @Override
     protected int getLayout() {
@@ -241,18 +243,15 @@ public class BreakdownRepairFragment extends BaseFragment{
 
     @Override
     protected void initDatas() {
-//        recycleDataone();
+//        recycleDataone("alonedata");
+        recycleDataone("");
         recycleDatathree();
 
-
-
         recycleDatatwo();
 
         getclassify();
         getqty();
 
-
-
 /**--------------------------------工单号----------------------------**/
         linecodeBeanList = new ArrayList<>();
         ce_work_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -290,7 +289,6 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         });
 
-
         iv_work_code.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -300,8 +298,8 @@ public class BreakdownRepairFragment extends BaseFragment{
                 tv_pr_code.setText("");
                 tv_pr_detail.setText("");
                 tv_macode.setText("");
-
-
+                SR_NGQTY = "-1";
+                selectAdapterQty.notifyDataSetChanged();
             }
         });
         iv_popuwindow.setOnClickListener(new View.OnClickListener() {
@@ -392,8 +390,6 @@ public class BreakdownRepairFragment extends BaseFragment{
         });
 
 
-
-
         /**----------------------------人员编号------------------------------------**/
         tv_dc_emcode.addTextChangedListener(new TextWatcher() {
             @Override
@@ -492,6 +488,9 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         });
 
+//        mFeededListone = new ArrayList<>();
+//        myAdapterone = new SelectAdapterone(mFeededListone);
+
         sc_codecollethree = SharedPreUtil.getString(mActivity, "sc_codecollethree", null);
         at_station.setText(sc_codecollethree);
         getReapirInfo(sc_codecollethree,tv_macode.getText().toString().trim(),ce_wuli.getText().toString().trim());
@@ -576,7 +575,6 @@ public class BreakdownRepairFragment extends BaseFragment{
                                 StorageRechargeAloneBean bean=new StorageRechargeAloneBean(split[i]);
                                 mFeededListthree.add(bean);
                             }
-
                         }else {
                             StorageRechargeAloneBean bean=new StorageRechargeAloneBean(ngreason);
                             mFeededListthree.add(bean);
@@ -592,13 +590,10 @@ public class BreakdownRepairFragment extends BaseFragment{
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
-
             }
         });
     }
 
-
-
     String temeindate;
     public void addDataSamart(String sr_badname,String sr_reason,String sr_badlocationremark,String sr_ngqty,String input_classTwo){
         Calendar calendar = Calendar.getInstance();
@@ -643,13 +638,6 @@ public class BreakdownRepairFragment extends BaseFragment{
 
     }
 
-
-
-
-
-
-
-
     private boolean pepolerboolean = false;
     public void getOrImage(String em_code){
         progressDialog.show();
@@ -688,10 +676,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                                     tv_dc_emcode.setFocusable(false);
                                     pepolerboolean= true;
                                     }
-
                                 }
-
-
                         }
                     }
 
@@ -709,11 +694,11 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
     //工单号
     public void getfuzzySearchData(String inoutNo,String sone){
-
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_SPM_FUZZYSEARCHBADCODE)
                 .method(Request.Method.GET)
                 .addParam("inoutNo", inoutNo)
+                .addParam("type", "性能")
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -743,17 +728,14 @@ public class BreakdownRepairFragment extends BaseFragment{
                             bean.setMA_CODE(data.getString("MA_CODE"));
                             bean.setSR_LINECODE(data.getString("SR_LINECODE"));
                             bean.setSR_BADNAME(data.getString("SR_BADNAME"));
-
-
                             bean.setPR_CODE(data.getString("PR_CODE"));
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
                             bean.setMA_BOMVERSION(data.getString("MA_BOMVERSION"));
-
+                            bean.setSR_NGQTY(data.getString("SR_NGQTY"));
                             linecodeBeanList.add(bean);
                         }
                         ipAndlinecodePortAdapter.setmList(linecodeBeanList);
                         ipAndlinecodePortAdapter.notifyDataSetChanged();
-
                     }
                     else {
                         if (dataArray != null) {
@@ -931,12 +913,6 @@ public class BreakdownRepairFragment extends BaseFragment{
         rv_dataclassify.setAdapter(classifyAdapter);
     }
 
-
-
-
-
-
-
     /**
      * 不良数量
      */
@@ -990,7 +966,6 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
 
 
-
     String ec_passqtytrim;
     String number ="";
     public void getNewSaveData(){
@@ -1430,6 +1405,8 @@ public class BreakdownRepairFragment extends BaseFragment{
                 ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
                 sr_linecode = ipAndPortBeans.get(position).getSR_LINECODE();
                 sr_badname = ipAndPortBeans.get(position).getSR_BADNAME();
+                SR_NGQTY = ipAndPortBeans.get(position).getSR_NGQTY();     //不良品数量
+
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -1463,10 +1440,10 @@ public class BreakdownRepairFragment extends BaseFragment{
                 ce_work_code.clearFocus();
                 tv_dc_emcode.requestFocus();
                 ce_work_code.setFocusable(false);
-                recycleDataone(sr_badname);
 
                 getReapirInfo(at_station.getText().toString().trim(),ma_code,ce_wuli.getText().toString().trim());
                 closeListPopupWindow();
+                selectAdapterQty.notifyDataSetChanged();
             }
         });
 
@@ -1847,8 +1824,6 @@ public class BreakdownRepairFragment extends BaseFragment{
                         }
                         ipAndwuliPortAdapter.notifyDataSetChanged();
                     }
-
-
                 } else {
                     ipAndwuliPortAdapter = new IpAndwuliPortAdapter(wulilist);
                     rv_line_ip_port_data.setAdapter(ipAndwuliPortAdapter);
@@ -1886,7 +1861,6 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         });
 
-
         //确定
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -1897,10 +1871,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                     CommonUtil.toastNoRepeat(mActivity,"请选择物理线体");
                     return;
                 }
-
                 getReapirInfo(at_station.getText().toString().trim(),tv_macode.getText().toString().trim(),li_code);
-
-
                 closeListPopupWindow();
             }
         });
@@ -1909,16 +1880,11 @@ public class BreakdownRepairFragment extends BaseFragment{
         cancle_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
                 closeListPopupWindow();
             }
         });
     }
 
-
-
-
-
     public class  SelectAdapterone extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         private int checkedPosition = -1;
         private boolean onBind;
@@ -2056,15 +2022,10 @@ public class BreakdownRepairFragment extends BaseFragment{
                 this.mainTitle = (TextView) view.findViewById(R.id.text);
                 this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
                 this.ce_other = (ClearableEditText) view.findViewById(R.id.ce_other);
-
             }
         }
     }
 
-
-
-
-
     public class  SelectAdaptertwo extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         private int checkedPosition = -1;
         private boolean onBind;
@@ -2142,10 +2103,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                             amount--;
                             ((ListItemViewHolder) holder).ce_qty.setText(String.valueOf(amount));
                         }
-
                     }
-
-
                 }
             });
 //            ((ListItemViewHolder) holder).checkBox.setChecked();
@@ -2266,7 +2224,6 @@ public class BreakdownRepairFragment extends BaseFragment{
                 this.line_vis = (LinearLayout) view.findViewById(R.id.line_vis);
                 this.btnIncrease = (TextView) view.findViewById(R.id.btnIncrease);
                 this.btnDecrease = (TextView) view.findViewById(R.id.btnDecrease);
-
             }
         }
     }
@@ -2332,7 +2289,6 @@ public class BreakdownRepairFragment extends BaseFragment{
         }
     }
 
-
     private class IpAndwuliPortAdapter extends BaseQuickAdapter<LineCodeEntity, BaseViewHolder> {
         private List<LineCodeEntity> mmmmList;
 
@@ -2362,13 +2318,6 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         }
     }
-    
-    
-    
-    
-    
-    
-    
 
     public class  SelectAdapterthree extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         private int checkedPosition = -1;
@@ -2517,7 +2466,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         private ArrayList<StorageRechargeAloneBean> mList = new ArrayList<>();
         private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
         private boolean mIsSelectable = false;
-
+        private boolean isCheckReRefresh = false;
 
         public SelectAdapterQty(ArrayList<StorageRechargeAloneBean> list) {
             if (list == null) {
@@ -2533,7 +2482,6 @@ public class BreakdownRepairFragment extends BaseFragment{
 //            ab.setTitle("已选择" + 0 + "项");
         }
 
-
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
             View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_item, viewGroup, false);
@@ -2545,7 +2493,9 @@ public class BreakdownRepairFragment extends BaseFragment{
         @SuppressLint("SetTextI18n")
         @Override
         public void onBindViewHolder(final RecyclerView.@NotNull ViewHolder holder, @SuppressLint("RecyclerView") int i) {
-
+            if (-1 == Integer.parseInt(SR_NGQTY)) {
+                ((SelectAdapterQty.ListItemViewHolder) holder).checkBox.setChecked(false);
+            }
             //设置条目状态
             (( SelectAdapterQty.ListItemViewHolder) holder).mainTitle.setTextSize(15);
             (( SelectAdapterQty.ListItemViewHolder) holder).mainTitle.setText(mList.get(i).getAlonedata());
@@ -2556,16 +2506,13 @@ public class BreakdownRepairFragment extends BaseFragment{
                 ((  SelectAdapterQty.ListItemViewHolder) holder).ce_other.setVisibility(View.GONE);
             }
 
-
-
-
-
 //            ((ListItemViewHolder) holder).checkBox.setChecked();
             //checkBox的监听
             ((SelectAdapterQty.ListItemViewHolder) holder).checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     if (isChecked == true) {
+                        isCheckReRefresh = true;
                         map.clear();
                         map.put(i, true);
                         checkedPosition = i;
@@ -2581,6 +2528,11 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
             });
             onBind = true;
+            if (!isCheckReRefresh && (i+1) == Integer.parseInt(SR_NGQTY)) {
+                map.clear();
+                map.put(i, true);
+                checkedPosition = i;
+            }
             if (map != null && map.containsKey(i)) {
                 (( SelectAdapterQty.ListItemViewHolder) holder).checkBox.setChecked(true);
             } else {
@@ -2588,8 +2540,6 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
             onBind = false;
 
-
-
             (( SelectAdapterQty.ListItemViewHolder) holder).ce_other.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -2862,7 +2812,9 @@ public class BreakdownRepairFragment extends BaseFragment{
                 if (!mSearchStr.isEmpty()) {
                     List<LineCodeEntity> thisList = new ArrayList<>();
                     for(int i=0;i<personnelList.size();i++){
-                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr) ||
+                                personnelList.get(i).getLI_NAME().contains(mSearchStr)
+                        ){
                             thisList.add(personnelList.get(i));
                         }
                         if(i == personnelList.size() -1){

app/src/main/java/com/uas/hycollection/fragment/DataCollectionFragment.java

@@ -194,10 +194,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         FunctionActivity.setTitle(getString(R.string.title_storage_in));
         ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
         root.setBackgroundColor(getResources().getColor(R.color.background_color_second));
-    }
-
-    @Override
-    protected void initEvents() {
         tv_save = root.findViewById(R.id.tv_save);
         et_linecode_smts = (AutoCompleteTextView)root.findViewById(R.id.et_linecode_smts);
         et_linecode_smts.setThreshold(1);
@@ -251,6 +247,11 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
+    @Override
+    protected void initEvents() {
+
+    }
+
     @Override
     protected void initDatas() {
         resourcesBeanList = new ArrayList<>();
@@ -686,7 +687,9 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 if (!mSearchStr.isEmpty()) {
                     List<LineCodeEntity> thisList = new ArrayList<>();
                     for(int i=0;i<personnelList.size();i++){
-                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)
+                                || personnelList.get(i).getLI_NAME().contains(mSearchStr)
+                        ){
                             thisList.add(personnelList.get(i));
                         }
                         if(i == personnelList.size() -1){
@@ -1423,7 +1426,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 }
                 mFilterStorageInBeans = list;//PI_INOUTNO
                 setFilterTableData(mFilterStorageInBeans);
-
             }
 
             @Override
@@ -1436,8 +1438,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         });
     }
 
-
-
     private void setFilterTableData(List<TestcollectDataBean> filterTableData) {
         mTableData = new TableData<TestcollectDataBean>("收料单列表", filterTableData,
                 va_classColumn,va_sr_reasonColumn,va_codeColumn,va_statusColumn);
@@ -1449,8 +1449,8 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 mSmartTable.postInvalidate();
             }
         }, 100);
-
     }
+
     String ec_passqtytrim;
     public void getNewData(){
         //!pepolerboolean||
@@ -1684,7 +1684,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 
         ipAndlinecodePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
 
-
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 List<LinecodeBean> ipAndPortBeans = ipAndlinecodePortAdapter.getmList();

app/src/main/java/com/uas/hycollection/fragment/QuantityStatisticsFragment.java

@@ -193,10 +193,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         FunctionActivity.setTitle(getString(R.string.quantity_statistics));
         ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
         root.setBackgroundColor(getResources().getColor(R.color.white));
-    }
 
-    @Override
-    protected void initEvents() {
         tv_save = root.findViewById(R.id.tv_save);
         et_linecode_smts = (AutoCompleteTextView)root.findViewById(R.id.et_linecode_smts);
         et_linecode_smts.setThreshold(1);
@@ -250,6 +247,10 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 
+    @Override
+    protected void initEvents() {
+    }
+
     @Override
     protected void initDatas() {
         resourcesBeanList = new ArrayList<>();
@@ -3225,14 +3226,15 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                 if (!mSearchStr.isEmpty()) {
                     List<LineCodeEntity> thisList = new ArrayList<>();
                     for(int i=0;i<personnelList.size();i++){
-                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)
+                                || personnelList.get(i).getLI_NAME().contains(mSearchStr)
+                        ){
                             thisList.add(personnelList.get(i));
                         }
                         if(i == personnelList.size() -1){
                             getLinePortAdapter = new GetLinePortAdapter(thisList);
                             rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
                             LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
-
                         }
                         List<LineCodeEntity> lineCodeEntities = getLinePortAdapter.getmList();
                         for (int j = 0; j < lineCodeEntities.size(); j++) {

app/src/main/java/com/uas/hycollection/fragment/StorageRechargeListFragment.java

@@ -155,6 +155,7 @@ public class StorageRechargeListFragment extends BaseFragment{
     private GetLinePortAdapter getLinePortAdapter;
     private String li_personne_id;
     private RecyclerView rv_getline_ip_port_data;
+    private String SR_NGQTY = "-1";
 
 
     @Override
@@ -165,10 +166,6 @@ public class StorageRechargeListFragment extends BaseFragment{
     @Override
     protected void initViews() {
         FunctionActivity.setTitle(getString(R.string.title_storage_maintain));
-    }
-
-    @Override
-    protected void initEvents() {
         rv_datachange = root.findViewById(R.id.rv_datachange);
         ce_work_code = root.findViewById(R.id.ce_work_code);
         ce_work_code.setThreshold(1);
@@ -202,9 +199,14 @@ public class StorageRechargeListFragment extends BaseFragment{
         ce_wuli = root.findViewById(R.id.ce_wuli);
         iv_wuli = root.findViewById(R.id.iv_wuli);
         mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
-//        ce_length.setEnabled(false);
-//        ce_length.setFocusable(false);
-//        ce_length.setKeyListener(null);//重点
+        //        ce_length.setEnabled(false);
+        //        ce_length.setFocusable(false);
+        //        ce_length.setKeyListener(null);//重点
+    }
+
+    @Override
+    protected void initEvents() {
+
     }
 
     @Override
@@ -280,7 +282,8 @@ public class StorageRechargeListFragment extends BaseFragment{
                 tv_pr_code.setText("");
                 tv_pr_detail.setText("");
                 tv_macode.setText("");
-
+                SR_NGQTY = "-1";
+                selectAdapterQty.notifyDataSetChanged();
             }
         });
 
@@ -582,7 +585,9 @@ public class StorageRechargeListFragment extends BaseFragment{
                 if (!mSearchStr.isEmpty()) {
                     List<LineCodeEntity> thisList = new ArrayList<>();
                     for(int i=0;i<personnelList.size();i++){
-                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)){
+                        if(personnelList.get(i).getLI_CODE().contains(mSearchStr)||
+                                personnelList.get(i).getLI_NAME().contains(mSearchStr)
+                        ){
                             thisList.add(personnelList.get(i));
                         }
                         if(i == personnelList.size() -1){
@@ -597,8 +602,6 @@ public class StorageRechargeListFragment extends BaseFragment{
                         }
                         getLinePortAdapter.notifyDataSetChanged();
                     }
-
-
                 } else {
                     getLinePortAdapter = new GetLinePortAdapter(personnelList);
                     rv_getline_ip_port_data.setAdapter(getLinePortAdapter);
@@ -957,7 +960,6 @@ public class StorageRechargeListFragment extends BaseFragment{
                                     tv_dc_emcode.setFocusable(false);
                                     pepolerboolean= true;
                                 }
-
                             }
                         }
                     }
@@ -970,16 +972,14 @@ public class StorageRechargeListFragment extends BaseFragment{
                     }
 
                 });
-
-
-
     }
-    public void getfuzzySearchData(String inoutNo,String sone){
 
+    public void getfuzzySearchData(String inoutNo,String sone){
         VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_SPM_FUZZYSEARCHBADCODE)
                 .method(Request.Method.GET)
                 .addParam("inoutNo", inoutNo)
+                .addParam("type", "外观")
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -1012,11 +1012,11 @@ public class StorageRechargeListFragment extends BaseFragment{
                             bean.setMA_BOMVERSION(data.getString("MA_BOMVERSION"));
                             bean.setSR_LINECODE(data.getString("SR_LINECODE"));
                             bean.setSR_BADNAME(data.getString("SR_BADNAME"));
+                            bean.setSR_NGQTY(data.getString("SR_NGQTY"));
                             linecodeBeanList.add(bean);
                         }
                         ipAndlinecodePortAdapter.setmList(linecodeBeanList);
                         ipAndlinecodePortAdapter.notifyDataSetChanged();
-
                     }
                     else {
                         if (dataArray != null) {
@@ -1403,6 +1403,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                 ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
                 sr_linecode = ipAndPortBeans.get(position).getSR_LINECODE();
                 sr_badname = ipAndPortBeans.get(position).getSR_BADNAME();
+                SR_NGQTY = ipAndPortBeans.get(position).getSR_NGQTY();   //刷新不良品
 
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
@@ -1410,6 +1411,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                 ipAndPortBeans.get(position).setChecked(true);
                 ipAndlinecodePortAdapter.notifyDataSetChanged();
 
+
                 //增加缓存,记录最后一次存的工单
                 SharedPreUtil.saveString(mActivity, SharedPreUtil.WG_WORK_ORDER_FLOW, ma_id);  //工单流水
                 SharedPreUtil.saveString(mActivity, SharedPreUtil.WG_PLAN_NUMBER, ma_code); //计划单号
@@ -1436,6 +1438,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                 recycleDataone(sr_badname);
                 getReapirInfo(at_station.getText().toString().trim(),ma_code,ce_wuli.getText().toString().trim());
                 closeListPopupWindow();
+                selectAdapterQty.notifyDataSetChanged();
             }
         });
 
@@ -2256,6 +2259,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         private ArrayList<StorageRechargeAloneBean> mList = new ArrayList<>();
         private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
         private boolean mIsSelectable = false;
+        private boolean isCheckReRefresh = false;
 
 
         public SelectAdapterQty(ArrayList<StorageRechargeAloneBean> list) {
@@ -2284,7 +2288,6 @@ public class StorageRechargeListFragment extends BaseFragment{
         @SuppressLint("SetTextI18n")
         @Override
         public void onBindViewHolder(final RecyclerView.@NotNull ViewHolder holder, @SuppressLint("RecyclerView") int i) {
-
             //设置条目状态
             (( SelectAdapterQty.ListItemViewHolder) holder).mainTitle.setTextSize(15);
             (( SelectAdapterQty.ListItemViewHolder) holder).mainTitle.setText(mList.get(i).getAlonedata());
@@ -2295,6 +2298,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     if (isChecked == true) {
+                        isCheckReRefresh = true;
                         map.clear();
                         map.put(i, true);
                         checkedPosition = i;
@@ -2310,6 +2314,11 @@ public class StorageRechargeListFragment extends BaseFragment{
                 }
             });
             onBind = true;
+            if (!isCheckReRefresh && (i+1) == Integer.parseInt(SR_NGQTY)) {
+                map.clear();
+                map.put(i, true);
+                checkedPosition = i;
+            }
             if (map != null && map.containsKey(i)) {
                 (( SelectAdapterQty.ListItemViewHolder) holder).checkBox.setChecked(true);
             } else {
@@ -2317,8 +2326,6 @@ public class StorageRechargeListFragment extends BaseFragment{
             }
             onBind = false;
 
-
-
             (( SelectAdapterQty.ListItemViewHolder) holder).ce_other.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {

app/src/main/res/layout-large/fragment_storage_recharge_list.xml

@@ -74,13 +74,14 @@
                                             android:src="@drawable/wrong"
                                             android:visibility="gone" />
                                     </FrameLayout>
+
                                     <ImageView
-                                        android:layout_gravity="center"
                                         android:id="@+id/iv_popuwindow"
-                                        android:layout_width="30dp"
+                                        android:layout_width="26dp"
                                         android:layout_height="match_parent"
-                                        android:layout_marginRight="10dp"
+                                        android:layout_gravity="center"
                                         android:layout_marginLeft="5dp"
+                                        android:layout_marginRight="10dp"
                                         android:background="@drawable/bg_button"
                                         android:src="@drawable/search_48" />
                                 </LinearLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout style="@style/ActionBar"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+                xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Button
         android:id="@+id/btn_actionbar_withback"
@@ -8,7 +8,7 @@
 
     <RelativeLayout
         android:id="@+id/rl_actionbar"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true">
 
@@ -24,7 +24,7 @@
             style="@style/ActionBarTextView"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_below="@+id/tv_actionbar_withback"
+            android:layout_toRightOf="@+id/tv_actionbar_withback"
             android:gravity="center"
             android:layout_centerHorizontal="true"
             android:text=""/>

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

@@ -240,6 +240,7 @@
                                         style="@style/EditTextLineStyle"
                                         android:layout_height="25dp"
                                         android:hint="请输入人员编号"
+                                        android:focusable="false"
                                         android:textSize="@dimen/dp_10"/>
 
                                     <ImageView
@@ -258,7 +259,21 @@
                                     android:layout_gravity="center"
                                     android:layout_marginRight="10dp"
                                     android:layout_marginLeft="5dp"
-                                    android:clickable="false" />
+                                    android:clickable="false"
+                                    android:visibility="gone"
+                                    />
+
+                                <ImageView
+                                    android:id="@+id/iv_number_search_for"
+                                    android:layout_width="30dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_gravity="center"
+                                    android:background="@drawable/bg_button"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:src="@drawable/search_48"
+                                    />
+
                             </LinearLayout>
                         </LinearLayout>
 

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

@@ -6,21 +6,22 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white"
     android:orientation="vertical">
-    <!--    <android.support.design.widget.AppBarLayout-->
-    <!--        android:background="@color/white"-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_weight="1"-->
-    <!--        android:layout_height="match_parent">-->
-
-    <!--        <android.support.design.widget.CollapsingToolbarLayout-->
-    <!--            android:layout_width="match_parent"-->
-    <!--            android:layout_height="match_parent"-->
-    <!--            app:contentScrim="@color/colorPrimary"-->
-    <!--            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|exitUntilCollapsed">-->
-    <!--            <android.support.v4.widget.NestedScrollView-->
-    <!--                android:layout_width="match_parent"-->
-    <!--                android:layout_height="match_parent">-->
+<!--    <android.support.design.widget.AppBarLayout-->
+<!--        android:background="@color/white"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_weight="1"-->
+<!--        android:layout_height="match_parent">-->
+
+<!--        <android.support.design.widget.CollapsingToolbarLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="match_parent"-->
+<!--            app:contentScrim="@color/colorPrimary"-->
+<!--            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|exitUntilCollapsed">-->
+<!--            <android.support.v4.widget.NestedScrollView-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="match_parent">-->
     <ScrollView
+        android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1">
@@ -252,6 +253,7 @@
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="24dp"
                                                 android:layout_marginLeft="23dp"
+                                                android:focusable="false"
                                                 android:hint="请输入人员编号"
                                                 android:text="ZUZHUANG"/>
 
@@ -272,7 +274,20 @@
                                             android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
                                             android:clickable="false"
+                                            android:visibility="gone"
                                             />
+
+                                        <ImageView
+                                            android:id="@+id/iv_number_search_for"
+                                            android:layout_width="30dp"
+                                            android:layout_height="match_parent"
+                                            android:layout_gravity="center"
+                                            android:background="@drawable/bg_button"
+                                            android:layout_marginRight="10dp"
+                                            android:layout_marginLeft="5dp"
+                                            android:src="@drawable/search_48"
+                                            />
+
                                     </LinearLayout>
 
 
@@ -574,7 +589,25 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"/>
 
-
+                    <RelativeLayout
+                        android:background="@color/white"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <TextView
+                            android:layout_alignParentRight="true"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:id="@+id/tv_save"
+                            android:layout_width="150dp"
+                            android:layout_height="50dp"
+                            android:text="提交"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:layout_marginBottom="@dimen/dp_10"
+                            android:layout_marginRight="50dp"
+                            android:textSize="@dimen/textsize_20"
+                            android:background="@drawable/bg_button">
+                        </TextView>
+                    </RelativeLayout>
                 </LinearLayout>
 
             </LinearLayout>
@@ -583,32 +616,14 @@
 
         </LinearLayout>
     </ScrollView>
-    <RelativeLayout
-        android:background="@color/white"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="@dimen/dp_10"
-            android:id="@+id/tv_save"
-            android:layout_width="150dp"
-            android:layout_height="50dp"
-            android:text="提交"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:layout_marginBottom="@dimen/dp_10"
-            android:layout_marginRight="50dp"
-            android:textSize="@dimen/textsize_20"
-            android:background="@drawable/bg_button">
-        </TextView>
-    </RelativeLayout>
 
 
 
-    <!--            </android.support.v4.widget.NestedScrollView>-->
 
-    <!--        </android.support.design.widget.CollapsingToolbarLayout>-->
-    <!--    </android.support.design.widget.AppBarLayout>-->
+<!--            </android.support.v4.widget.NestedScrollView>-->
+
+<!--        </android.support.design.widget.CollapsingToolbarLayout>-->
+<!--    </android.support.design.widget.AppBarLayout>-->
 
 
 

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

@@ -249,6 +249,7 @@
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="24dp"
                                             android:layout_marginLeft="23dp"
+                                            android:focusable="false"
                                             android:hint="请输入人员编号" />
 
                                         <ImageView
@@ -268,7 +269,20 @@
                                         android:layout_marginRight="10dp"
                                         android:layout_marginLeft="5dp"
                                         android:clickable="false"
+                                        android:visibility="gone"
                                         />
+
+                                    <ImageView
+                                        android:id="@+id/iv_number_search_for"
+                                        android:layout_width="30dp"
+                                        android:layout_height="match_parent"
+                                        android:layout_gravity="center"
+                                        android:background="@drawable/bg_button"
+                                        android:layout_marginRight="10dp"
+                                        android:layout_marginLeft="5dp"
+                                        android:src="@drawable/search_48"
+                                        />
+
                                 </LinearLayout>
 
 

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

@@ -74,13 +74,14 @@
                                             android:src="@drawable/wrong"
                                             android:visibility="gone" />
                                     </FrameLayout>
+
                                     <ImageView
-                                        android:layout_gravity="center"
                                         android:id="@+id/iv_popuwindow"
-                                        android:layout_width="30dp"
+                                        android:layout_width="26dp"
                                         android:layout_height="match_parent"
-                                        android:layout_marginRight="10dp"
+                                        android:layout_gravity="center"
                                         android:layout_marginLeft="5dp"
+                                        android:layout_marginRight="10dp"
                                         android:background="@drawable/bg_button"
                                         android:src="@drawable/search_48" />
                                 </LinearLayout>
@@ -250,6 +251,7 @@
                                                 android:id="@+id/tv_dc_emcode"
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="30dp"
+                                                android:focusable="false"
                                                 android:hint="请输入人员编号" />
 
                                             <ImageView
@@ -269,7 +271,20 @@
                                             android:layout_marginRight="10dp"
                                             android:layout_marginLeft="5dp"
                                             android:clickable="false"
+                                            android:visibility="gone"
+                                            />
+
+                                        <ImageView
+                                            android:id="@+id/iv_number_search_for"
+                                            android:layout_width="30dp"
+                                            android:layout_height="match_parent"
+                                            android:layout_gravity="center"
+                                            android:background="@drawable/bg_button"
+                                            android:layout_marginRight="10dp"
+                                            android:layout_marginLeft="5dp"
+                                            android:src="@drawable/search_48"
                                             />
+
                                     </LinearLayout>
                                 </LinearLayout>
                                 <LinearLayout

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <RelativeLayout
@@ -60,7 +61,8 @@
                 android:id="@+id/btn_print"
                 android:layout_toLeftOf="@id/btn_dialog_confirm_ok"
                 style="@style/PopwinCancleButtonStyle"
-                android:text="@string/text_btn_print"/>
+                android:text="@string/text_btn_print"
+                tools:ignore="NotSibling" />
         </RelativeLayout>
     </RelativeLayout>
 </RelativeLayout>

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

@@ -21,8 +21,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text=""
-            android:textSize="@dimen/textsize_20"
+            android:text="1111111"
+            android:textSize="20dp"
             android:textColor="@color/black"
             android:id="@+id/text"
             android:gravity="left"

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

@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="1111111"
-            android:textSize="20dp"
+            android:textSize="@dimen/dp_10"
             android:textColor="@color/black"
             android:id="@+id/text"
             android:gravity="left"
@@ -39,9 +39,11 @@
             android:layout_weight="1"
             android:layout_marginLeft="@dimen/dp_10"
             android:textColor="@color/black"
-            android:visibility="gone" />
+            android:textSize="@dimen/dp_10"
+             />
         <LinearLayout
             android:visibility="gone"
+            android:layout_gravity="center"
             android:id="@+id/line_vis"
             android:orientation="horizontal"
             android:layout_width="wrap_content"
@@ -50,10 +52,11 @@
                 android:id="@+id/ce_qty"
                 android:background="@drawable/bg_line_edittext"
                 android:layout_gravity="center"
-                android:layout_width="@dimen/dp_40"
-                android:layout_height="31dp"
+                android:layout_width="20dp"
+                android:layout_height="@dimen/textsize_20"
                 android:layout_weight="1"
                 android:text="0"
+                android:textSize="@dimen/dp_10"
                 android:inputType="number"
                 android:gravity="center"
                 android:layout_marginLeft="5dp"
@@ -65,10 +68,11 @@
                 android:layout_height="wrap_content">
                 <TextView
                     android:id="@+id/btnIncrease"
-                    android:layout_width="30dp"
-                    android:layout_height="@dimen/space_top_line_15"
+                    android:layout_width="15dp"
+                    android:layout_height="@dimen/dp_10"
                     android:gravity="center"
                     android:text="+"
+                    android:textSize="@dimen/dp_10"
                     android:background="@color/gray_list" />
                 <View
                     android:layout_width="match_parent"
@@ -78,9 +82,10 @@
                 <TextView
                     android:id="@+id/btnDecrease"
                     android:background="@color/gray_list"
-                    android:layout_width="30dp"
-                    android:layout_height="@dimen/space_top_line_15"
+                    android:layout_width="@dimen/space_top_line_15"
+                    android:layout_height="@dimen/dp_10"
                     android:gravity="center"
+                    android:textSize="@dimen/dp_10"
                     android:text="-" />
             </LinearLayout>
         </LinearLayout>

build.gradle

@@ -59,8 +59,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 33,
-            versionName      : "v1.2.3"
+            versionCode      : 35,
+            versionName      : "v1.2.6"
     ]
 
     depsVersion = [