先材目检更换位置

提交后清空原件位号、清空不良原因
组装测试 不良现象 增加 能效不良
性能维修 不良现象增加 能效不良
产量统计界面更改数量
提交按钮居中

app/src/main/AndroidManifest.xml

@@ -16,16 +16,20 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="allowBackup,label,theme">
-        <activity android:name="com.uas.collection.ProductCodeActivity"></activity>
+        <activity android:name="com.uas.collection.ProductCodeActivity"
+            android:screenOrientation="portrait">
+        </activity>
 
         <activity android:name="com.uas.collection.activity.BaseSelectActivity" />
 
         <activity android:name="com.uas.collection.activity.HomeActivity"
             android:label="@string/title_activity_menu"
+            android:screenOrientation="portrait"
             android:launchMode="singleTask"/>
         <activity
             android:name="com.uas.collection.activity.SplashActivity"
             android:icon="@mipmap/select"
+            android:screenOrientation="portrait"
             android:theme="@style/NoOverLayStyle">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -37,36 +41,49 @@
             android:name="com.uas.collection.activity.MainActivity"
             android:icon="@mipmap/select"
             android:label="@string/title_activity_menu"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.uas.collection.activity.PdfsActivity"
             android:icon="@mipmap/select"
             android:label="@string/title_activity_menu"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.uas.collection.activity.BannerActivity"
             android:icon="@mipmap/select"
             android:label="@string/title_activity_menu"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.uas.collection.activity.IndexActivity"
             android:label="@string/title_activity_menu"
+            android:screenOrientation="portrait"
             android:launchMode="singleTask" />
         <activity
             android:name="com.uas.collection.activity.FunctionActivity"
             android:label="@string/title_activity_function"
             android:launchMode="singleTask"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name="com.uas.collection.activity.SearchMaterialActivity"
+            android:screenOrientation="portrait"
             android:label="@string/material_number_search" />
-        <activity android:name="com.uas.collection.activity.CommonSeclecActivity" />
-        <activity android:name="com.uas.collection.activity.LineSelectActivity"></activity>
-        <activity android:name="com.uas.collection.activity.SelectNetAcitivty"></activity>
+        <activity android:name="com.uas.collection.activity.CommonSeclecActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.uas.collection.activity.LineSelectActivity"
+            android:screenOrientation="portrait">
+
+        </activity>
+        <activity android:name="com.uas.collection.activity.SelectNetAcitivty"
+            android:screenOrientation="portrait">
+        </activity>
         <activity
             android:name="com.uas.collection.camera.CaptureActivity"
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
         <service android:name="com.uas.collection.webtcp.WebSocketService"

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

@@ -8,8 +8,17 @@ public class LinecodeBean {
     private String PR_CODE;
     private String PR_DETAIL;
     private String MA_ID;
+    private String MA_BOMVERSION;
     private boolean checked;
 
+    public String getMA_BOMVERSION() {
+        return MA_BOMVERSION;
+    }
+
+    public void setMA_BOMVERSION(String MA_BOMVERSION) {
+        this.MA_BOMVERSION = MA_BOMVERSION;
+    }
+
     public String getMA_ID() {
         return MA_ID;
     }

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

@@ -17,6 +17,7 @@ public class TestcollectDataBean {
     private String SR_REMARK;
     private String SR_INMAN;
     private String SR_INDATE;
+    private String MA_PRODCODE;
 
     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;
@@ -35,6 +36,14 @@ public class TestcollectDataBean {
     }
     public TestcollectDataBean(){}
 
+    public String getMA_PRODCODE() {
+        return MA_PRODCODE;
+    }
+
+    public void setMA_PRODCODE(String MA_PRODCODE) {
+        this.MA_PRODCODE = MA_PRODCODE;
+    }
+
     public String getSR_ID() {
         return SR_ID;
     }

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

@@ -112,6 +112,7 @@ public class BreakdownRepairFragment extends BaseFragment{
     private String sc_name;
     private RecyclerView rv_line_ip_port_data;
     private ImageView iv_dc_emcode_delete;
+    private String ma_bomversion;
 
 
     @Override
@@ -169,13 +170,13 @@ public class BreakdownRepairFragment extends BaseFragment{
         ce_work_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String va_code = ce_work_code.getText().toString().trim();
                     getfuzzySearchData(va_code,"");
-                    return true;
-                }
+//                    return true;
+//                }
                 return false;
             }
         });
@@ -325,13 +326,13 @@ public class BreakdownRepairFragment extends BaseFragment{
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String dc_emcode = tv_dc_emcode.getText().toString().trim();
                     getOrImage(dc_emcode);
-                    return true;
-                }
+//                    return true;
+//                }
                 return false;
             }
         });
@@ -459,6 +460,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                             bean.setPR_CODE(data.getString("PR_CODE"));
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
                             bean.setMA_ID(data.getString("MA_ID"));
+                            bean.setMA_BOMVERSION(data.getString("MA_BOMVERSION"));
 
                             linecodeBeanList.add(bean);
                         }
