性能维修界面UI修改，增加历史记录表格

app/src/main/java/com/uas/collection/bean/TestcollectDataBean.java

@@ -18,6 +18,7 @@ public class TestcollectDataBean {
     private String SR_INMAN;
     private String SR_INDATE;
     private String MA_PRODCODE;
+    private String SR_BADLOCATIONREMARK;
 
     public TestcollectDataBean(String SR_ID, String SR_MAKECODE, String SR_SOURCECODE, String SR_PASSQTY, String SR_NGQTY, String SR_BADNAME, String SR_TYPE, String SR_LOCATION, String SR_REASON, String SR_SN, String SR_REMARK, String SR_INMAN, String SR_INDATE) {
         this.SR_ID = SR_ID;
@@ -34,6 +35,15 @@ public class TestcollectDataBean {
         this.SR_INMAN = SR_INMAN;
         this.SR_INDATE = SR_INDATE;
     }
+
+    public String getSR_BADLOCATIONREMARK() {
+        return SR_BADLOCATIONREMARK;
+    }
+
+    public void setSR_BADLOCATIONREMARK(String SR_BADLOCATIONREMARK) {
+        this.SR_BADLOCATIONREMARK = SR_BADLOCATIONREMARK;
+    }
+
     public TestcollectDataBean(){}
 
     public String getMA_PRODCODE() {

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

@@ -3,8 +3,10 @@ package com.uas.collection.fragment;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -19,6 +21,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AutoCompleteTextView;
 import android.widget.CheckBox;
@@ -33,6 +36,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
+import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
+import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
+import com.bin.david.form.data.table.TableData;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -41,6 +51,7 @@ import com.uas.collection.activity.FunctionActivity;
 import com.uas.collection.bean.LinecodeBean;
 import com.uas.collection.bean.ResourcesBean;
 import com.uas.collection.bean.StorageRechargeAloneBean;
+import com.uas.collection.bean.TestcollectDataBean;
 import com.uas.collection.camera.CaptureActivity;
 import com.uas.collection.global.GloableParams;
 import com.uas.collection.tools.SharedPreUtil;
@@ -62,6 +73,8 @@ import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -104,17 +117,23 @@ public class BreakdownRepairFragment extends BaseFragment{
     private List<LinecodeBean> ipAndPortBeans;
     private String pr_code;
     private String pr_detail;
-    private TextView tv_macode;
-    private TextView tv_pr_code;
-    private TextView tv_pr_detail;
+    private AutoCompleteTextView tv_macode;
+    private AutoCompleteTextView tv_pr_code;
+    private AutoCompleteTextView tv_pr_detail;
     private ClearableEditText tv_hintshow;
     private List<String> stringList;
     private String sc_name;
     private RecyclerView rv_line_ip_port_data;
     private ImageView iv_dc_emcode_delete;
     private String ma_bomversion;
-
-
+    private SmartTable mSmartTable;
+    private List<TestcollectDataBean> listSama;
+    private Column<String> va_classColumn,va_sr_reasonColumn,va_qtyColumn,va_timeColumn,va_sr_ngqty;
+    private TableData<TestcollectDataBean> mTableData;
+    private List<TestcollectDataBean> mFilterStorageInBeans;
+    private RecyclerView rv_datapassqty;
+    private SelectAdapterQty selectAdapterQty;
+    private ArrayList<StorageRechargeAloneBean> passFeededListQty;
     @Override
     protected int getLayout() {
         return R.layout.fragment_breakdownrepair;
@@ -146,6 +165,8 @@ public class BreakdownRepairFragment extends BaseFragment{
         tv_pr_detail = root.findViewById(R.id.tv_pr_detail);
         tv_hintshow = root.findViewById(R.id.tv_hintshow);
         iv_dc_emcode_delete = root.findViewById(R.id.iv_dc_emcode_delete);
+        mSmartTable = root.findViewById(R.id.jlt_storage_in_filter_list_st);
+        rv_datapassqty = root.findViewById(R.id.rv_datapassqty);
 //        ce_length.setEnabled(false);
 //        ce_length.setFocusable(false);
 //        ce_length.setKeyListener(null);//重点
@@ -154,7 +175,35 @@ public class BreakdownRepairFragment extends BaseFragment{
 
     @Override
     protected void initEvents() {
-
+        mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
+        listSama = new ArrayList<>();
+        WindowManager wm = mActivity.getWindowManager();
+        int screenWith = wm.getDefaultDisplay().getWidth()/5;
+        mSmartTable.getConfig().setMinTableWidth(screenWith)
+                .setShowXSequence(false)
+                .setShowYSequence(false)
+                .setShowTableTitle(false)
+                .setFixedTitle(true)
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity, 15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
+        va_classColumn = new Column<String>("现象", "SR_BADNAME");
+        va_sr_reasonColumn = new Column<String>("位号", "SR_REASON");
+        va_qtyColumn = new Column<String>("原因", "SR_BADLOCATIONREMARK");
+        va_sr_ngqty = new Column<String>("数量", "SR_NGQTY");
+        va_timeColumn = new Column<String>("时间", "SR_INDATE");
     }
 
     @Override
@@ -162,6 +211,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         recycleDataone();
         recycleDatatwo();
         recycleDatathree();
+        getqty();
 
 
 
@@ -209,9 +259,9 @@ public class BreakdownRepairFragment extends BaseFragment{
                 ce_work_code.setFocusableInTouchMode(true);
                 ce_work_code.setText("");
                 ce_work_code.requestFocus();
-                tv_pr_code.setText("产品代码");
-                tv_pr_detail.setText("产品名称");
-                tv_macode.setText("计划单号");
+                tv_pr_code.setText("");
+                tv_pr_detail.setText("");
+                tv_macode.setText("");
 
 
             }
@@ -225,6 +275,9 @@ public class BreakdownRepairFragment extends BaseFragment{
 
 
         /**--------------------------------岗位资源----------------------------**/
+        if (!at_station.getText().toString().isEmpty()){
+            at_station.setFocusable(false);
+        }
         resourcesBeanList = new ArrayList<>();
         at_station.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -358,7 +411,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         iv_dc_emcode_delete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                tv_dc_emcode.setFilterTouchesWhenObscured(true);
+                tv_dc_emcode.setFocusableInTouchMode(true);
                 tv_dc_emcode.setText("");
                 tv_dc_emcode.requestFocus();
             }
@@ -378,6 +431,60 @@ public class BreakdownRepairFragment extends BaseFragment{
         getfuzzySearchSourceData(sc_codecollethree,"");
     }
 
+
+
+
+
+    String temeindate;
+    public void addDataSamart(String sr_badname,String sr_reason,String sr_badlocationremark,String sr_ngqty){
+        Calendar calendar = Calendar.getInstance();
+        //年
+//        int year = calendar.get(Calendar.YEAR);
+        //月
+        int month = calendar.get(Calendar.MONTH)+1;
+        //日
+        int day_of_month = calendar.get(Calendar.DAY_OF_MONTH);
+        //小时
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        //分钟
+        int minute = calendar.get(Calendar.MINUTE);
+        //秒
+//        int second = calendar.get(Calendar.SECOND);
+
+        temeindate=month+"月-"+day_of_month+"日 "+hour+":"+minute;
+
+        TestcollectDataBean jltStorageInBean = new TestcollectDataBean();
+        jltStorageInBean.setSR_BADNAME(sr_badname);
+        jltStorageInBean.setSR_REASON(sr_reason);
+        jltStorageInBean.setSR_BADLOCATIONREMARK(sr_badlocationremark);
+        jltStorageInBean.setSR_NGQTY(sr_ngqty);
+        jltStorageInBean.setSR_INDATE(temeindate);
+        listSama.add(jltStorageInBean);
+        mFilterStorageInBeans = listSama;//PI_INOUTNO
+        setFilterTableData(mFilterStorageInBeans);
+    }
+
+    private void setFilterTableData(List<TestcollectDataBean> filterTableData) {
+        mTableData = new TableData<TestcollectDataBean>("收料单列表", filterTableData,
+                va_classColumn,va_sr_reasonColumn,va_qtyColumn,va_sr_ngqty,va_timeColumn);
+        mSmartTable.setTableData(mTableData);
+//        mSmartTable.requestLayout();
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
+
+    }
+
+
+
+
+
+
+
+
     private boolean pepolerboolean = false;
     public void getOrImage(String em_code){
         progressDialog.show();
@@ -415,9 +522,11 @@ public class BreakdownRepairFragment extends BaseFragment{
                                     tv_dc_emcode.clearFocus();
                                     tv_dc_emcode.setFocusable(false);
                                     pepolerboolean= true;
+                                    }
+
                                 }
 
-                            }
+
                         }
                     }
 
@@ -489,9 +598,9 @@ public class BreakdownRepairFragment extends BaseFragment{
                                     String ma_bomversion = JsonUtils.optStringNotNull(dataObject, "MA_BOMVERSION");
                                     ce_work_code.setText(ma_id);
                                     tv_gonema_code.setText(ma_code);
-                                    tv_pr_code.setText("产品代码  "+ma_bomversion);
-                                    tv_pr_detail.setText("产品名称  "+pr_detail);
-                                    tv_macode.setText("计划单号  "+ma_code);
+                                    tv_pr_code.setText(""+ma_bomversion);
+                                    tv_pr_detail.setText(""+pr_detail);
+                                    tv_macode.setText(""+ma_code);
                                     at_station.clearFocus();
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.requestFocus();
@@ -600,6 +709,56 @@ public class BreakdownRepairFragment extends BaseFragment{
         });
     }
 
+    public void getqty(){
+        passFeededListQty = new ArrayList<>();
+        selectAdapterQty = new SelectAdapterQty(passFeededListQty);
+        LinearLayoutManager layoutmanagertwo = new LinearLayoutManager(mActivity);
+//        MyLayoutManager layouttwo = new MyLayoutManager();
+//        layouttwo.setAutoMeasureEnabled(true);//防止recyclerview高度为wrap时测量item高度0(一定要加这个属性，否则显示不出来）
+        layoutmanagertwo.setOrientation(LinearLayoutManager.HORIZONTAL);//列表横向显示
+        rv_datapassqty.setLayoutManager(layoutmanagertwo);
+        setAdapterqtytwo(passFeededListQty);
+        rv_datapassqty.setAdapter(selectAdapterQty);
+        List<String> list=new ArrayList<>();
+        list.add("1");
+        list.add("2");
+        list.add("3");
+        list.add("4");
+        list.add("5");
+        JSONObject jsonObject = new JSONObject();
+        JSONArray jsonArray = new JSONArray();
+        JSONObject object_1 = new JSONObject();
+        for (int i=0;i<list.size();i++){
+            StorageRechargeAloneBean bean=new StorageRechargeAloneBean(list.get(i));
+            object_1.put("alone", list.get(i));
+            jsonArray.add(bean);
+        }
+
+        jsonObject.put("formStore", jsonArray);
+        Log.e("alone===2",jsonObject.toString());
+
+        JSONArray dataArray = FastjsonUtil.getJSONArray(jsonObject.toString(), "formStore");
+        handleFeededDataTwo(dataArray);
+    }
+    private void handleFeededDataTwo(JSONArray dataArray) {
+        StorageRechargeAloneBean bean;
+        passFeededListQty.clear();
+        for (Object index : dataArray) {
+            JSONObject data = (JSONObject) index;
+            bean= new StorageRechargeAloneBean(
+                    data.getString("alonedata"));
+            passFeededListQty.add(bean);
+        }
+        setAdapterqtytwo(passFeededListQty);
+    }
+    private void setAdapterqtytwo(ArrayList<StorageRechargeAloneBean> mList) {
+        LogUtil.i("mList", JSON.toJSONString(mList));
+        selectAdapterQty = new SelectAdapterQty(mList);
+        rv_datapassqty.setAdapter(selectAdapterQty);
+    }
+
+
+
     public void getNewSNData(String va_code){
 
         if (tv_dc_emcode.getText().toString().trim().isEmpty()){
@@ -704,12 +863,15 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         });
     }
+    String ec_passqtytrim;
     String number ="";
     public void getNewSaveData(){
-        if (!pepolerboolean&&tv_dc_emcode.getText().toString().trim().isEmpty()){
+        Log.e("pepolerboolean===",pepolerboolean+"");
+        if (!pepolerboolean ||tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
         }
+
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
         String alonedataone = null;
@@ -736,7 +898,8 @@ public class BreakdownRepairFragment extends BaseFragment{
 
         ArrayList<StorageRechargeAloneBean> selectedItemtwo = myAdaptertwo.getSelectedItem();
         if (selectedItemtwo.size() == 0){
-            CommonUtil.toastNoRepeat(mActivity, "请选择不良位号");//不良位号
+//            CommonUtil.toastNoRepeat(mActivity, "请选择不良位号");//不良位号
+            object_1.put("SR_BADLOCATIONREMARK", null);//不良位号
         }else {
             for (int i=0;i<selectedItemtwo.size();i++){
                 String alonedata = selectedItemtwo.get(i).getAlonedata();
@@ -786,8 +949,16 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
             }
 
+        }
 
 
+        ArrayList<StorageRechargeAloneBean> selectAdapterQtySelectedItem = selectAdapterQty.getSelectedItem();
+        if (selectAdapterQtySelectedItem.size()==0){
+            ec_passqtytrim="1";
+        }else {
+            for (int i=0;i<selectAdapterQtySelectedItem.size();i++){
+                ec_passqtytrim = selectAdapterQtySelectedItem.get(i).getAlonedata();
+            }
         }
 
 
@@ -795,7 +966,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         object_1.put("SR_MAKECODE", ce_work_codetrim);//工单号
         object_1.put("SR_SOURCECODE", at_stationtrim);//资源
         object_1.put("SR_PASSQTY", "0");//通过数量
-        object_1.put("SR_NGQTY", "1");//NG数量
+        object_1.put("SR_NGQTY", ec_passqtytrim);//NG数量
         object_1.put("SR_TYPE", "性能维修");//种类(数据采集/、外观维修/性能维修)
         object_1.put("SR_SN", "");//SN号
         object_1.put("SR_REMARK", "");//备注/其他
@@ -827,10 +998,12 @@ public class BreakdownRepairFragment extends BaseFragment{
                     stringList.add(finalInput_alonedatathree+"\n");
                 }
 
+
+
 //                if (!finalInput_AlonedaTwo.isEmpty()){
 //                    stringList.add(finalInput_Aloneda+"\n");
 //                }
-
+                addDataSamart(finalInput_Aloneda,finalInput_AlonedaTwo,finalInput_alonedatathree,ec_passqtytrim);
 
                 for (int i=0;i<stringList.size();i++){
                     String s = stringList.get(i);
@@ -842,6 +1015,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                 setAdapterone(mFeededListone);
                 setAdaptertwo(mFeededListtwo);
                 setAdapterthree(mFeededListthree);
+                setAdapterqtytwo(passFeededListQty);
 
             }
 
@@ -1107,9 +1281,9 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
                 ce_work_code.setText(ma_id);
                 tv_gonema_code.setText(ma_code);
-                tv_pr_code.setText("产品代码  "+ma_bomversion);
-                tv_pr_detail.setText("产品名称  "+pr_detail);
-                tv_macode.setText("计划单号  "+ma_code);
+                tv_pr_code.setText(""+ma_bomversion);
+                tv_pr_detail.setText(""+pr_detail);
+                tv_macode.setText(""+ma_code);
                 at_station.clearFocus();
                 ce_work_code.clearFocus();
                 tv_dc_emcode.requestFocus();
@@ -1386,7 +1560,7 @@ public class BreakdownRepairFragment extends BaseFragment{
 
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_item, viewGroup, false);
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_itembreak, viewGroup, false);
             return new   SelectAdapterone.ListItemViewHolder(itemView);
         }
 
@@ -1532,7 +1706,7 @@ public class BreakdownRepairFragment extends BaseFragment{
 
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_item, viewGroup, false);
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_itembreak, viewGroup, false);
             return new   SelectAdaptertwo.ListItemViewHolder(itemView);
         }
 
@@ -1806,7 +1980,7 @@ public class BreakdownRepairFragment extends BaseFragment{
 
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_item, viewGroup, false);
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_itembreak, viewGroup, false);
             return new   SelectAdapterthree.ListItemViewHolder(itemView);
         }
 