@@ -475,9 +477,10 @@ public class BreakdownRepairFragment extends BaseFragment{
                                     String pr_code = JsonUtils.optStringNotNull(dataObject, "PR_CODE");
                                     String pr_detail = JsonUtils.optStringNotNull(dataObject, "PR_DETAIL");
                                     String ma_id = JsonUtils.optStringNotNull(dataObject, "MA_ID");
+                                    String ma_bomversion = JsonUtils.optStringNotNull(dataObject, "MA_BOMVERSION");
                                     ce_work_code.setText(ma_id);
                                     tv_gonema_code.setText(ma_code);
-                                    tv_pr_code.setText("产品代码  "+pr_code);
+                                    tv_pr_code.setText("产品代码  "+ma_bomversion);
                                     tv_pr_detail.setText("产品名称  "+pr_detail);
                                     tv_macode.setText("计划单号  "+ma_code);
                                     at_station.clearFocus();
@@ -868,6 +871,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         list.add("耐压不良");
         list.add("绝缘电阻");
         list.add("误测");
+        list.add("能效不良");
         list.add("其他");
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
@@ -1074,6 +1078,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                 ma_id = ipAndPortBeans.get(position).getMA_ID();
                 pr_code = ipAndPortBeans.get(position).getPR_CODE();
                 pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
+                ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -1093,7 +1098,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
                 ce_work_code.setText(ma_id);
                 tv_gonema_code.setText(ma_code);
-                tv_pr_code.setText("产品代码  "+pr_code);
+                tv_pr_code.setText("产品代码  "+ma_bomversion);
                 tv_pr_detail.setText("产品名称  "+pr_detail);
                 tv_macode.setText("计划单号  "+ma_code);
                 at_station.clearFocus();

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

@@ -166,6 +166,8 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     private String ce_bit_numbertrim;
     private String alonedatamaster;
     private String ce_bit_original;
+    private String ma_bomversion;
+
 
     @Override
     protected int getLayout() {
@@ -274,13 +276,14 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         et_linecode_smts.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                if (
+//                        actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                         ||(event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String va_code = et_linecode_smts.getText().toString().trim();
                     getfuzzySearchData(va_code,"");
-                    return true;
-                }
+//                    return true;
+//                }
                 return false;
             }
         });
@@ -315,6 +318,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 et_linecode_smts.requestFocus();
                 tv_macode.setText("");
                 tv_pr_code.setText("");
+//                chan_code.setText("");
                 tv_pr_detail.setText("");
 
             }
@@ -477,7 +481,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         rv_datachange.setLayoutManager(gridLayoutManager);
         setAdapter(mFeededList);
         rv_datachange.setAdapter(selectAdapter);
-        /**--------------------------数量---------------------------------------**/
+        /**--------------------------不良数量---------------------------------------**/
         passFeededListQty = new ArrayList<>();
         selectAdapterQty = new SelectAdapterQty(passFeededListQty);
         LinearLayoutManager layoutmanagertwo = new LinearLayoutManager(mActivity);
@@ -523,13 +527,13 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String dc_emcode = tv_dc_emcode.getText().toString().trim();
                     getOrImage(dc_emcode);
-                    return true;
-                }
+//                    return true;
+//                }
                 return false;
             }
         });
@@ -943,6 +947,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                             bean.setPR_CODE(data.getString("PR_CODE"));
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
                             bean.setMA_ID(data.getString("MA_ID"));
+                            bean.setMA_BOMVERSION(data.getString("MA_BOMVERSION"));
 
                             linecodeBeanList.add(bean);
                         }
@@ -959,9 +964,11 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                                     String pr_code = JsonUtils.optStringNotNull(dataObject, "PR_CODE");
                                     String pr_detail = JsonUtils.optStringNotNull(dataObject, "PR_DETAIL");
                                     String ma_id = JsonUtils.optStringNotNull(dataObject, "MA_ID");
+                                    String ma_bomversion = JsonUtils.optStringNotNull(dataObject, "MA_BOMVERSION");
                                     if (!TextUtils.isEmpty(ma_id))
                                         mAutoStringAdapter.add(ma_code);
-                                    tv_pr_code.setText(""+pr_code);
+                                    tv_pr_code.setText(""+ma_bomversion);
+//                                    chan_code.setText(""+pr_code);
                                     tv_pr_detail.setText(""+pr_detail);
                                     tv_macode.setText(""+ma_code);
                                     et_linecode_smts.setText(ma_id);
@@ -1324,6 +1331,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         object_1.put("SR_TYPE", "数据采集");//种类(数据采集/、外观维修/性能维修)
         object_1.put("SR_LOCATION", ce_bit_numbertrim);//位号
         object_1.put("SR_SN", "");//SN号
+        object_1.put("SR_LINECODE", tv_dc_line.getText().toString().trim());//物理线体
         object_1.put("SR_REMARK", "");//备注/其他
         object_1.put("SR_INMAN", "");//录入人
         object_1.put("SR_INDATE", "");//录入时间
@@ -1343,12 +1351,12 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 et_linecode_smts.clearFocus();
                 tv_dc_emcode.clearFocus();
                 ce_resources.clearFocus();
-                setAdaptertwo(passFeededListQty);
+//                setAdaptertwo(passFeededListQty);
                 getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
-                getunhealthyDataList(ce_resources.getText().toString().trim());
+//                getunhealthyDataList(ce_resources.getText().toString().trim());
                 recycleDataundesirable(ce_resources.getText().toString().trim());
-                setAdaptertwo(passFeededListQty);
-                recyclemaster_copyData(ce_resources.getText().toString().trim());
+//                setAdaptertwo(passFeededListQty);
+                recyclemaster_copyData(ce_resources.getText().toString().trim());//
                 recycleoriginal_copyData(ce_resources.getText().toString().trim());
                 recyclemaster_colorData(ce_resources.getText().toString().trim());
             }
@@ -1411,6 +1419,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 pr_code = ipAndPortBeans.get(position).getPR_CODE();
                 pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
                 ma_id = ipAndPortBeans.get(position).getMA_ID();
+                ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -1429,7 +1438,8 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                     return;
                 }
                 et_linecode_smts.setText(ma_id);
-                tv_pr_code.setText(""+pr_code);
+                tv_pr_code.setText(""+ma_bomversion);//pr_code ma_bomversion
+//                chan_code.setText(""+pr_code);
                 tv_pr_detail.setText(""+pr_detail);
                 tv_macode.setText(""+ma_code);
                 et_linecode_smts.clearFocus();
@@ -1823,6 +1833,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             linelist.add("拐点不良");
             linelist.add("耐压不良");
             linelist.add("绝缘电阻");
+            linelist.add("能效不良");
             linelist.add("其他");
         }
         else {
@@ -1849,10 +1860,11 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         List<String> linelist=new ArrayList<>();
         linelist.add("炉前目检");
         linelist.add("检焊目检");
+        linelist.add("线材目检");
         linelist.add("组装测试");
         linelist.add("组装外观目检");
         linelist.add("包装外观目检");
-        linelist.add("线材目检");
+
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
@@ -2198,7 +2210,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 
         @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_master, viewGroup, false);
             return new Selectmaster_colorAdapterQty.ListItemViewHolder(itemView);
         }
 
@@ -2209,7 +2221,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         public void onBindViewHolder(final RecyclerView.@NotNull ViewHolder holder, @SuppressLint("RecyclerView") int i) {
 
             //设置条目状态
-            (( Selectmaster_colorAdapterQty.ListItemViewHolder) holder).mainTitle.setTextSize(15);
             (( Selectmaster_colorAdapterQty.ListItemViewHolder) holder).mainTitle.setText(mList.get(i).getAlonedata());
             ((Selectmaster_colorAdapterQty.ListItemViewHolder) holder).ce_other.setVisibility(View.GONE);
 //            ((ListItemViewHolder) holder).checkBox.setChecked();

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

@@ -167,6 +167,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     private String ce_bit_numbertrim;
     private String alonedatamaster;
     private String ce_bit_original;
+    private String ma_bomversion;
 
     @Override
     protected int getLayout() {
@@ -177,7 +178,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
     protected void initViews() {
         FunctionActivity.setTitle(getString(R.string.quantity_statistics));
         ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
-        root.setBackgroundColor(getResources().getColor(R.color.background_color_second));
+        root.setBackgroundColor(getResources().getColor(R.color.white));
     }
 
     @Override
@@ -262,11 +263,8 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
 
 
 
-        va_classColumn = new Column<String>("现象", "SR_BADNAME");
-        va_sr_reasonColumn = new Column<String>("原因", "SR_REASON");
-//        va_classColumn.setFixed(true);
-        va_codeColumn = new Column<String>("位号", "SR_LOCATION");
-        va_statusColumn = new Column<String>("数量", "SR_NGQTY");
+        va_codeColumn = new Column<String>("产品代码", "MA_PRODCODE");
+        va_statusColumn = new Column<String>("时间", "SR_INDATE");
         va_sr_passqty = new Column<String>("产量统计", "SR_PASSQTY");
 
 
@@ -276,14 +274,14 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         et_linecode_smts.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String va_code = et_linecode_smts.getText().toString().trim();
                     getfuzzySearchData(va_code,"");
                     return true;
-                }
-                return false;
+//                }
+//                return false;
             }
         });
 
@@ -525,13 +523,13 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String dc_emcode = tv_dc_emcode.getText().toString().trim();
                     getOrImage(dc_emcode);
-                    return true;
-                }
+//                    return true;
+//                }
                 return false;
             }
         });
@@ -945,6 +943,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                             bean.setPR_CODE(data.getString("PR_CODE"));
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
                             bean.setMA_ID(data.getString("MA_ID"));
+                            bean.setMA_BOMVERSION(data.getString("MA_BOMVERSION"));
 
                             linecodeBeanList.add(bean);
                         }
@@ -961,9 +960,10 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                                     String pr_code = JsonUtils.optStringNotNull(dataObject, "PR_CODE");
                                     String pr_detail = JsonUtils.optStringNotNull(dataObject, "PR_DETAIL");
                                     String ma_id = JsonUtils.optStringNotNull(dataObject, "MA_ID");
+                                    String ma_bomversion = JsonUtils.optStringNotNull(dataObject, "MA_BOMVERSION");
                                     if (!TextUtils.isEmpty(ma_id))
                                         mAutoStringAdapter.add(ma_code);