@@ -1921,8 +2095,146 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         }
     }
-    
-    
+
+    public class SelectAdapterQty extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+        private int checkedPosition = -1;
+        private boolean onBind;
+        private ArrayList<StorageRechargeAloneBean> mList = new ArrayList<>();
+        private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
+        private boolean mIsSelectable = false;
+
+
+        public SelectAdapterQty(ArrayList<StorageRechargeAloneBean> list) {
+            if (list == null) {
+                throw new IllegalArgumentException("model Data must not be null");
+            }
+            mList = list;
+        }
+
+        //更新adpter的数据和选择状态
+        public void updateDataSet(ArrayList<StorageRechargeAloneBean> list) {
+            this.mList = list;
+            mSelectedPositions = new SparseBooleanArray();
+//            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);
+            return new SelectAdapterQty.ListItemViewHolder(itemView);
+        }
+
+        private Map<Integer, Boolean> map = new HashMap<>();
+        //绑定界面，设置监听
+        @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());
+            ((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) {
+                        map.clear();
+                        map.put(i, true);
+                        checkedPosition = i;
+                    } else {
+                        map.remove(i);
+                        if (map.size() == 0) {
+                            checkedPosition = -1; //-1 代表一个都未选择
+                        }
+                    }
+                    if (!onBind) {
+                        notifyDataSetChanged();
+                    }
+                }
+            });
+            onBind = true;
+            if (map != null && map.containsKey(i)) {
+                (( SelectAdapterQty.ListItemViewHolder) holder).checkBox.setChecked(true);
+            } else {
+                (( SelectAdapterQty.ListItemViewHolder) holder).checkBox.setChecked(false);
+            }
+            onBind = false;
+
+
+
+            (( SelectAdapterQty.ListItemViewHolder) holder).ce_other.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    mList.get(i).setInputce((( SelectAdapterQty.ListItemViewHolder) holder).ce_other.getText().toString().trim());
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+
+                }
+            });
+        }
+
+        //获得选中条目的结果
+        public ArrayList<StorageRechargeAloneBean> getSelectedItem() {
+            ArrayList<StorageRechargeAloneBean> selectList = new ArrayList<>();
+            int checkedPosition = getCheckedPosition();
+            if (checkedPosition==-1){
+                selectList.clear();
+            }else {
+                selectList.add(mList.get(checkedPosition));
+            }
+            return selectList;
+        }
+        //设置给定位置条目的选择状态
+        private void setItemChecked(int position, boolean isChecked) {
+            mSelectedPositions.put(position, isChecked);
+        }
+
+
+        //根据位置判断条目是否选中
+        private boolean isItemChecked(int position) {
+            return mSelectedPositions.get(position);
+        }
+
+        //得到当前选中的位置
+        public int getCheckedPosition() {
+            return checkedPosition;
+        }
+        @Override
+        public int getItemCount() {
+            return mList == null ? 0 : mList.size();
+        }
+        //根据位置判断条目是否可选
+        private boolean isSelectable() {
+            return mIsSelectable;
+        }
+        //设置给定位置条目的可选与否的状态
+        private void setSelectable(boolean selectable) {
+            mIsSelectable = selectable;
+        }
+        public class ListItemViewHolder extends RecyclerView.ViewHolder{
+            //ViewHolder
+            CheckBox checkBox;
+            TextView mainTitle;
+            ClearableEditText ce_other;
+            ListItemViewHolder(View view) {
+                super(view);
+                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);
+
+            }
+        }
+    }
     
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {

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

@@ -1218,7 +1218,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     }
     String ec_passqtytrim;
     public void getNewData(){
-        if (!pepolerboolean&&tv_dc_emcode.getText().toString().trim().isEmpty()){
+        if (!pepolerboolean||tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
         }
@@ -1370,8 +1370,13 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 et_linecode_smts.clearFocus();
                 tv_dc_emcode.clearFocus();
                 ce_resources.clearFocus();
-                if (ce_resources.getText().toString().trim().equals("炉前目检")||ce_resources.getText().toString().trim().equals("检焊目检")){
-                    setAdaptertwo(passFeededListQty);
+                if (!ce_resources.getText().toString().trim().equals("线材目检")){
+                    getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
+                    getunhealthyDataList(ce_resources.getText().toString().trim());
+                    recycleDataundesirable(ce_resources.getText().toString().trim());
+                    recyclemaster_copyData(ce_resources.getText().toString().trim());//
+                    recycleoriginal_copyData(ce_resources.getText().toString().trim());
+                    recyclemaster_colorData(ce_resources.getText().toString().trim());
                 }
 
                 getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());

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

@@ -1210,7 +1210,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     }
     String ec_passqtytrim;
     public void getNewData(){
-        if (!pepolerboolean){
+        if (!pepolerboolean||tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
         }

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

@@ -606,6 +606,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.clearFocus();
                                     tv_dc_emcode.setFocusable(false);
+                                    pepolerboolean= true;
                                 }
 
                             }
@@ -877,7 +878,7 @@ public class StorageRechargeListFragment extends BaseFragment{
     String number ="";
     public void getNewSaveData(){
 
-        if (!pepolerboolean&&tv_dc_emcode.getText().toString().trim().isEmpty()){
+        if (!pepolerboolean||tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
         }
@@ -980,6 +981,11 @@ public class StorageRechargeListFragment extends BaseFragment{
 
                 tv_hintshow.setText(number);
                 number="";
+
+                if (!at_station.getText().toString().trim().equals("离线作业")){
+                    setAdapterqtytwo(passFeededListQty);
+                }
+
                 setAdapter(mFeededList);
                 setAdaptertwo(mFeededListtwo);
             }

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -11,61 +12,53 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <LinearLayout
-                android:layout_marginLeft="5dp"
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_height="wrap_content">
-                <ImageView
-                    android:id="@+id/iv_personnel_data"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:scaleType="fitXY"
-                    android:background="@drawable/bg_imageview_rauide">
-                </ImageView>
 
-            </LinearLayout>
             <LinearLayout
                 android:orientation="vertical"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content">
                 <LinearLayout
-                    android:layout_marginRight="@dimen/dp_10"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+
                     <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="人员编号："
-                            android:layout_gravity="center"
-                            android:textColor="@color/black">
-                        </TextView>
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
                         <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:orientation="horizontal"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
-                            <FrameLayout
-                                android:layout_width="0dp"
+                            <TextView
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1">
+                                android:layout_gravity="center"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/dp_10"
+                                android:text="工单流水：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
 
                                 <AutoCompleteTextView
-                                    android:id="@+id/tv_dc_emcode"
+                                    android:id="@+id/ce_work_code"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
                                     android:inputType="number"
-                                    android:hint="请输入人员编号" />
+                                    android:hint="请输入工单流水" />
 
                                 <ImageView
-                                    android:id="@+id/iv_dc_emcode_delete"
+                                    android:id="@+id/iv_work_code"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center|right"
@@ -74,182 +67,371 @@
                                     android:visibility="gone" />
                             </FrameLayout>
                             <ImageView
-                                android:id="@+id/iv_dc_emcode"
+                                android:layout_gravity="center"
+                                android:id="@+id/iv_popuwindow"
                                 android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/bg_button"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="计划单号："
+                                android:textSize="@dimen/dp_10"
+                                android:layout_gravity="center"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <LinearLayout
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <AutoCompleteTextView
+                                        android:id="@+id/tv_macode"
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_height="30dp"
+                                        android:inputType="number"
+                                        android:hint=""
+                                        android:focusable="false"
+                                        android:textSize="@dimen/dp_10"/>
+
+                                    <ImageView
+                                        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>
+                                <ImageView
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:clickable="false" />
+                            </LinearLayout>
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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/black"
+                                android:textSize="@dimen/dp_10"
+                                android:text="产品代码：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/tv_pr_code"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:focusable="false"
+                                    android:hint="" />
+
+                                <ImageView
+                                    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>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
                                 android:layout_marginRight="10dp"
                                 android:layout_marginLeft="5dp"
-                                android:clickable="false" />
+                                android:src="@drawable/search_48" />
                         </LinearLayout>
-                    </LinearLayout>
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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/black"
+                                android:textSize="@dimen/dp_10"
+                                android:text="产品名称：">
+                            </TextView>
 
-                    <LinearLayout
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="不良归属：">
-                        </TextView>
-
-                        <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1">
-
-                            <AutoCompleteTextView
-                                android:id="@+id/at_station"
-                                style="@style/EditTextLineStyle"
-                                android:layout_height="30dp"
-                                android:hint="请输入不良归属" />
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
 
+                                <AutoCompleteTextView
+                                    android:id="@+id/tv_pr_detail"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:inputType="number"
+                                    android:focusable="false"
+                                    android:hint="" />
+
+                                <ImageView
+                                    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>
                             <ImageView
-                                android:id="@+id/iv_station"
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            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|right"
-                                android:layout_marginRight="13dp"
-                                android:src="@drawable/wrong"
-                                android:visibility="gone" />
-                        </FrameLayout>
-                        <ImageView
-                            android:id="@+id/iv_resources"
-                            android:layout_gravity="center"
-                            android:layout_width="30dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginLeft="5dp"
-                            android:background="@drawable/bg_button"
-                            android:src="@drawable/search_48" />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="工单流水：">
-                        </TextView>
-
-                        <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1">
-
-                            <AutoCompleteTextView
-                                android:id="@+id/ce_work_code"
-                                style="@style/EditTextLineStyle"
-                                android:layout_height="30dp"
-                                android:inputType="number"
-                                android:hint="请输入工单流水" />
+                                android:text="人员编号："
+                                android:textSize="@dimen/dp_10"
+                                android:layout_gravity="center"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <LinearLayout
+                                android:layout_marginTop="5dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
 
-                            <ImageView
-                                android:id="@+id/iv_work_code"
+                                    <AutoCompleteTextView
+                                        android:id="@+id/tv_dc_emcode"
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_height="30dp"
+                                        android:inputType="number"
+                                        android:hint="请输入人员编号"
+                                        android:textSize="@dimen/dp_10"/>
+
+                                    <ImageView
+                                        android:id="@+id/iv_dc_emcode_delete"
+                                        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>
+                                <ImageView
+                                    android:id="@+id/iv_dc_emcode"
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:clickable="false" />
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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|right"
-                                android:layout_marginRight="13dp"
-                                android:src="@drawable/wrong"
-                                android:visibility="gone" />
-                        </FrameLayout>
-                        <ImageView
-                            android:layout_gravity="center"
-                            android:id="@+id/iv_popuwindow"
-                            android:layout_width="30dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginLeft="5dp"
-                            android:background="@drawable/bg_button"
-                            android:src="@drawable/search_48" />
+                                android:layout_gravity="center"
+                                android:textSize="@dimen/dp_10"
+                                android:textColor="@color/black"
+                                android:text="不良归属：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/at_station"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入不良归属" />
+
+                                <ImageView
+                                    android:id="@+id/iv_station"
+                                    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>
+                            <ImageView
+                                android:id="@+id/iv_resources"
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/bg_button"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+
+
                     </LinearLayout>
+
+                    <ImageView
+                        android:layout_marginLeft="5dp"
+                        android:layout_margin="@dimen/dp_10"
+                        android:id="@+id/iv_personnel_data"
+                        android:layout_width="200dp"
+                        android:layout_height="200dp"
+                        android:scaleType="fitXY"
+                        android:background="@drawable/bg_imageview_rauide">
+                    </ImageView>
+
                 </LinearLayout>
                 <LinearLayout
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:layout_marginLeft="10dp"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:id="@+id/tv_macode"
-                        android:layout_width="match_parent"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="计划单号"
-                        android:textColor="@color/black">
+                        android:layout_gravity="center"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"
+                        android:text="不良现象：">
                     </TextView>
-                    <TextView
-                        android:id="@+id/tv_pr_code"
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_one"
                         android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="产品代码"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"
                         android:layout_gravity="center"
-                        android:textColor="@color/black">
+                        android:text="不良位号：">
                     </TextView>
-                    <TextView
-                        android:id="@+id/tv_pr_detail"
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_two"
                         android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="产品名称"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"
                         android:layout_gravity="center"
-                        android:textColor="@color/black">
+                        android:text="不良原因：">
                     </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_three"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
                 </LinearLayout>
-                <TextView
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:text="不良现象">
-                </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_one"
+
+                <LinearLayout
+
+                    android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
-                <TextView
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:text="不良位号">
-                </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_two"
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="不良数量："
+                        android:textSize="@dimen/dp_10"
+                        android:textColor="@color/black">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_datapassqty"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+
+
+
+            </LinearLayout>
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.4">
+                <com.bin.david.form.core.SmartTable
+                    android:id="@+id/jlt_storage_in_filter_list_st"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"/>
                 <TextView
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:text="不良原因">
+                    android:layout_marginTop="@dimen/textsize_20"
+                    android:id="@+id/tv_save"
+                    android:layout_width="150dp"
+                    android:layout_height="50dp"
+                    android:text="提交"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textSize="@dimen/textsize_20"
+                    android:background="@drawable/bg_button">
                 </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_three"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
-
             </LinearLayout>
+
+
         </LinearLayout>
 
     </ScrollView>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/black">
-    </View>
     <com.uas.collection.view.ClearableEditText
         android:id="@+id/tv_hintshow"
         android:layout_width="match_parent"
@@ -261,20 +443,10 @@
         android:textSize="15sp"
         android:layout_marginRight="@dimen/dp_10"
         android:focusable="false"
-        android:background="@drawable/bg_line_edittext">
+        android:background="@drawable/bg_line_edittext"
+        android:visibility="gone">
     </com.uas.collection.view.ClearableEditText>
-    <TextView
-        android:layout_marginTop="@dimen/textsize_20"
-        android:layout_marginBottom="@dimen/textsize_20"
-        android:id="@+id/tv_save"
-        android:layout_width="150dp"
-        android:layout_height="50dp"
-        android:text="提交"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textSize="@dimen/textsize_20"
-        android:background="@drawable/bg_button">
-    </TextView>
+
     <TextView
         android:id="@+id/tv_gonema_code"
         android:layout_width="match_parent"

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

@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:ignore="MissingDefaultResource">
+    <ScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <LinearLayout
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="人员编号："
+                                android:textSize="@dimen/dp_10"
+                                android:layout_gravity="center"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <LinearLayout
+                                android:layout_marginTop="5dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <AutoCompleteTextView
+                                        android:id="@+id/tv_dc_emcode"
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_height="30dp"
+                                        android:inputType="number"
+                                        android:hint="请输入人员编号"
+                                        android:textSize="@dimen/dp_10"/>
+
+                                    <ImageView
+                                        android:id="@+id/iv_dc_emcode_delete"
+                                        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>
+                                <ImageView
+                                    android:id="@+id/iv_dc_emcode"
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:clickable="false" />
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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:textSize="@dimen/dp_10"
+                                android:text="不良归属：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/at_station"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入不良归属" />
+
+                                <ImageView
+                                    android:id="@+id/iv_station"
+                                    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>
+                            <ImageView
+                                android:id="@+id/iv_resources"
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/bg_button"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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:textSize="@dimen/dp_10"
+                                android:text="工单流水：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/ce_work_code"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:inputType="number"
+                                    android:hint="请输入工单流水" />
+
+                                <ImageView
+                                    android:id="@+id/iv_work_code"
+                                    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>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:id="@+id/iv_popuwindow"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/bg_button"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="人员编号："
+                                android:textSize="@dimen/dp_10"
+                                android:layout_gravity="center"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <LinearLayout
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <AutoCompleteTextView
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_height="30dp"
+                                        android:inputType="number"
+                                        android:hint="请输入人员编号"
+                                        android:textSize="@dimen/dp_10"/>
+
+                                    <ImageView
+                                        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>
+                                <ImageView
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:clickable="false" />
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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:textSize="@dimen/dp_10"
+                                android:text="不良归属：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入不良归属" />
+
+                                <ImageView
+                                    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>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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:textSize="@dimen/dp_10"
+                                android:text="工单流水：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:inputType="number"
+                                    android:hint="请输入工单流水" />
+
+                                <ImageView
+                                    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>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:visibility="gone"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:layout_marginLeft="10dp"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <TextView
+                            android:id="@+id/tv_macode"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="计划单号"
+                            android:textSize="@dimen/dp_10"
+                            android:textColor="@color/black">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pr_code"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="产品代码"
+                            android:textSize="@dimen/dp_10"
+                            android:layout_gravity="center"
+                            android:textColor="@color/black">
+                        </TextView>
+                        <TextView
+                            android:id="@+id/tv_pr_detail"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="产品名称"
+                            android:textSize="@dimen/dp_10"
+                            android:layout_gravity="center"
+                            android:textColor="@color/black">
+                        </TextView>
+                    </LinearLayout>
+                    <ImageView
+                        android:layout_marginLeft="5dp"
+                        android:layout_margin="@dimen/dp_10"
+                        android:id="@+id/iv_personnel_data"
+                        android:layout_width="200dp"
+                        android:layout_height="200dp"
+                        android:scaleType="fitXY"
+                        android:background="@drawable/bg_imageview_rauide">
+                    </ImageView>
+
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:textSize="@dimen/dp_10"
+                        android:text="不良现象">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_one"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:textSize="@dimen/dp_10"
+                        android:layout_gravity="center"
+                        android:text="不良位号">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_two"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/dp_10"
+                        android:layout_gravity="center"
+                        android:text="不良原因">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_three"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+
+
+
+
+
+            </LinearLayout>
+
+            <com.bin.david.form.core.SmartTable
+                android:id="@+id/jlt_storage_in_filter_list_st"
+                android:layout_width="0dp"
+                android:layout_weight="0.4"
+                android:layout_height="match_parent" />
+        </LinearLayout>
+
+    </ScrollView>
+    <com.uas.collection.view.ClearableEditText
+        android:id="@+id/tv_hintshow"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="5dp"
+        android:text=""
+        android:gravity="top"
+        android:textSize="15sp"
+        android:layout_marginRight="@dimen/dp_10"
+        android:focusable="false"
+        android:background="@drawable/bg_line_edittext"
+        android:visibility="gone">
+    </com.uas.collection.view.ClearableEditText>
+    <TextView
+        android:layout_marginTop="@dimen/textsize_20"
+        android:layout_marginBottom="@dimen/textsize_20"
+        android:id="@+id/tv_save"
+        android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:text="提交"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textSize="@dimen/textsize_20"
+        android:background="@drawable/bg_button">
+    </TextView>
+    <TextView
+        android:id="@+id/tv_gonema_code"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
+    </TextView>
+</LinearLayout>

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

@@ -318,66 +318,81 @@
 
 
                             </LinearLayout>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="left"
-                                android:text="不良现象">
-                            </TextView>
-                            <android.support.v7.widget.RecyclerView
-                                android:id="@+id/rv_datachange"
+                            <LinearLayout
+                                android:layout_marginTop="10dp"
+                                android:orientation="horizontal"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content">
-                            </android.support.v7.widget.RecyclerView>
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="left"
-                                android:text="不良原因">
-                            </TextView>
-                            <android.support.v7.widget.RecyclerView
-                                android:id="@+id/rv_datachangetwo"
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:text="不良现象："
+                                    android:textColor="@color/black">
+                                </TextView>
+                                <android.support.v7.widget.RecyclerView
+                                    android:id="@+id/rv_datachange"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+                                </android.support.v7.widget.RecyclerView>
+                            </LinearLayout>
+                            <LinearLayout
+                                android:layout_marginTop="10dp"
+                                android:orientation="horizontal"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content">
-                            </android.support.v7.widget.RecyclerView>
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="left"
-                                android:text="不良数量">
-                            </TextView>
-                            <android.support.v7.widget.RecyclerView
-                                android:id="@+id/rv_datapassqty"
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:text="不良原因："
+                                    android:textColor="@color/black">
+                                </TextView>
+                                <android.support.v7.widget.RecyclerView
+                                    android:id="@+id/rv_datachangetwo"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+                                </android.support.v7.widget.RecyclerView>
+                            </LinearLayout>
+                            <LinearLayout
+                                android:layout_marginTop="10dp"
+                                android:orientation="horizontal"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content">
-                            </android.support.v7.widget.RecyclerView>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:text="不良数量："
+                                    android:textColor="@color/black">
+                                </TextView>
+                                <android.support.v7.widget.RecyclerView
+                                    android:id="@+id/rv_datapassqty"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+                                </android.support.v7.widget.RecyclerView>
+                            </LinearLayout>
+
+
+
 
-                        </LinearLayout>
 
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.8"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            android:layout_marginRight="@dimen/dp_10"
-                            android:layout_marginTop="@dimen/dp_10">
-                            <ImageView
-                                android:id="@+id/iv_personnel_data"
-                                android:layout_width="190dp"
-                                android:layout_height="190dp"
-                                android:scaleType="fitXY"
-                                android:background="@drawable/bg_imageview_rauide">
-                            </ImageView>
 
                         </LinearLayout>
 
+                        <ImageView
+                            android:id="@+id/iv_personnel_data"
+                            android:layout_width="190dp"
+                            android:layout_height="190dp"
+                            android:scaleType="fitXY"
+                            android:layout_margin="@dimen/dp_10"
+                            android:background="@drawable/bg_imageview_rauide">
+                        </ImageView>
+
                         <com.bin.david.form.core.SmartTable
                             android:id="@+id/jlt_storage_in_filter_list_st"
                             android:layout_width="0dp"
-                            android:layout_weight="0.8"
+                            android:layout_weight="0.9"
                             android:layout_height="match_parent" />
                     </LinearLayout>
 

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

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    tools:ignore="MissingDefaultResource">
+
+    <LinearLayout
+
+        android:layout_marginLeft="@dimen/textsize_20"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+        <CheckBox
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/select_checkbox"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="1111111"
+            android:textSize="@dimen/dp_10"
+            android:textColor="@color/black"
+            android:id="@+id/text"
+            android:gravity="left"
+            tools:ignore="RtlCompat">
+        </TextView>
+
+        <com.uas.collection.view.ClearableEditText
+            android:id="@+id/ce_other"
+            style="@style/EditTextLineStyle"
+            android:layout_gravity="center"
+            android:layout_width="200dp"
+            android:layout_height="@dimen/textsize_20"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:textColor="@color/black"
+            android:textSize="@dimen/dp_10"
+            android:visibility="gone" />
+        <LinearLayout
+            android:visibility="gone"
+            android:layout_gravity="center"
+            android:id="@+id/line_vis"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <AutoCompleteTextView
+                android:id="@+id/ce_qty"
+                android:background="@drawable/bg_line_edittext"
+                android:layout_gravity="center"
+                android:layout_width="@dimen/dp_40"
+                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"
+                android:textColor="@color/black"
+                />
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:id="@+id/btnIncrease"
+                    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"
+                    android:layout_height="1dp"
+                    android:background="@color/white">
+                </View>
+                <TextView
+                    android:id="@+id/btnDecrease"
+                    android:background="@color/gray_list"
+                    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>
+
+
+
+
+    </LinearLayout>
+
+
+
+
+</LinearLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -11,61 +12,100 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <LinearLayout
-                android:layout_marginLeft="5dp"
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_height="wrap_content">
-                <ImageView
-                    android:id="@+id/iv_personnel_data"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:scaleType="fitXY"
-                    android:background="@drawable/bg_imageview_rauide">
-                </ImageView>
 
-            </LinearLayout>
             <LinearLayout
                 android:orientation="vertical"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content">
                 <LinearLayout
-                    android:layout_marginRight="@dimen/dp_10"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+
                     <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="人员编号："
-                            android:layout_gravity="center"
-                            android:textColor="@color/black">
-                        </TextView>
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
-                            <FrameLayout
-                                android:layout_width="0dp"
+
+                            <TextView
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1">
+                                android:text="人员编号："
+                                android:textSize="@dimen/dp_10"
+                                android:layout_gravity="center"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <LinearLayout
+                                android:layout_marginTop="5dp"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <AutoCompleteTextView
+                                        android:id="@+id/tv_dc_emcode"
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_height="30dp"
+                                        android:inputType="number"
+                                        android:hint="请输入人员编号"
+                                        android:textSize="@dimen/dp_10"/>
+
+                                    <ImageView
+                                        android:id="@+id/iv_dc_emcode_delete"
+                                        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>
+                                <ImageView
+                                    android:id="@+id/iv_dc_emcode"
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:clickable="false" />
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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:textSize="@dimen/dp_10"
+                                android:textColor="@color/black"
+                                android:text="不良归属：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
 
                                 <AutoCompleteTextView
-                                    android:id="@+id/tv_dc_emcode"
+                                    android:id="@+id/at_station"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="30dp"
-                                    android:inputType="number"
-                                    android:hint="请输入人员编号" />
+                                    android:textSize="@dimen/dp_10"
+                                    android:hint="请输入不良归属" />
 
                                 <ImageView
-                                    android:id="@+id/iv_dc_emcode_delete"
+                                    android:id="@+id/iv_station"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center|right"
@@ -74,182 +114,283 @@
                                     android:visibility="gone" />
                             </FrameLayout>
                             <ImageView
-                                android:id="@+id/iv_dc_emcode"
+                                android:id="@+id/iv_resources"
+                                android:layout_gravity="center"
                                 android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:background="@drawable/bg_button"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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/black"
+                                android:textSize="@dimen/dp_10"
+                                android:text="工单流水：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/ce_work_code"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:inputType="number"
+                                    android:hint="请输入工单流水" />
+
+                                <ImageView
+                                    android:id="@+id/iv_work_code"
+                                    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>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:id="@+id/iv_popuwindow"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
                                 android:layout_marginRight="10dp"
                                 android:layout_marginLeft="5dp"
-                                android:clickable="false" />
+                                android:background="@drawable/bg_button"
+                                android:src="@drawable/search_48" />
                         </LinearLayout>
-                    </LinearLayout>
 
-                    <LinearLayout
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="不良归属：">
-                        </TextView>
-
-                        <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1">
-
-                            <AutoCompleteTextView
-                                android:id="@+id/at_station"
-                                style="@style/EditTextLineStyle"
-                                android:layout_height="30dp"
-                                android:hint="请输入不良归属" />
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
 
-                            <ImageView
-                                android:id="@+id/iv_station"
+                            <TextView
                                 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>
-                        <ImageView
-                            android:id="@+id/iv_resources"
-                            android:layout_gravity="center"
-                            android:layout_width="30dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginLeft="5dp"
-                            android:background="@drawable/bg_button"
-                            android:src="@drawable/search_48" />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="工单流水：">
-                        </TextView>
-
-                        <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1">
-
-                            <AutoCompleteTextView
-                                android:id="@+id/ce_work_code"
-                                style="@style/EditTextLineStyle"
-                                android:layout_height="30dp"
-                                android:inputType="number"
-                                android:hint="请输入工单流水" />
+                                android:text="计划单号："
+                                android:textSize="@dimen/dp_10"
+                                android:layout_gravity="center"
+                                android:textColor="@color/black">
+                            </TextView>
+                            <LinearLayout
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <FrameLayout
+                                    android:layout_weight="1"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <AutoCompleteTextView
+                                        android:id="@+id/tv_macode"
+                                        style="@style/EditTextLineStyle"
+                                        android:layout_height="30dp"
+                                        android:inputType="number"
+                                        android:hint=""
+                                        android:textSize="@dimen/dp_10"/>
+
+                                    <ImageView
+                                        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>
+                                <ImageView
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginRight="10dp"
+                                    android:layout_marginLeft="5dp"
+                                    android:clickable="false" />
+                            </LinearLayout>
+                        </LinearLayout>
 
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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/black"
+                                android:textSize="@dimen/dp_10"
+                                android:text="产品代码：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/tv_pr_code"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:hint="" />
+
+                                <ImageView
+                                    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>
                             <ImageView
-                                android:id="@+id/iv_work_code"
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_marginTop="5dp"
+                            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|right"
-                                android:layout_marginRight="13dp"
-                                android:src="@drawable/wrong"
-                                android:visibility="gone" />
-                        </FrameLayout>
-                        <ImageView
-                            android:layout_gravity="center"
-                            android:id="@+id/iv_popuwindow"
-                            android:layout_width="30dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginRight="10dp"
-                            android:layout_marginLeft="5dp"
-                            android:background="@drawable/bg_button"
-                            android:src="@drawable/search_48" />
+                                android:layout_gravity="center"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/dp_10"
+                                android:text="产品名称：">
+                            </TextView>
+
+                            <FrameLayout
+                                android:layout_weight="1"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/tv_pr_detail"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:textSize="@dimen/dp_10"
+                                    android:inputType="number"
+                                    android:hint="" />
+
+                                <ImageView
+                                    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>
+                            <ImageView
+                                android:layout_gravity="center"
+                                android:layout_width="30dp"
+                                android:layout_height="match_parent"
+                                android:layout_marginRight="10dp"
+                                android:layout_marginLeft="5dp"
+                                android:src="@drawable/search_48" />
+                        </LinearLayout>
+
                     </LinearLayout>
+
+                    <ImageView
+                        android:paddingLeft="@dimen/dp_10"
+                        android:layout_marginRight="@dimen/dp_10"
+                        android:layout_marginTop="5dp"
+                        android:id="@+id/iv_personnel_data"
+                        android:layout_width="200dp"
+                        android:layout_height="200dp"
+                        android:scaleType="fitXY"
+                        android:background="@drawable/bg_imageview_rauide">
+                    </ImageView>
+
                 </LinearLayout>
                 <LinearLayout
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:layout_marginLeft="10dp"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <TextView
-                        android:id="@+id/tv_macode"
-                        android:layout_width="match_parent"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="计划单号"
-                        android:textColor="@color/black">
+                        android:layout_gravity="center"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"
+                        android:text="不良现象">
                     </TextView>
-                    <TextView
-                        android:id="@+id/tv_pr_code"
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_one"
                         android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="产品代码"
+                        android:layout_marginTop="5dp"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"
                         android:layout_gravity="center"
-                        android:textColor="@color/black">
+                        android:text="不良位号">
                     </TextView>
-                    <TextView
-                        android:id="@+id/tv_pr_detail"
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_two"
                         android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="产品名称"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/dp_10"
                         android:layout_gravity="center"
-                        android:textColor="@color/black">
+                        android:text="不良原因">
                     </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_three"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
                 </LinearLayout>
-                <TextView
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:text="不良现象">
-                </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_one"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
-                <TextView
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:text="不良位号">
-                </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_two"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
-                <TextView
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:text="不良原因">
-                </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_three"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
+
+
+
+
 
             </LinearLayout>
+
+            <com.bin.david.form.core.SmartTable
+                android:id="@+id/jlt_storage_in_filter_list_st"
+                android:layout_width="0dp"
+                android:layout_weight="0.4"
+                android:layout_height="match_parent" />
         </LinearLayout>
 
     </ScrollView>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/black">
-    </View>
     <com.uas.collection.view.ClearableEditText
         android:id="@+id/tv_hintshow"
         android:layout_width="match_parent"
@@ -261,11 +402,12 @@
         android:textSize="15sp"
         android:layout_marginRight="@dimen/dp_10"
         android:focusable="false"
-        android:background="@drawable/bg_line_edittext">
+        android:background="@drawable/bg_line_edittext"
+        android:visibility="gone">
     </com.uas.collection.view.ClearableEditText>
     <TextView
         android:layout_marginTop="@dimen/textsize_20"
-        android:layout_marginBottom="@dimen/textsize_20"
+        android:layout_marginBottom="@dimen/dp_10"
         android:id="@+id/tv_save"
         android:layout_width="150dp"
         android:layout_height="50dp"

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

@@ -318,41 +318,62 @@
 
 
                 </LinearLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:text="不良现象">
-                </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_datachange"
+                <LinearLayout
+                    android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:text="不良原因">
-                </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_datachangetwo"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="不良现象："
+                        android:textColor="@color/black">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_datachange"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:text="不良数量">
-                </TextView>
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/rv_datapassqty"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="不良原因："
+                        android:textColor="@color/black">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_datachangetwo"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
-                </android.support.v7.widget.RecyclerView>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="不良数量："
+                        android:textColor="@color/black">
+                    </TextView>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/rv_datapassqty"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    </android.support.v7.widget.RecyclerView>
+                </LinearLayout>
+
+
+
+
+
 
             </LinearLayout>
 
@@ -361,8 +382,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.8"
-                android:layout_marginLeft="@dimen/textsize_20"
-                android:layout_marginRight="@dimen/textsize_20"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
                 android:layout_marginTop="@dimen/dp_10">
                 <ImageView
                     android:id="@+id/iv_personnel_data"

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

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    tools:ignore="MissingDefaultResource">
+
+    <LinearLayout
+
+        android:layout_marginLeft="@dimen/textsize_20"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+        <CheckBox
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/select_checkbox"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="1111111"
+            android:textSize="20dp"
+            android:textColor="@color/black"
+            android:id="@+id/text"
+            android:gravity="left"
+            tools:ignore="RtlCompat">
+        </TextView>
+
+        <com.uas.collection.view.ClearableEditText
+            android:id="@+id/ce_other"
+            style="@style/EditTextLineStyle"
+            android:layout_gravity="center"
+            android:layout_width="200dp"
+            android:layout_height="@dimen/textsize_20"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:textColor="@color/black"
+            android:visibility="gone" />
+        <LinearLayout
+            android:visibility="gone"
+            android:id="@+id/line_vis"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <AutoCompleteTextView
+                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_weight="1"
+                android:text="0"
+                android:inputType="number"
+                android:gravity="center"
+                android:layout_marginLeft="5dp"
+                android:textColor="@color/black"
+                />
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:id="@+id/btnIncrease"
+                    android:layout_width="30dp"
+                    android:layout_height="@dimen/space_top_line_15"
+                    android:gravity="center"
+                    android:text="+"
+                    android:background="@color/gray_list" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/white">
+                </View>
+                <TextView
+                    android:id="@+id/btnDecrease"
+                    android:background="@color/gray_list"
+                    android:layout_width="30dp"
+                    android:layout_height="@dimen/space_top_line_15"
+                    android:gravity="center"
+                    android:text="-" />
+            </LinearLayout>
+        </LinearLayout>
+
+
+
+
+    </LinearLayout>
+
+
+
+
+</LinearLayout>

pda_libs/pulltoreflashlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Tue Aug 08 15:55:13 CST 2023
+#Fri Sep 01 11:15:00 CST 2023
 D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable\\indicator_bg_bottom.xml=D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable\\indicator_bg_bottom.xml
 D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\drawable-mdpi\\indicator_arrow.png=D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\drawable-mdpi-v4\\indicator_arrow.png
 D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\src\\main\\res\\anim\\slide_out_to_bottom.xml=D\:\\AndroidData\\RD-DAATA-COLLECTION\\pda_libs\\pulltoreflashlibrary\\build\\intermediates\\packaged_res\\debug\\anim\\slide_out_to_bottom.xml