-                                    tv_pr_code.setText(""+pr_code);
+                                    tv_pr_code.setText(""+ma_bomversion);
                                     tv_pr_detail.setText(""+pr_detail);
                                     tv_macode.setText(""+ma_code);
                                     et_linecode_smts.setText(ma_id);
@@ -1154,10 +1154,14 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                         JSONObject dataObject = dataArray.getJSONObject(i);
                         if (dataObject != null) {
                             TestcollectDataBean jltStorageInBean = new TestcollectDataBean();
-                            jltStorageInBean.setSR_BADNAME(FastjsonUtil.getText(dataObject, "SR_BADNAME"));
-                            jltStorageInBean.setSR_REASON(FastjsonUtil.getText(dataObject, "SR_REASON"));
-                            jltStorageInBean.setSR_LOCATION(FastjsonUtil.getText(dataObject, "SR_LOCATION"));
-                            jltStorageInBean.setSR_NGQTY(FastjsonUtil.getText(dataObject, "SR_NGQTY"));
+                            if (FastjsonUtil.getText(dataObject, "SR_INDATE").isEmpty()){
+                                jltStorageInBean.setSR_INDATE("");
+                            }else {
+                                String sr_indate = CommonUtil.timetodate(FastjsonUtil.getText(dataObject, "SR_INDATE"));
+                                jltStorageInBean.setSR_INDATE(sr_indate);
+                            }
+
+                            jltStorageInBean.setMA_PRODCODE(FastjsonUtil.getText(dataObject, "MA_PRODCODE"));
                             jltStorageInBean.setSR_PASSQTY(FastjsonUtil.getText(dataObject, "SR_PASSQTY"));
                             list.add(jltStorageInBean);
                         }
@@ -1182,7 +1186,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
 
     private void setFilterTableData(List<TestcollectDataBean> filterTableData) {
         mTableData = new TableData<TestcollectDataBean>("收料单列表", filterTableData,
-                va_sr_passqty);
+                va_codeColumn,va_statusColumn,va_sr_passqty);
         mSmartTable.setTableData(mTableData);
 //        mSmartTable.requestLayout();
         mSmartTable.postDelayed(new Runnable() {
@@ -1248,6 +1252,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         object_1.put("SR_LOCATION", "");//位号
         object_1.put("SR_REASON", "");//原因
         object_1.put("SR_SN", "");//SN号
+        object_1.put("SR_LINECODE", tv_dc_line.getText().toString().trim());//物理线体
         object_1.put("SR_REMARK", "");//备注/其他
         object_1.put("SR_INMAN", "");//录入人
         object_1.put("SR_INDATE", "");//录入时间
@@ -1335,6 +1340,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                 pr_code = ipAndPortBeans.get(position).getPR_CODE();
                 pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
                 ma_id = ipAndPortBeans.get(position).getMA_ID();
+                ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -1353,7 +1359,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
                     return;
                 }
                 et_linecode_smts.setText(ma_id);
-                tv_pr_code.setText(""+pr_code);
+                tv_pr_code.setText(""+ma_bomversion);
                 tv_pr_detail.setText(""+pr_detail);
                 tv_macode.setText(""+ma_code);
                 et_linecode_smts.clearFocus();
@@ -1431,7 +1437,7 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         rv_undesirable.setVisibility(View.VISIBLE);
         mFeededListundesirable = new ArrayList<>();
         myAdapterundesirable = new SelectAdapterundesirable(mFeededListundesirable);
-        GridLayoutManager gridLayoutManager=new GridLayoutManager(mActivity,4);
+        GridLayoutManager gridLayoutManager=new GridLayoutManager(mActivity,3);
         LinearLayoutManager layoutmanager = new LinearLayoutManager(mActivity);
 //        MyLayoutManager layout = new MyLayoutManager();
 //        layout.setAutoMeasureEnabled(true);//防止recyclerview高度为wrap时测量item高度0(一定要加这个属性，否则显示不出来）
@@ -1443,10 +1449,33 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
         List<String> list=new ArrayList<>();
+        if (sc_code.equals("插件投产")){
+            list.add("1");
+            list.add("3");
+            list.add("4");
+            list.add("5");
+            list.add("6");
+            list.add("8");
+            list.add("10");
+            list.add("12");
+            list.add("14");
+            list.add("16");
+            list.add("100");
+            list.add("200");
+            list.add("其他");
+        }else {
             list.add("50");
+            list.add("80");
             list.add("100");
+            list.add("120");
             list.add("150");
+            list.add("180");
+            list.add("200");
+            list.add("300");
+            list.add("500");
             list.add("其他");
+        }
+
 
         for (int i=0;i<list.size();i++){
             StorageRechargeAloneBean bean=new StorageRechargeAloneBean(list.get(i));
@@ -1742,12 +1771,12 @@ public class QuantityStatisticsFragment extends BaseFragment implements View.OnC
      */
     private void getlineDataList(){
         List<String> linelist=new ArrayList<>();
-        linelist.add("炉前目检");
-        linelist.add("检焊目检");
-        linelist.add("组装测试");
-        linelist.add("组装外观目检");
-        linelist.add("包装外观目检");
-        linelist.add("线材目检");
+        linelist.add("插件投产");
+        linelist.add("插件产出");
+        linelist.add("组装投产");
+        linelist.add("组装产出");
+        linelist.add("包装投产");
+        linelist.add("包装产出");
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();

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

@@ -11,6 +11,7 @@ import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextWatcher;
 import android.util.Base64;
 import android.util.Log;
@@ -128,6 +129,10 @@ public class StorageRechargeListFragment extends BaseFragment{
     private List<TestcollectDataBean> listSama;
     private ImageView iv_pr_code_delete;
     private ImageView iv_detail_delete;
+    private ArrayList<StorageRechargeAloneBean> passFeededListQty;
+    private RecyclerView rv_datapassqty;
+    private SelectAdapterQty selectAdapterQty;
+    private String ma_bomversion;
 
     @Override
     protected int getLayout() {
@@ -165,6 +170,10 @@ public class StorageRechargeListFragment extends BaseFragment{
         mSmartTable = root.findViewById(R.id.jlt_storage_in_filter_list_st);
         iv_pr_code_delete = root.findViewById(R.id.iv_pr_code_delete);
         iv_detail_delete = root.findViewById(R.id.iv_detail_delete);
+        rv_datapassqty = root.findViewById(R.id.rv_datapassqty);
+        ce_work_code.setInputType(InputType.TYPE_CLASS_NUMBER);
+        tv_dc_emcode.setInputType(InputType.TYPE_CLASS_NUMBER);
+
 
         mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
 //        ce_length.setEnabled(false);
@@ -216,13 +225,13 @@ public class StorageRechargeListFragment extends BaseFragment{
         ce_work_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String va_code = ce_work_code.getText().toString().trim();
                     getfuzzySearchData(va_code,"");
-                    return true;
-                }
+//                    return true;
+//                }
                 return false;
             }
         });
@@ -376,13 +385,13 @@ public class StorageRechargeListFragment extends BaseFragment{
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     String dc_emcode = tv_dc_emcode.getText().toString().trim();
                     getOrImage(dc_emcode);
-                    return true;
-                }
+//                    return true;
+//                }
                 return false;
             }
         });
@@ -415,9 +424,9 @@ public class StorageRechargeListFragment extends BaseFragment{
             }
         });
 
+        /**----------------------------不良数量------------------------------------**/
 
-
-
+        getqty();
 
 
 
@@ -485,6 +494,60 @@ public class StorageRechargeListFragment extends BaseFragment{
         }, 100);
 
     }
+
+    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 getOrImage(String em_code){
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
@@ -567,6 +630,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                             bean.setPR_CODE(data.getString("PR_CODE"));
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
                             bean.setMA_ID(data.getString("MA_ID"));
+                            bean.setMA_BOMVERSION(data.getString("MA_BOMVERSION"));
                             linecodeBeanList.add(bean);
                         }
                         ipAndlinecodePortAdapter.setmList(linecodeBeanList);
@@ -582,9 +646,10 @@ public class StorageRechargeListFragment extends BaseFragment{
                                     String pr_code = JsonUtils.optStringNotNull(dataObject, "PR_CODE");
                                     String pr_detail = JsonUtils.optStringNotNull(dataObject, "PR_DETAIL");
                                     String ma_id = JsonUtils.optStringNotNull(dataObject, "MA_ID");
+                                    String ma_bomversion = JsonUtils.optStringNotNull(dataObject, "MA_BOMVERSION");
                                     ce_work_code.setText(ma_id);
                                     tv_gonema_code.setText(ma_code);
-                                    tv_pr_code.setText(""+pr_code);
+                                    tv_pr_code.setText(""+ma_bomversion);
                                     tv_pr_detail.setText(""+pr_detail);
                                     tv_macode.setText(""+ma_code);
                                     at_station.clearFocus();
@@ -779,6 +844,7 @@ public class StorageRechargeListFragment extends BaseFragment{
             }
         });
     }
+    String ec_passqtytrim;
     String number ="";
     public void getNewSaveData(){
         if (tv_dc_emcode.getText().toString().trim().isEmpty()){
@@ -827,11 +893,20 @@ public class StorageRechargeListFragment extends BaseFragment{
             object_1.put("SR_REASON", input_AlonedaTwo);//原因
         }
 
+        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();
+            }
+        }
+
         object_1.put("SR_ID", "");
         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_LOCATION", "");//位号
         object_1.put("SR_SN","");//SN号
@@ -940,6 +1015,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                 ma_id = ipAndPortBeans.get(position).getMA_ID();
                 pr_code = ipAndPortBeans.get(position).getPR_CODE();
                 pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
+                ma_bomversion = ipAndPortBeans.get(position).getMA_BOMVERSION();
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -955,7 +1031,7 @@ public class StorageRechargeListFragment extends BaseFragment{
             public void onClick(View v) {
                 ce_work_code.setText(ma_id);
                 tv_gonema_code.setText(ma_code);
-                tv_pr_code.setText(""+pr_code);
+                tv_pr_code.setText(""+ma_bomversion);
                 tv_pr_detail.setText(""+pr_detail);
                 tv_macode.setText(""+ma_code);
                 at_station.clearFocus();
@@ -1621,7 +1697,145 @@ public class StorageRechargeListFragment 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);
+
+            }
+        }
+    }
 
 
     

app/src/main/java/com/uas/collection/util/CommonUtil.java

@@ -71,6 +71,7 @@ import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -902,7 +903,23 @@ public class CommonUtil {
         });
     }
 
+    /**
+     * 将时间戳转换成日期 yyyy-MM-dd
+     *
+     * @param
+     * @param
+     * @return
+     */
+
+    public static String timetodate(String time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(Long.valueOf(time));
+        SimpleDateFormat sf = new SimpleDateFormat("MM-dd - HH:mm");//这里的格式可换"yyyy年-MM月dd日-HH时mm分ss秒"等等格式
 
+        String date = sf.format(calendar.getTime());
+        return date;
+
+    }
     /**
      * 添加图片的toast
      *

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

@@ -61,6 +61,7 @@
                                     android:id="@+id/tv_dc_emcode"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="30dp"
+                                    android:inputType="number"
                                     android:hint="请输入人员编号" />
 
                                 <ImageView
@@ -146,6 +147,7 @@
                                 android:id="@+id/ce_work_code"
                                 style="@style/EditTextLineStyle"
                                 android:layout_height="30dp"
+                                android:inputType="number"
                                 android:hint="请输入工单流水" />
 
                             <ImageView

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

@@ -77,6 +77,7 @@
                                                         style="@style/EditTextLineStyle"
                                                         android:layout_height="24dp"
                                                         android:layout_marginLeft="23dp"
+                                                        android:inputType="number"
                                                         android:hint="请输入工单流水" />
 
                                                     <ImageView
@@ -247,6 +248,7 @@
                                                         style="@style/EditTextLineStyle"
                                                         android:layout_height="24dp"
                                                         android:layout_marginLeft="23dp"
+                                                        android:inputType="number"
                                                         android:hint="请输入人员编号" />
 
                                                     <ImageView

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

@@ -78,6 +78,7 @@
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="24dp"
                                             android:layout_marginLeft="23dp"
+                                            android:inputType="number"
                                             android:hint="请输入工单流水" />
 
                                         <ImageView
@@ -248,6 +249,7 @@
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="24dp"
                                             android:layout_marginLeft="23dp"
+                                            android:inputType="number"
                                             android:hint="请输入人员编号" />
 
                                         <ImageView
@@ -564,20 +566,8 @@
                 <com.bin.david.form.core.SmartTable
                     android:id="@+id/jlt_storage_in_filter_list_st"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"/>
-                <TextView
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:id="@+id/tv_save"
-                    android:layout_width="150dp"
-                    android:layout_height="50dp"
-                    android:text="提交"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:textSize="@dimen/textsize_20"
-                    android:background="@drawable/bg_button">
-                </TextView>
+                    android:layout_height="match_parent" />
+
 
             </LinearLayout>
 
@@ -586,7 +576,18 @@
 
 
     </LinearLayout>
-
+    <TextView
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/tv_save"
+        android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:text="提交"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:textSize="@dimen/textsize_20"
+        android:background="@drawable/bg_button">
+    </TextView>
 
     <!--            </android.support.v4.widget.NestedScrollView>-->
 

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

@@ -62,6 +62,7 @@
                                             android:id="@+id/ce_work_code"
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="30dp"
+                                            android:inputType="number"
                                             android:hint="请输入工单流水" />
 
                                         <ImageView
@@ -249,6 +250,7 @@
                                                 android:id="@+id/tv_dc_emcode"
                                                 style="@style/EditTextLineStyle"
                                                 android:layout_height="30dp"
+                                                android:inputType="number"
                                                 android:hint="请输入人员编号" />
 
                                             <ImageView
@@ -340,6 +342,17 @@
                                 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"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                            </android.support.v7.widget.RecyclerView>
 
                         </LinearLayout>
 
@@ -382,9 +395,18 @@
                         android:background="@drawable/bg_line_edittext"
                         android:visibility="gone">
                     </com.uas.collection.view.ClearableEditText>
+
+
+                    <TextView
+                        android:id="@+id/tv_gonema_code"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:visibility="gone">
+                    </TextView>
+
                     <TextView
                         android:id="@+id/tv_save"
-                        android:layout_marginTop="30dp"
+                        android:layout_marginTop="50dp"
                         android:layout_width="150dp"
                         android:layout_height="50dp"
                         android:text="提交"
@@ -393,15 +415,6 @@
                         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="match_parent"
-                        android:visibility="gone">
-                    </TextView>
-
-
                 </LinearLayout>
 
 

app/src/main/res/layout-large/recyclerview_master.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="@dimen/textsize_20"
+            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>

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

@@ -61,6 +61,7 @@
                                     android:id="@+id/tv_dc_emcode"
                                     style="@style/EditTextLineStyle"
                                     android:layout_height="30dp"
+                                    android:inputType="number"
                                     android:hint="请输入人员编号" />
 
                                 <ImageView
@@ -146,6 +147,7 @@
                                 android:id="@+id/ce_work_code"
                                 style="@style/EditTextLineStyle"
                                 android:layout_height="30dp"
+                                android:inputType="number"
                                 android:hint="请输入工单流水" />
 
                             <ImageView
@@ -262,8 +264,10 @@
         android:background="@drawable/bg_line_edittext">
     </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="100dp"
+        android:layout_width="150dp"
         android:layout_height="50dp"
         android:text="提交"
         android:layout_gravity="center"

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

@@ -77,6 +77,7 @@
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="24dp"
                                             android:layout_marginLeft="23dp"
+                                            android:inputType="number"
                                             android:hint="请输入工单流水" />
 
                                         <ImageView
@@ -247,6 +248,7 @@
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="24dp"
                                             android:layout_marginLeft="23dp"
+                                            android:inputType="number"
                                             android:hint="请输入人员编号" />
 
                                         <ImageView

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

@@ -78,6 +78,7 @@
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="24dp"
                                             android:layout_marginLeft="23dp"
+                                            android:inputType="number"
                                             android:hint="请输入工单流水" />
 
                                         <ImageView
@@ -248,6 +249,7 @@
                                             style="@style/EditTextLineStyle"
                                             android:layout_height="24dp"
                                             android:layout_marginLeft="23dp"
+                                            android:inputType="number"
                                             android:hint="请输入人员编号" />
 
                                         <ImageView
@@ -525,7 +527,7 @@
                             android:id="@+id/tv_undesirable"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="不良原因:"
+                            android:text="产量统计:"
                             android:layout_gravity="center"
                             android:textColor="@color/black">
                         </TextView>
@@ -564,20 +566,8 @@
                 <com.bin.david.form.core.SmartTable
                     android:id="@+id/jlt_storage_in_filter_list_st"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"/>
-                <TextView
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:id="@+id/tv_save"
-                    android:layout_width="150dp"
-                    android:layout_height="50dp"
-                    android:text="提交"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:textSize="@dimen/textsize_20"
-                    android:background="@drawable/bg_button">
-                </TextView>
+                    android:layout_height="match_parent" />
+
 
             </LinearLayout>
 
@@ -586,7 +576,18 @@
 
 
     </LinearLayout>
-
+    <TextView
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/tv_save"
+        android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:text="提交"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:textSize="@dimen/textsize_20"
+        android:background="@drawable/bg_button">
+    </TextView>
 
     <!--            </android.support.v4.widget.NestedScrollView>-->
 

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

@@ -5,404 +5,423 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
-        android:background="@color/white"
+    <!--    <android.support.design.widget.AppBarLayout-->
+    <!--        android:background="@color/white"-->
+    <!--        android:layout_width="match_parent"-->
+    <!--        android:layout_weight="1"-->
+    <!--        android:layout_height="match_parent">-->
+
+    <!--        <android.support.design.widget.CollapsingToolbarLayout-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="match_parent"-->
+    <!--            app:contentScrim="@color/colorPrimary"-->
+    <!--            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|exitUntilCollapsed">-->
+    <!--            <android.support.v4.widget.NestedScrollView-->
+    <!--                android:layout_width="match_parent"-->
+    <!--                android:layout_height="match_parent">-->
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_weight="1"
         android:layout_height="match_parent">
-
-        <android.support.design.widget.CollapsingToolbarLayout
+        <LinearLayout
+            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:contentScrim="@color/colorPrimary"
-            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|exitUntilCollapsed">
-            <android.support.v4.widget.NestedScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_marginLeft="5dp"
+                android:orientation="vertical"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2">
                 <LinearLayout
+                    android:layout_marginRight="5dp"
+                    android:layout_marginTop="@dimen/dp_10"
                     android:orientation="vertical"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="wrap_content">
+
                     <LinearLayout
-                        android:orientation="horizontal"
+                        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:layout_gravity="center"
+                            android:text="工单流水："
+                            android:textColor="@color/black">
+                        </TextView>
 
-                        <LinearLayout
-                            android:layout_marginLeft="5dp"
-                            android:orientation="vertical"
+                        <FrameLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="3">
-                            <LinearLayout
-                                android:layout_marginRight="5dp"
-                                android:layout_marginTop="@dimen/dp_10"
-                                android:orientation="vertical"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <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:layout_gravity="center"
-                                        android:text="工单流水："
-                                        android:textColor="@color/black">
-                                    </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: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:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
-                                    <LinearLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
-                                        <FrameLayout
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_weight="1">
-
-                                            <AutoCompleteTextView
-                                                android:id="@+id/tv_macode"
-                                                style="@style/EditTextLineStyle"
-                                                android:layout_height="30dp"
-                                                android:hint="" />
-
-                                            <ImageView
-                                                android:id="@+id/iv_macode_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: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: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:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
-                                    <LinearLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
-                                        <FrameLayout
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_weight="1">
-
-                                            <AutoCompleteTextView
-                                                android:id="@+id/tv_pr_code"
-                                                style="@style/EditTextLineStyle"
-                                                android:layout_height="30dp"
-                                                android:hint="" />
-
-                                            <ImageView
-                                                android:id="@+id/iv_pr_code_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: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:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="产品名称："
-                                        android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
-                                    <LinearLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
-                                        <FrameLayout
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_weight="1">
-
-                                            <AutoCompleteTextView
-                                                android:id="@+id/tv_pr_detail"
-                                                style="@style/EditTextLineStyle"
-                                                android:layout_height="30dp"
-                                                android:hint="" />
-
-                                            <ImageView
-                                                android:id="@+id/iv_detail_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: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:layout_width="match_parent"
-                                    android:layout_height="wrap_content">
-
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="人员编号："
-                                        android:layout_gravity="center"
-                                        android:textColor="@color/black">
-                                    </TextView>
-                                    <LinearLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content">
-                                        <FrameLayout
-                                            android:layout_width="0dp"
-                                            android:layout_height="wrap_content"
-                                            android:layout_weight="1">
-
-                                            <AutoCompleteTextView
-                                                android:id="@+id/tv_dc_emcode"
-                                                style="@style/EditTextLineStyle"
-                                                android:layout_height="30dp"
-                                                android:hint="请输入人员编号" />
-
-                                            <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: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:text="不良归属："
-                                        android:textColor="@color/black">
-                                    </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="请输入不良归属" />
-
-                                        <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>
-
-                            <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"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-                            </android.support.v7.widget.RecyclerView>
-                            <TextView
+                            android:layout_weight="1">
+
+                            <AutoCompleteTextView
+                                android:id="@+id/ce_work_code"
+                                style="@style/EditTextLineStyle"
+                                android:layout_height="30dp"
+                                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="left"
-                                android:text="不良原因">
-                            </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>
+                                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:layout_gravity="center"
+                            android:textColor="@color/black">
+                        </TextView>
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <FrameLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/tv_macode"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:focusable="false"
+                                    android:hint="" />
+
+                                <ImageView
+                                    android:id="@+id/iv_macode_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: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: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:layout_gravity="center"
+                            android:textColor="@color/black">
+                        </TextView>
                         <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="0.8"
-                            android:layout_marginLeft="@dimen/textsize_20"
-                            android:layout_marginRight="@dimen/textsize_20">
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <FrameLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/tv_pr_code"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:focusable="false"
+                                    android:hint="" />
+
+                                <ImageView
+                                    android:id="@+id/iv_pr_code_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_personnel_data"
-                                android:layout_width="match_parent"
-                                android:layout_height="200dp"
-                                android:scaleType="fitXY"
-                                android:background="@drawable/bg_imageview_rauide">
-                            </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>
 
-                        <com.bin.david.form.core.SmartTable
-                            android:id="@+id/jlt_storage_in_filter_list_st"
-                            android:layout_width="0dp"
-                            android:layout_weight="1.5"
-                            android:layout_height="match_parent" />
+
+                    <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:layout_gravity="center"
+                            android:textColor="@color/black">
+                        </TextView>
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <FrameLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/tv_pr_detail"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:focusable="false"
+                                    android:hint="" />
+
+                                <ImageView
+                                    android:id="@+id/iv_detail_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: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>
 
-                    <com.uas.collection.view.ClearableEditText
-                        android:id="@+id/tv_hintshow"
+
+                    <LinearLayout
+                        android:layout_marginTop="5dp"
                         android:layout_width="match_parent"
-                        android:layout_height="150dp"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginTop="10dp"
-                        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:id="@+id/tv_save"
-                        android:layout_marginTop="30dp"
-                        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_height="wrap_content">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="人员编号："
+                            android:layout_gravity="center"
+                            android:textColor="@color/black">
+                        </TextView>
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <FrameLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1">
+
+                                <AutoCompleteTextView
+                                    android:id="@+id/tv_dc_emcode"
+                                    style="@style/EditTextLineStyle"
+                                    android:layout_height="30dp"
+                                    android:inputType="number"
+                                    android:hint="请输入人员编号" />
+
+                                <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:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:visibility="gone">
-                    </TextView>
+                        android:layout_height="wrap_content">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="不良归属："
+                            android:textColor="@color/black">
+                        </TextView>
 
+                        <FrameLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
 
-                </LinearLayout>
+                            <AutoCompleteTextView
+                                android:id="@+id/at_station"
+                                style="@style/EditTextLineStyle"
+                                android:layout_height="30dp"
+                                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>
 
 
-            </android.support.v4.widget.NestedScrollView>
+                </LinearLayout>
 
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+                <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"
+                    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"
+                    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"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                </android.support.v7.widget.RecyclerView>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                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_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>
+
+            <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_height="match_parent" />
+        </LinearLayout>
+
+        <com.uas.collection.view.ClearableEditText
+            android:id="@+id/tv_hintshow"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="10dp"
+            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:id="@+id/tv_gonema_code"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+        </TextView>
+
+        <TextView
+            android:id="@+id/tv_save"
+            android:layout_marginTop="50dp"
+            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>
+    </LinearLayout>
+
+
+    <!--            </android.support.v4.widget.NestedScrollView>-->
+
+    <!--        </android.support.design.widget.CollapsingToolbarLayout>-->
+    <!--    </android.support.design.widget.AppBarLayout>-->
 
 
 </LinearLayout>

app/src/main/res/layout/recyclerview_master.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="@dimen/textsize_20"
+            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>