UI修改显示，数据采集界面增加原件位号三个列表、保存逻辑修改

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

@@ -21,6 +21,7 @@ import com.uas.collection.fragment.StorageRechargeListFragment;
 import com.uas.collection.global.GloableParams;
 import com.uas.collection.interfaces.BackHandlerInterface;
 import com.uas.collection.tools.DataSourceManager;
+import com.uas.collection.tools.SharedPreUtil;
 import com.uas.collection.util.CameraUtil;
 import com.uas.collection.util.Constants;
 
@@ -40,6 +41,8 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
     public static final String TAG_SCMAKE_FEEDER = "pfmakeFragment";
     private String sc_code;
     private String ma_code;
+    private String em_name;
+    private TextView tv_person;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -58,11 +61,12 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
         mDeleteImageView = (ImageView) findViewById(R.id.btn_actionbar_delete_icon_iv);
 
         actionBarTextView = (TextView) findViewById(R.id.tv_actionbar_withback);
+        tv_person = (TextView) findViewById(R.id.tv_person);
         mActionBarLayout = (RelativeLayout) findViewById(R.id.include_menuactionbar);
-
+        em_name = SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMNAME, null);
         //添加监听事件
         btnBack.setOnClickListener(this);
-
+        tv_person.setText("("+em_name+")");
         //获取用户选择的功能名称
         Intent intent = getIntent();
         String funName = intent.getStringExtra(DataSourceManager.KEY_GRID_ITEMNAME);

app/src/main/java/com/uas/collection/activity/HomeActivity.java

@@ -20,8 +20,10 @@ import com.uas.collection.application.PdaApplication;
 import com.uas.collection.fragment.BaseFragment;
 import com.uas.collection.global.GloableParams;
 import com.uas.collection.tools.DataSourceManager;
+import com.uas.collection.tools.SharedPreUtil;
 import com.uas.collection.tools.VolleyUtil;
 import com.uas.collection.util.CommonUtil;
+import com.uas.collection.util.Constants;
 import com.uas.collection.util.PermissionUtil;
 
 import java.util.ArrayList;
@@ -35,6 +37,8 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
     private PopupWindow mExitPopupWindow;
     private TextView mCancelTextView, mMinimizeTextView, mExitTextView;
     public BaseFragment fragment;
+    private String em_name;
+
     @Override
     protected void onDestroy() {
         //清除全部App缓存
@@ -54,7 +58,8 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
         setContentView(R.layout.activity_home);
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
-        actionbarTextVeiw.setText("数据采集");
+        em_name = SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMNAME, null);
+        actionbarTextVeiw.setText("数据采集"+"("+em_name+")");
         menuGridView.setNumColumns(3);
         gridItemList = DataSourceManager.getDataSourceManager().getHomeGridItemList();
         SimpleAdapter adapter = new SimpleAdapter(this, gridItemList, R.layout.item_grid,

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

@@ -87,15 +87,12 @@ public class BreakdownRepairFragment extends BaseFragment{
     private MyArrayAdapter<String> mAutoStringAdapter;
     private ImageView iv_work_code;
     private ImageView iv_station;
-    private TextView tv_length;
-    private ClearableEditText ce_length;
-    private ClearableEditText ce_product_bar_code;
     private ImageView iv_popuwindow;
     private IpAndResourcesPortAdapter ipAndResourcesPortAdapter;
     private String ma_code;
     private String sc_code;
     private ImageView iv_resources;
-    private ClearableEditText tv_dc_emcode;
+    private AutoCompleteTextView tv_dc_emcode;
     private StringRequest mStringRequest;
     private ImageView iv_personnel_data;
     private int mFocusId;
@@ -114,6 +111,7 @@ public class BreakdownRepairFragment extends BaseFragment{
     private List<String> stringList;
     private String sc_name;
     private RecyclerView rv_line_ip_port_data;
+    private ImageView iv_dc_emcode_delete;
 
 
     @Override
@@ -135,9 +133,6 @@ public class BreakdownRepairFragment extends BaseFragment{
         tv_save = root.findViewById(R.id.tv_save);
         iv_work_code = root.findViewById(R.id.iv_work_code);
         iv_station = root.findViewById(R.id.iv_station);
-        tv_length = root.findViewById(R.id.tv_length);
-        ce_length = root.findViewById(R.id.ce_length);
-        ce_product_bar_code = root.findViewById(R.id.ce_product_bar_code);
         iv_popuwindow = root.findViewById(R.id.iv_popuwindow);
         iv_resources = root.findViewById(R.id.iv_resources);
         tv_dc_emcode = root.findViewById(R.id.tv_dc_emcode);
@@ -149,6 +144,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         tv_pr_code = root.findViewById(R.id.tv_pr_code);
         tv_pr_detail = root.findViewById(R.id.tv_pr_detail);
         tv_hintshow = root.findViewById(R.id.tv_hintshow);
+        iv_dc_emcode_delete = root.findViewById(R.id.iv_dc_emcode_delete);
 //        ce_length.setEnabled(false);
 //        ce_length.setFocusable(false);
 //        ce_length.setKeyListener(null);//重点
@@ -209,11 +205,12 @@ public class BreakdownRepairFragment extends BaseFragment{
         iv_work_code.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                ce_work_code.setFocusableInTouchMode(true);
                 ce_work_code.setText("");
                 ce_work_code.requestFocus();
-                tv_pr_code.setText("产品编号");
+                tv_pr_code.setText("产品代码");
                 tv_pr_detail.setText("产品名称");
-                tv_macode.setText("工单号");
+                tv_macode.setText("计划单号");
 
 
             }
@@ -285,27 +282,11 @@ public class BreakdownRepairFragment extends BaseFragment{
 //                }
 //            }
 //        });
-        ce_length.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) {
-                tv_length.setText(ce_length.getText().toString().trim());
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-
-            }
-        });
-
 
         iv_station.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                at_station.setFocusableInTouchMode(true);
                 at_station.setText("");
                 at_station.requestFocus();
             }
@@ -318,24 +299,29 @@ public class BreakdownRepairFragment extends BaseFragment{
         });
 
 
-        /**----------------------------条码号------------------------------------**/
-        ce_product_bar_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+
+
+        /**----------------------------人员编号------------------------------------**/
+        tv_dc_emcode.addTextChangedListener(new TextWatcher() {
             @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)) {
-                    String va_code = ce_product_bar_code.getText().toString().trim();
-                    getNewSNData(va_code);
-                    return true;
-                }
-                return false;
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
             }
-        });
 
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-        /**----------------------------人员编号------------------------------------**/
+            }
 
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s == null || s.length() == 0) {
+                    iv_dc_emcode_delete.setVisibility(View.GONE);
+                } else {
+                    iv_dc_emcode_delete.setVisibility(View.VISIBLE);
+                }
+            }
+        });
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -368,6 +354,14 @@ public class BreakdownRepairFragment extends BaseFragment{
                 }
             }
         });
+        iv_dc_emcode_delete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                tv_dc_emcode.setFilterTouchesWhenObscured(true);
+                tv_dc_emcode.setText("");
+                tv_dc_emcode.requestFocus();
+            }
+        });
         stringList = new ArrayList<>();
         //保存
         tv_save.setOnClickListener(new View.OnClickListener() {
@@ -411,6 +405,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                                     at_station.clearFocus();
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.clearFocus();
+                                    tv_dc_emcode.setFocusable(false);
                                 }
 
                             }
@@ -482,12 +477,13 @@ public class BreakdownRepairFragment extends BaseFragment{
                                     String ma_id = JsonUtils.optStringNotNull(dataObject, "MA_ID");
                                     ce_work_code.setText(ma_id);
                                     tv_gonema_code.setText(ma_code);
-                                    tv_pr_code.setText("产品编号  "+pr_code);
+                                    tv_pr_code.setText("产品代码  "+pr_code);
                                     tv_pr_detail.setText("产品名称  "+pr_detail);
-                                    tv_macode.setText("工单号  "+ma_code);
+                                    tv_macode.setText("计划单号  "+ma_code);
                                     at_station.clearFocus();
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.requestFocus();
+                                    ce_work_code.setFocusable(false);
                                 }
                             }
                         }
@@ -572,6 +568,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                                     at_station.clearFocus();
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.clearFocus();
+                                    at_station.setFocusable(false);
                                 }
                             }
                         }
@@ -592,13 +589,7 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
 
     public void getNewSNData(String va_code){
-        if (ce_length.getText().toString().trim().isEmpty()){
-            ce_length.setText("0");
-        }
-        if (ce_product_bar_code.getText().toString().trim().length() != Integer.parseInt(ce_length.getText().toString().trim())) {
-            CommonUtil.toastNoRepeat(mActivity, "产品长度和产品条码长度不符");
-            return;
-        }
+
         if (tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
@@ -689,8 +680,7 @@ public class BreakdownRepairFragment extends BaseFragment{
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastYESRepeat(mActivity, "条码号请求成功");
-                int length = ce_product_bar_code.getText().toString().trim().length();
-                ce_length.setText(length+"");
+
 
             }
 
@@ -704,13 +694,6 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
     String number ="";
     public void getNewSaveData(){
-        if (ce_length.getText().toString().trim().isEmpty()){
-            ce_length.setText("0");
-        }
-        if (ce_product_bar_code.getText().toString().trim().length() != Integer.parseInt(ce_length.getText().toString().trim())) {
-            CommonUtil.toastNoRepeat(mActivity, "产品长度和产品条码长度不符");
-            return;
-        }
         if (tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
@@ -741,7 +724,7 @@ public class BreakdownRepairFragment extends BaseFragment{
 
         ArrayList<StorageRechargeAloneBean> selectedItemtwo = myAdaptertwo.getSelectedItem();
         if (selectedItemtwo.size() == 0){
-            object_1.put("SR_BADLOCATIONREMARK", null);//不良位号
+            CommonUtil.toastNoRepeat(mActivity, "请选择不良位号");//不良位号
         }else {
             for (int i=0;i<selectedItemtwo.size();i++){
                 String alonedata = selectedItemtwo.get(i).getAlonedata();
@@ -749,6 +732,11 @@ public class BreakdownRepairFragment extends BaseFragment{
                     alonedatatwo=selectedItemtwo.get(i).getInputce();
                     if (StringUtil.isEmpty(alonedatatwo)){
                         object_1.put("SR_BADLOCATIONREMARK", null);//不良位号
+                    }else {
+                        if (alonedatatwo.equals("0")){
+                            CommonUtil.toastNoRepeat(mActivity, "不良位号不可为0");
+                            return;
+                        }
                     }
 
                 }else {
@@ -757,6 +745,10 @@ public class BreakdownRepairFragment extends BaseFragment{
                     }else {
                         Qtycetwo=selectedItemtwo.get(i).getQtyce();
                     }
+                    if (Qtycetwo.equals("0")){
+                        CommonUtil.toastNoRepeat(mActivity, "不良位号不可为0");
+                        return;
+                    }
                     alonedatatwo = selectedItemtwo.get(i).getAlonedata()+""+Qtycetwo;
                     object_1.put("SR_LOCATION", alonedatatwo);
                 }
@@ -793,7 +785,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         object_1.put("SR_PASSQTY", "0");//通过数量
         object_1.put("SR_NGQTY", "1");//NG数量
         object_1.put("SR_TYPE", "性能维修");//种类(数据采集/、外观维修/性能维修)
-        object_1.put("SR_SN", ce_product_bar_code.getText().toString().trim());//SN号
+        object_1.put("SR_SN", "");//SN号
         object_1.put("SR_REMARK", "");//备注/其他
         object_1.put("SR_INMAN", "");//录入人
         object_1.put("SR_INDATE", "");//录入时间
@@ -813,9 +805,6 @@ public class BreakdownRepairFragment extends BaseFragment{
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastYESRepeat(mActivity, "保存成功");
-                if (!StringUtil.isEmpty(ce_product_bar_code.getText().toString().trim())){
-                    stringList.add("("+ce_product_bar_code.getText().toString().trim()+")-");
-                }
                 if (!StringUtil.isEmpty(finalInput_Aloneda)){
                     stringList.add(finalInput_Aloneda+"-");
                 }
@@ -838,9 +827,6 @@ public class BreakdownRepairFragment extends BaseFragment{
 
                 tv_hintshow.setText(number);
                 number="";
-                ce_product_bar_code.setText("");
-                ce_length.clearFocus();
-                ce_product_bar_code.clearFocus();
                 setAdapterone(mFeededListone);
                 setAdaptertwo(mFeededListtwo);
                 setAdapterthree(mFeededListthree);
@@ -1101,15 +1087,19 @@ public class BreakdownRepairFragment extends BaseFragment{
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (StringUtil.isEmpty(ma_id)){
+                    CommonUtil.toastNoRepeat(mActivity,"请选择工单流水");
+                    return;
+                }
                 ce_work_code.setText(ma_id);
                 tv_gonema_code.setText(ma_code);
-                tv_pr_code.setText("产品编号  "+pr_code);
+                tv_pr_code.setText("产品代码  "+pr_code);
                 tv_pr_detail.setText("产品名称  "+pr_detail);
-                tv_macode.setText("工单号  "+ma_code);
+                tv_macode.setText("计划单号  "+ma_code);
                 at_station.clearFocus();
                 ce_work_code.clearFocus();
                 tv_dc_emcode.requestFocus();
-
+                ce_work_code.setFocusable(false);
                 closeListPopupWindow();
             }
         });
@@ -1175,11 +1165,11 @@ public class BreakdownRepairFragment extends BaseFragment{
     }
     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("包装测试");
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
@@ -1280,6 +1270,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                 at_station.clearFocus();
                 ce_work_code.clearFocus();
                 tv_dc_emcode.clearFocus();
+                at_station.setFocusable(false);
                 closeListPopupWindow();
             }
         });

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

@@ -3,8 +3,10 @@ package com.uas.collection.fragment;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -19,6 +21,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AutoCompleteTextView;
 import android.widget.CheckBox;
@@ -33,6 +36,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
+import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
+import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
+import com.bin.david.form.data.table.TableData;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
@@ -41,6 +51,7 @@ import com.uas.collection.activity.FunctionActivity;
 import com.uas.collection.bean.LinecodeBean;
 import com.uas.collection.bean.ResourcesBean;
 import com.uas.collection.bean.StorageRechargeAloneBean;
+import com.uas.collection.bean.TestcollectDataBean;
 import com.uas.collection.camera.CaptureActivity;
 import com.uas.collection.global.GloableParams;
 import com.uas.collection.tools.SharedPreUtil;
@@ -62,6 +73,7 @@ import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,15 +94,12 @@ public class StorageRechargeListFragment extends BaseFragment{
     private ImageView iv_work_code,iv_station;
     private TextView tv_save;
     private MyArrayAdapter<String> mAutoStringAdapter;
-    private AutoCompleteTextView ce_length;
-    private TextView tv_length;
-    private ClearableEditText ce_product_bar_code;
     private ImageView iv_popuwindow;
     private String ma_code;
     private ImageView iv_resources;
     private IpAndResourcesPortAdapter ipAndResourcesPortAdapter;
     private String sc_code;
-    private ClearableEditText tv_dc_emcode;
+    private AutoCompleteTextView tv_dc_emcode;
     private StringRequest mStringRequest;
     private ImageView iv_personnel_data;
     private ImageView iv_dc_emcode;
@@ -111,6 +120,12 @@ public class StorageRechargeListFragment extends BaseFragment{
     private ClearableEditText tv_hintshow;
     private List<String> stringList;
     private RecyclerView rv_line_ip_port_data;
+    private ImageView iv_dc_emcode_delete;
+    private SmartTable mSmartTable;
+    private TableData<TestcollectDataBean> mTableData;
+    private List<TestcollectDataBean> mFilterStorageInBeans;
+    private Column<String> va_classColumn,va_sr_reasonColumn;
+    private List<TestcollectDataBean> listSama;
 
     @Override
     protected int getLayout() {
@@ -133,9 +148,6 @@ public class StorageRechargeListFragment extends BaseFragment{
         iv_work_code = root.findViewById(R.id.iv_work_code);
         iv_station = root.findViewById(R.id.iv_station);
         tv_save = root.findViewById(R.id.tv_save);
-        ce_length = root.findViewById(R.id.ce_length);
-        tv_length = root.findViewById(R.id.tv_length);
-        ce_product_bar_code = root.findViewById(R.id.ce_product_bar_code);
         iv_popuwindow = root.findViewById(R.id.iv_popuwindow);
         iv_resources = root.findViewById(R.id.iv_resources);
         tv_dc_emcode = root.findViewById(R.id.tv_dc_emcode);
@@ -147,8 +159,10 @@ public class StorageRechargeListFragment extends BaseFragment{
         tv_pr_code = root.findViewById(R.id.tv_pr_code);
         tv_pr_detail = root.findViewById(R.id.tv_pr_detail);
         tv_hintshow = root.findViewById(R.id.tv_hintshow);
+        iv_dc_emcode_delete = root.findViewById(R.id.iv_dc_emcode_delete);
+        mSmartTable = root.findViewById(R.id.jlt_storage_in_filter_list_st);
 
-
+        mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
 //        ce_length.setEnabled(false);
 //        ce_length.setFocusable(false);
 //        ce_length.setKeyListener(null);//重点
@@ -233,11 +247,13 @@ public class StorageRechargeListFragment extends BaseFragment{
         iv_work_code.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                ce_work_code.setFocusableInTouchMode(true);
                 ce_work_code.setText("");
                 ce_work_code.requestFocus();
-                tv_pr_code.setText("产品编号");
+                tv_pr_code.setText("产品代码");
                 tv_pr_detail.setText("产品名称");
-                tv_macode.setText("工单号");
+                tv_macode.setText("计划单号");
+
             }
         });
 
@@ -312,30 +328,6 @@ public class StorageRechargeListFragment extends BaseFragment{
 //            }
 //        });
 
-        ce_length.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) {
-//                if (ce_length.getText().toString().trim().length()>ce_product_bar_code.getText().toString().trim().length()
-//                        ||ce_length.getText().toString().trim().length()<ce_product_bar_code.getText().toString().trim().length()){
-//                int length = ce_product_bar_code.getText().toString().trim().length();
-
-//                }
-//                if (ce_length.getText().toString().trim().isEmpty()){
-//                    ce_length.setText(ce_product_bar_code.getText().toString().trim().length()+"");
-//                }
-                tv_length.setText(ce_length.getText().toString().trim());
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-
-            }
-        });
 
 
         iv_station.setOnClickListener(new View.OnClickListener() {
@@ -343,6 +335,7 @@ public class StorageRechargeListFragment extends BaseFragment{
             public void onClick(View v) {
                 at_station.setText("");
                 at_station.requestFocus();
+                at_station.setFocusableInTouchMode(true);
             }
         });
 
@@ -355,22 +348,27 @@ public class StorageRechargeListFragment extends BaseFragment{
         });
 
 
-        /**----------------------------条码号------------------------------------**/
-        ce_product_bar_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+        /**----------------------------人员编号------------------------------------**/
+        tv_dc_emcode.addTextChangedListener(new TextWatcher() {
             @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)) {
-                    String va_code = ce_product_bar_code.getText().toString().trim();
-                    getNewSNData(va_code);
-                    return true;
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s == null || s.length() == 0) {
+                    iv_dc_emcode_delete.setVisibility(View.GONE);
+                } else {
+                    iv_dc_emcode_delete.setVisibility(View.VISIBLE);
                 }
-                return false;
             }
         });
-        /**----------------------------人员编号------------------------------------**/
-
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -385,6 +383,14 @@ public class StorageRechargeListFragment extends BaseFragment{
             }
         });
 
+        iv_dc_emcode_delete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                tv_dc_emcode.setText("");
+                tv_dc_emcode.requestFocus();
+                tv_dc_emcode.setFocusableInTouchMode(true);
+            }
+        });
         iv_dc_emcode.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -420,7 +426,53 @@ public class StorageRechargeListFragment extends BaseFragment{
         sc_codecolletwo = SharedPreUtil.getString(mActivity, "sc_codecolletwo", null);
         at_station.setText(sc_codecolletwo);
 //        getfuzzySearchSourceData(sc_codecolletwo,"");
+        listSama = new ArrayList<>();
+        WindowManager wm = mActivity.getWindowManager();
+        int screenWith = wm.getDefaultDisplay().getWidth()/5;
+        mSmartTable.getConfig().setMinTableWidth(screenWith)
+                .setShowXSequence(false)
+                .setShowYSequence(false)
+                .setShowTableTitle(false)
+                .setFixedTitle(true)
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity, 15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
+        va_classColumn = new Column<String>("现象", "SR_BADNAME");
+        va_sr_reasonColumn = new Column<String>("原因", "SR_REASON");
+    }
 
+    public void addDataSamart(String sr_badname,String sr_reason){
+        TestcollectDataBean jltStorageInBean = new TestcollectDataBean();
+        jltStorageInBean.setSR_BADNAME(sr_badname);
+        jltStorageInBean.setSR_REASON(sr_reason);;
+        listSama.add(jltStorageInBean);
+        mFilterStorageInBeans = listSama;//PI_INOUTNO
+        setFilterTableData(mFilterStorageInBeans);
+    }
+
+    private void setFilterTableData(List<TestcollectDataBean> filterTableData) {
+        mTableData = new TableData<TestcollectDataBean>("收料单列表", filterTableData,
+                va_classColumn,va_sr_reasonColumn);
+        mSmartTable.setTableData(mTableData);
+//        mSmartTable.requestLayout();
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
 
     }
     public void getOrImage(String em_code){
@@ -452,6 +504,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                                     at_station.clearFocus();
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.clearFocus();
+                                    tv_dc_emcode.setFocusable(false);
                                 }
 
                             }
@@ -521,12 +574,13 @@ public class StorageRechargeListFragment extends BaseFragment{
                                     String ma_id = JsonUtils.optStringNotNull(dataObject, "MA_ID");
                                     ce_work_code.setText(ma_id);
                                     tv_gonema_code.setText(ma_code);
-                                    tv_pr_code.setText("产品编号  "+pr_code);
+                                    tv_pr_code.setText("产品代码  "+pr_code);
                                     tv_pr_detail.setText("产品名称  "+pr_detail);
-                                    tv_macode.setText("工单号  "+ma_code);
+                                    tv_macode.setText("计划单号  "+ma_code);
                                     at_station.clearFocus();
                                     ce_work_code.clearFocus();
                                     tv_dc_emcode.requestFocus();
+                                    ce_work_code.setFocusable(false);
 
                                 }
                             }
@@ -653,13 +707,6 @@ public class StorageRechargeListFragment extends BaseFragment{
 
 
     public void getNewSNData(String va_code){
-        if (ce_length.getText().toString().trim().isEmpty()){
-            ce_length.setText("0");
-        }
-        if (ce_product_bar_code.getText().toString().trim().length() != Integer.parseInt(ce_length.getText().toString().trim())) {
-            CommonUtil.toastNoRepeat(mActivity, "产品长度和产品条码长度不符");
-            return;
-        }
         if (tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
@@ -696,7 +743,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         object_1.put("SR_TYPE", "外观维修");//种类(数据采集/、外观维修/性能维修)
         object_1.put("SR_LOCATION", "");//位号
         object_1.put("SR_REASNO", "");//原因
-        object_1.put("SR_SN",ce_product_bar_code.getText().toString().trim());//SN号
+        object_1.put("SR_SN","");//SN号
         object_1.put("SR_REMARK", "");//备注/其他
         object_1.put("SR_INMAN", "");//录入人
         object_1.put("SR_INDATE", "");//录入时间
@@ -712,8 +759,6 @@ public class StorageRechargeListFragment extends BaseFragment{
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastYESRepeat(mActivity, "条码号请求成功");
-                int length = ce_product_bar_code.getText().toString().trim().length();
-                ce_length.setText(length+"");
             }
 
             @Override
@@ -726,14 +771,6 @@ public class StorageRechargeListFragment extends BaseFragment{
     }
     String number ="";
     public void getNewSaveData(){
-
-        if (ce_length.getText().toString().trim().isEmpty()){
-            ce_length.setText("0");
-        }
-        if (ce_product_bar_code.getText().toString().trim().length() != Integer.parseInt(ce_length.getText().toString().trim())) {
-            CommonUtil.toastNoRepeat(mActivity, "产品长度和产品条码长度不符");
-            return;
-        }
         if (tv_dc_emcode.getText().toString().trim().isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "请采集人员编号");
             return;
@@ -752,7 +789,8 @@ public class StorageRechargeListFragment extends BaseFragment{
         String at_stationtrim = at_station.getText().toString().trim();
         ArrayList<StorageRechargeAloneBean> selectedItem = myAdapter.getSelectedItem();
         if (selectedItem.size()==0){
-            object_1.put("SR_BADNAMEREMARK",null);//不良现象
+            CommonUtil.toastNoRepeat(mActivity, "请选择不良现象");
+            return;
         }else {
             for (int i=0;i<selectedItem.size();i++){
                 String alonedata = selectedItem.get(i).getAlonedata();
@@ -770,7 +808,8 @@ public class StorageRechargeListFragment extends BaseFragment{
         }
         ArrayList<StorageRechargeAloneBean> selectedItemtwo = myAdaptertwo.getSelectedItem();
         if (selectedItemtwo.size()==0){
-            object_1.put("SR_REASON", null);//原因
+            CommonUtil.toastNoRepeat(mActivity, "请选择不良原因");//原因
+            return;
         }else {
             for (int i=0;i<selectedItemtwo.size();i++){
                 input_AlonedaTwo = selectedItemtwo.get(i).getAlonedata();
@@ -785,7 +824,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         object_1.put("SR_NGQTY", "1");//NG数量
         object_1.put("SR_TYPE", "外观维修");//种类(数据采集/、外观维修/性能维修)
         object_1.put("SR_LOCATION", "");//位号
-        object_1.put("SR_SN",ce_product_bar_code.getText().toString().trim());//SN号
+        object_1.put("SR_SN","");//SN号
         object_1.put("SR_REMARK", "");//备注/其他
         object_1.put("SR_INMAN", "");//录入人
         object_1.put("SR_INDATE", "");//录入时间
@@ -808,9 +847,6 @@ public class StorageRechargeListFragment extends BaseFragment{
 //                tv_hintshow.setText("不良现象："+ finalInput_Aloneda +"     不良原因："+ finalInput_AlonedaTwo);
 
                 CommonUtil.toastYESRepeat(mActivity, "保存成功");
-                if (!StringUtil.isEmpty(ce_product_bar_code.getText().toString().trim())){
-                    stringList.add("("+ce_product_bar_code.getText().toString().trim()+")-");
-                }
                 if (!StringUtil.isEmpty(finalInput_Aloneda)){
                     stringList.add(finalInput_Aloneda+"-");
                 }
@@ -820,7 +856,7 @@ public class StorageRechargeListFragment extends BaseFragment{
 //                if (!finalInput_AlonedaTwo.isEmpty()){
 //                    stringList.add(finalInput_Aloneda+"\n");
 //                }
-
+                addDataSamart(finalInput_Aloneda,finalInput_AlonedaTwo);
 
                 for (int i=0;i<stringList.size();i++){
                     String s = stringList.get(i);
@@ -829,9 +865,6 @@ public class StorageRechargeListFragment extends BaseFragment{
 
                 tv_hintshow.setText(number);
                 number="";
-                ce_product_bar_code.setText("");
-                ce_length.clearFocus();
-                ce_product_bar_code.clearFocus();
                 setAdapter(mFeededList);
                 setAdaptertwo(mFeededListtwo);
             }
@@ -912,12 +945,13 @@ 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("产品代码  "+pr_code);
                 tv_pr_detail.setText("产品名称  "+pr_detail);
-                tv_macode.setText("工单号  "+ma_code);
+                tv_macode.setText("计划单号  "+ma_code);
                 at_station.clearFocus();
                 ce_work_code.clearFocus();
                 tv_dc_emcode.requestFocus();
+                ce_work_code.setFocusable(false);
                 closeListPopupWindow();
             }
         });
@@ -983,9 +1017,6 @@ public class StorageRechargeListFragment extends BaseFragment{
     }
     private void getlineDataList(){
         List<String> linelist=new ArrayList<>();
-        linelist.add("炉前目检");
-        linelist.add("检焊目检");
-        linelist.add("组装测试");
         linelist.add("组装外观目检");
         linelist.add("包装外观目检");
         JSONObject jsonObject = new JSONObject();
@@ -1082,13 +1113,17 @@ public class StorageRechargeListFragment extends BaseFragment{
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (!StringUtil.isEmpty(sc_code)){
+                    SharedPreUtil.saveString(mActivity,"sc_codecolletwo",sc_code);
+                }else {
+                    CommonUtil.toastNoRepeat(mActivity,"请选择不良归属");
+                    return;
+                }
                 at_station.setText(sc_code);
                 at_station.clearFocus();
                 ce_work_code.clearFocus();
                 tv_dc_emcode.clearFocus();
-                if (!StringUtil.isEmpty(sc_code)){
-                    SharedPreUtil.saveString(mActivity,"sc_codecolletwo",sc_code);
-                }
+                at_station.setFocusable(false);
                 closeListPopupWindow();
             }
         });

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

@@ -8,14 +8,26 @@
 
     <RelativeLayout
         android:id="@+id/rl_actionbar"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true">
 
         <TextView
             android:id="@+id/tv_actionbar_withback"
             style="@style/ActionBarTextView"
-            android:layout_width="wrap_content" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="" />
+        <TextView
+            android:id="@+id/tv_person"
+            style="@style/ActionBarTextView"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/tv_actionbar_withback"
+            android:gravity="center"
+            android:layout_centerHorizontal="true"
+            android:text=""/>
         <!--<com.uas.uaspda.customview.ClearableEditText
             android:id="@+id/et_actionbar_withback"
             style="@style/ActionBarEditText"/>-->

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

@@ -17,13 +17,6 @@
                 android:layout_width="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_height="wrap_content">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="人员照片"
-                    android:layout_gravity="center"
-                    android:gravity="center">
-                </TextView>
                 <ImageView
                     android:id="@+id/iv_personnel_data"
                     android:layout_width="100dp"
@@ -59,17 +52,26 @@
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
-                            <com.uas.collection.view.ClearableEditText
-                                android:id="@+id/tv_dc_emcode"
-                                style="@style/EditTextLineStyle"
-                                android:text=""
-                                android:hint="请输入人员编号"
-                                android:layout_width="match_parent"
-                                android:layout_height="30dp"
-                                android:layout_weight="1"
-                                android:textColor="@color/black"
-                                />
+                            <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"
@@ -77,10 +79,10 @@
                                 android:layout_gravity="center"
                                 android:layout_marginRight="10dp"
                                 android:layout_marginLeft="5dp"
-                                android:clickable="false"
-                                android:src="@drawable/ic_edittext_scan" />
+                                android:clickable="false" />
                         </LinearLayout>
                     </LinearLayout>
+
                     <LinearLayout
                         android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="0dp"
@@ -90,7 +92,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:text="工单号：">
+                            android:text="不良归属：">
                         </TextView>
 
                         <FrameLayout
@@ -99,13 +101,13 @@
                             android:layout_weight="1">
 
                             <AutoCompleteTextView
-                                android:id="@+id/ce_work_code"
+                                android:id="@+id/at_station"
                                 style="@style/EditTextLineStyle"
                                 android:layout_height="30dp"
-                                android:hint="请输入工单号" />
+                                android:hint="请输入不良归属" />
 
                             <ImageView
-                                android:id="@+id/iv_work_code"
+                                android:id="@+id/iv_station"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center|right"
@@ -114,8 +116,8 @@
                                 android:visibility="gone" />
                         </FrameLayout>
                         <ImageView
+                            android:id="@+id/iv_resources"
                             android:layout_gravity="center"
-                            android:id="@+id/iv_popuwindow"
                             android:layout_width="30dp"
                             android:layout_height="match_parent"
                             android:layout_marginRight="10dp"
@@ -132,7 +134,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:text="岗位资源：">
+                            android:text="工单流水：">
                         </TextView>
 
                         <FrameLayout
@@ -141,13 +143,13 @@
                             android:layout_weight="1">
 
                             <AutoCompleteTextView
-                                android:id="@+id/at_station"
+                                android:id="@+id/ce_work_code"
                                 style="@style/EditTextLineStyle"
                                 android:layout_height="30dp"
-                                android:hint="请输入岗位资源" />
+                                android:hint="请输入工单流水" />
 
                             <ImageView
-                                android:id="@+id/iv_station"
+                                android:id="@+id/iv_work_code"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center|right"
@@ -156,8 +158,8 @@
                                 android:visibility="gone" />
                         </FrameLayout>
                         <ImageView
-                            android:id="@+id/iv_resources"
                             android:layout_gravity="center"
+                            android:id="@+id/iv_popuwindow"
                             android:layout_width="30dp"
                             android:layout_height="match_parent"
                             android:layout_marginRight="10dp"
@@ -165,11 +167,11 @@
                             android:background="@drawable/bg_button"
                             android:src="@drawable/search_48" />
                     </LinearLayout>
-
                 </LinearLayout>
                 <LinearLayout
                     android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:layout_marginLeft="10dp"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -178,7 +180,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="工单号"
+                        android:text="计划单号"
                         android:textColor="@color/black">
                     </TextView>
                     <TextView
@@ -186,7 +188,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="产品编号"
+                        android:text="产品代码"
                         android:layout_gravity="center"
                         android:textColor="@color/black">
                     </TextView>
@@ -259,93 +261,18 @@
         android:focusable="false"
         android:background="@drawable/bg_line_edittext">
     </com.uas.collection.view.ClearableEditText>
-    <LinearLayout
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="5dp"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/tv_save"
-            android:layout_width="80dp"
-            android:layout_height="90dp"
-            android:text="保存"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textSize="@dimen/textsize_20"
-            android:background="@color/gray_light">
-        </TextView>
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <LinearLayout
-                android:layout_marginLeft="30dp"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="产品条码："
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
-
-                <com.uas.collection.view.ClearableEditText
-                    android:id="@+id/ce_product_bar_code"
-                    style="@style/EditTextLineStyle"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:textColor="@color/black"
-                    android:layout_marginRight="@dimen/dp_10"
-                    />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_marginLeft="30dp"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="产品长度："
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
-
-                <com.uas.collection.view.ClearableEditText
-                    android:id="@+id/ce_length"
-                    style="@style/EditTextLineStyle"
-                    android:layout_gravity="center"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="30dp"
-                    android:text="0"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:inputType="number"
-                    android:textColor="@color/black"
-                    android:layout_marginRight="@dimen/dp_10"
-                    />
-                <TextView
-                    android:id="@+id/tv_length"
-                    android:layout_gravity="center"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="0"
-                    android:textColor="@color/blue_900"
-                    android:gravity="center"
-                    android:textSize="@dimen/dp_40">
-                </TextView>
-            </LinearLayout>
-
-        </LinearLayout>
-
-
-    </LinearLayout>
+    <TextView
+        android:layout_marginTop="@dimen/textsize_20"
+        android:layout_marginBottom="@dimen/textsize_20"
+        android:id="@+id/tv_save"
+        android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:text="提交"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textSize="@dimen/textsize_20"
+        android:background="@drawable/bg_button">
+    </TextView>
     <TextView
         android:id="@+id/tv_gonema_code"
         android:layout_width="match_parent"

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

@@ -32,7 +32,8 @@
                             android:orientation="vertical"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="3">
+                            android:layout_weight="3"
+                            android:layout_marginLeft="@dimen/dp_10">
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent">
@@ -48,11 +49,13 @@
                                         android:layout_marginTop="@dimen/spacing_big"
                                         android:stretchColumns="1">
                                         <TableRow>
+
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="工单ID"
                                                 android:layout_gravity="center"
+                                                android:gravity="center"
+                                                android:text="工单流水:"
                                                 android:textColor="@color/black">
                                             </TextView>
                                             <LinearLayout
@@ -68,9 +71,9 @@
                                                     <AutoCompleteTextView
                                                         android:id="@+id/et_linecode_smts"
                                                         style="@style/EditTextLineStyle"
-                                                        android:layout_height="30dp"
+                                                        android:layout_height="20dp"
                                                         android:layout_marginLeft="23dp"
-                                                        android:hint="请输入工单ID" />
+                                                        android:hint="请输入工单流水" />
 
                                                     <ImageView
                                                         android:id="@+id/iocout_smts"
@@ -92,155 +95,206 @@
                                                     android:src="@drawable/search_48" />
                                             </LinearLayout>
                                         </TableRow>
-                                        <TableRow>
+                                        <TableRow
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="工单号  "
+                                                android:text="计划单号:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
-                                            <TextView
-                                                android:id="@+id/tv_macode"
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text=""
-                                                android:gravity="left"
-                                                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="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        android:hint=""
+                                                        android:focusable="false"/>
+
+                                                </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>
                                         </TableRow>
-                                        <LinearLayout
-                                            android:layout_marginTop="@dimen/dp_10"
-                                            android:orientation="horizontal"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content">
+
+                                        <TableRow
+                                            android:layout_marginTop="5dp">
                                             <TextView
-                                                android:id="@+id/tv_pr_code"
-                                                android:layout_width="match_parent"
+                                                android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:layout_weight="1"
-                                                android:text="产品编号"
+                                                android:text="产品代码:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
-                                            <TextView
-                                                android:id="@+id/tv_pr_detail"
+                                            <LinearLayout
                                                 android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:layout_weight="1"
-                                                android:text="产品名称"
-                                                android:layout_gravity="center"
-                                                android:textColor="@color/black">
-                                            </TextView>
-                                        </LinearLayout>
+                                                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="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        android:hint=""
+                                                        android:focusable="false"/>
+
+                                                </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>
+
+
+
+
+                                        </TableRow>
+
 
                                         <TableRow
-                                            android:layout_marginTop="@dimen/dp_10">
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="人员编号"
+                                                android:text="产品名称:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
                                             <LinearLayout
                                                 android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:layout_marginLeft="23dp">
-                                                <com.uas.collection.view.ClearableEditText
-                                                    android:id="@+id/tv_dc_emcode"
-                                                    style="@style/EditTextLineStyle"
-                                                    android:text=""
-                                                    android:hint="请输入人员编号"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="30dp"
-                                                    android:layout_weight="1"
-                                                    android:textColor="@color/black"
-                                                    />
+                                                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="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        android:hint=""
+                                                        android:focusable="false"/>
 
+                                                </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"
-                                                    android:src="@drawable/ic_edittext_scan" />
+                                                    />
                                             </LinearLayout>
 
 
 
 
                                         </TableRow>
+
+
                                         <TableRow
-                                            android:layout_marginTop="@dimen/dp_10">
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="线体"
+                                                android:text="人员编号:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
                                             <LinearLayout
                                                 android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:layout_marginLeft="23dp">
-                                                <com.uas.collection.view.ClearableEditText
-                                                    android:id="@+id/tv_dc_line"
-                                                    style="@style/EditTextLineStyle"
-                                                    android:text=""
-                                                    android:hint="请输入线体"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="30dp"
-                                                    android:layout_weight="1"
-                                                    android:textColor="@color/black"
-                                                    />
+                                                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="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        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_line"
+                                                    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"
-                                                    android:src="@drawable/ic_edittext_scan" />
+                                                    />
                                             </LinearLayout>
 
 
 
 
                                         </TableRow>
-
                                         <TableRow
-                                            android:layout_marginTop="@dimen/dp_10">
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="岗位资源"
+                                                android:text="物理线体:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
                                             <LinearLayout
-                                                android:orientation="horizontal"
                                                 android:layout_width="match_parent"
                                                 android:layout_height="wrap_content">
-
                                                 <FrameLayout
                                                     android:layout_width="0dp"
                                                     android:layout_height="wrap_content"
                                                     android:layout_weight="1">
 
                                                     <AutoCompleteTextView
-                                                        android:id="@+id/ce_resources"
+                                                        android:id="@+id/tv_dc_line"
                                                         style="@style/EditTextLineStyle"
-                                                        android:layout_height="30dp"
+                                                        android:layout_height="20dp"
                                                         android:layout_marginLeft="23dp"
-                                                        android:hint="请输入岗位资源" />
+                                                        android:hint="请输入物理线体" />
 
                                                     <ImageView
-                                                        android:id="@+id/iv_resources_delete"
+                                                        android:id="@+id/iv_dc_line_delete"
                                                         android:layout_width="wrap_content"
                                                         android:layout_height="wrap_content"
                                                         android:layout_gravity="center|right"
@@ -248,24 +302,29 @@
                                                         android:src="@drawable/wrong"
                                                         android:visibility="gone" />
                                                 </FrameLayout>
+
                                                 <ImageView
-                                                    android:id="@+id/iv_resources"
-                                                    android:layout_gravity="center"
+                                                    android:id="@+id/iv_dc_line"
                                                     android:layout_width="30dp"
-                                                    android:layout_height="match_parent"
+                                                    android:layout_height="wrap_content"
+                                                    android:layout_gravity="center"
                                                     android:layout_marginRight="10dp"
                                                     android:layout_marginLeft="5dp"
-                                                    android:background="@drawable/bg_button"
-                                                    android:src="@drawable/search_48" />
+                                                    android:clickable="false"
+                                                    />
                                             </LinearLayout>
+
+
+
+
                                         </TableRow>
 
                                         <TableRow
-                                            android:layout_marginTop="@dimen/dp_10">
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="位号"
+                                                android:text="岗位资源:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
@@ -274,25 +333,39 @@
                                                 android:layout_width="match_parent"
                                                 android:layout_height="wrap_content">
 
-                                                <com.uas.collection.view.ClearableEditText
-                                                    android:id="@+id/ce_bit_number"
-                                                    style="@style/EditTextLineStyle"
-                                                    android:layout_gravity="center"
+                                                <FrameLayout
                                                     android:layout_width="0dp"
-                                                    android:layout_height="30dp"
-                                                    android:layout_weight="1"
-                                                    android:layout_marginLeft="23dp"
-                                                    android:hint="请输入位号"
-                                                    android:textColor="@color/black"
-                                                    />
-                                                <View
+                                                    android:layout_height="wrap_content"
+                                                    android:layout_weight="1">
+
+                                                    <AutoCompleteTextView
+                                                        android:id="@+id/ce_resources"
+                                                        style="@style/EditTextLineStyle"
+                                                        android:layout_height="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        android:hint="请输入岗位资源" />
+
+                                                    <ImageView
+                                                        android:id="@+id/iv_resources_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_resources"
                                                     android:layout_gravity="center"
                                                     android:layout_width="30dp"
                                                     android:layout_height="match_parent"
                                                     android:layout_marginRight="10dp"
-                                                    android:layout_marginLeft="5dp" />
+                                                    android:layout_marginLeft="5dp"
+                                                    android:background="@drawable/bg_button"
+                                                    android:src="@drawable/search_48" />
                                             </LinearLayout>
                                         </TableRow>
+
                                         <TableRow
                                             android:visibility="gone"
                                             android:layout_marginTop="@dimen/dp_10">
@@ -352,14 +425,14 @@
                                     <TextView
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:text="人员照片"
+                                        android:text=""
                                         android:layout_gravity="center"
                                         android:gravity="center">
                                     </TextView>
                                     <ImageView
                                         android:id="@+id/iv_personnel_data"
                                         android:layout_width="match_parent"
-                                        android:layout_height="180dp"
+                                        android:layout_height="200dp"
                                         android:scaleType="fitXY"
                                         android:background="@drawable/bg_imageview_rauide"
                                         >
@@ -378,11 +451,11 @@
                                 android:layout_height="wrap_content"
                                 android:stretchColumns="1">
                                 <TableRow
-                                    android:layout_marginTop="@dimen/dp_10">
+                                    android:layout_marginTop="5dp">
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="不良现象"
+                                        android:text="不良现象:"
                                         android:layout_gravity="center"
                                         android:textColor="@color/black">
                                     </TextView>
@@ -393,68 +466,110 @@
                                     </android.support.v7.widget.RecyclerView>
                                 </TableRow>
                                 <TableRow
-                                    android:layout_marginTop="@dimen/dp_10">
+                                    android:layout_marginTop="5dp">
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="不良原因"
+                                        android:text="不良数量:"
                                         android:layout_gravity="center"
                                         android:textColor="@color/black">
                                     </TextView>
-                                    <LinearLayout
-                                        android:orientation="horizontal"
+                                    <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
-                                            android:id="@+id/rv_undesirable"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content">
-                                        </android.support.v7.widget.RecyclerView>
-                                    </LinearLayout>
+                                    </android.support.v7.widget.RecyclerView>
                                 </TableRow>
                                 <TableRow
-                                    android:layout_marginTop="@dimen/dp_10">
+                                    android:layout_marginTop="5dp">
                                     <TextView
+                                        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>
-                                    <LinearLayout
-                                        android:orientation="horizontal"
+                                    <android.support.v7.widget.RecyclerView
+                                        android:id="@+id/rv_undesirable"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content">
+                                    </android.support.v7.widget.RecyclerView>
+                                </TableRow>
 
-
+                                <TableRow
+                                    android:id="@+id/tb_master"
+                                    android:visibility="gone"
+                                    android:layout_marginTop="5dp">
+                                    <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"
+                                        android:orientation="vertical">
                                         <android.support.v7.widget.RecyclerView
-                                            android:id="@+id/rv_datapassqty"
+                                            android:id="@+id/rv_master_copy"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content">
+                                        </android.support.v7.widget.RecyclerView>
+                                        <android.support.v7.widget.RecyclerView
+                                            android:id="@+id/rv_original_copy"
                                             android:layout_width="match_parent"
                                             android:layout_height="wrap_content">
                                         </android.support.v7.widget.RecyclerView>
                                     </LinearLayout>
+
+                                </TableRow>
+
+                                <TableRow
+                                    android:id="@+id/tb_color"
+                                    android:visibility="gone"
+                                    android:layout_marginTop="5dp">
+                                    <TextView
+                                        android:id="@+id/tv_mastercolor"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="原件位号:"
+                                        android:layout_gravity="center"
+                                        android:textColor="@color/black">
+                                    </TextView>
+                                    <android.support.v7.widget.RecyclerView
+                                        android:id="@+id/rv_mastercolor"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content">
+                                    </android.support.v7.widget.RecyclerView>
                                 </TableRow>
 
                             </TableLayout>
+
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1.5"
+                            android:orientation="vertical">
+                            <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.5" />
                             <TextView
                                 android:layout_marginTop="@dimen/dp_10"
                                 android:id="@+id/tv_save"
-                                android:layout_width="100dp"
-                                android:layout_height="wrap_content"
-                                android:text="保存"
+                                android:layout_width="150dp"
+                                android:layout_height="50dp"
+                                android:text="提交"
                                 android:layout_gravity="center"
                                 android:gravity="center"
                                 android:textSize="@dimen/textsize_20"
-                                android:background="@color/gray_light">
+                                android:background="@drawable/bg_button">
                             </TextView>
                         </LinearLayout>
-                        <com.bin.david.form.core.SmartTable
-                            android:id="@+id/jlt_storage_in_filter_list_st"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="2" />
 
                     </LinearLayout>
 

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

@@ -1,338 +1,313 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
-    <LinearLayout
-        android:orientation="horizontal"
+
+    <android.support.design.widget.AppBarLayout
+        android:background="@color/white"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <LinearLayout
-            android:layout_marginLeft="5dp"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_height="wrap_content">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="人员照片"
-                android:layout_gravity="center"
-                android:gravity="center">
-            </TextView>
-            <ImageView
-                android:id="@+id/iv_personnel_data"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                android:scaleType="fitXY"
-                android:background="@drawable/bg_imageview_rauide">
-            </ImageView>
+        android:layout_weight="1"
+        android:layout_height="match_parent">
 
-        </LinearLayout>
-        <LinearLayout
-            android:layout_marginLeft="5dp"
-            android:orientation="vertical"
+        <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:layout_marginRight="5dp"
-                android:layout_marginTop="@dimen/dp_10"
-                android:orientation="horizontal"
+            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="wrap_content">
+                android:layout_height="match_parent">
                 <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="人员编号："
-                        android:layout_gravity="center"
-                        android:textColor="@color/black">
-                    </TextView>
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
                     <LinearLayout
+                        android:orientation="horizontal"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                        <com.uas.collection.view.ClearableEditText
-                            android:id="@+id/tv_dc_emcode"
-                            style="@style/EditTextLineStyle"
-                            android:text=""
-                            android:hint="请输入人员编号"
-                            android:layout_width="match_parent"
-                            android:layout_height="30dp"
-                            android:layout_weight="1"
-                            android:textColor="@color/black"
-                            />
+                        <LinearLayout
+                            android:layout_marginLeft="5dp"
+                            android:orientation="vertical"
+                            android:layout_width="wrap_content"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:layout_height="wrap_content">
+                            <ImageView
+                                android:id="@+id/iv_personnel_data"
+                                android:layout_width="100dp"
+                                android:layout_height="100dp"
+                                android:scaleType="fitXY"
+                                android:background="@drawable/bg_imageview_rauide">
+                            </ImageView>
 
-                        <ImageView
-                            android:id="@+id/iv_dc_emcode"
-                            android:layout_width="30dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginRight="10dp"
+                        </LinearLayout>
+                        <LinearLayout
                             android:layout_marginLeft="5dp"
-                            android:clickable="false"
-                            android:src="@drawable/ic_edittext_scan" />
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="工单ID：">
-                    </TextView>
+                            android:orientation="vertical"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+                            <LinearLayout
+                                android:layout_marginRight="5dp"
+                                android:layout_marginTop="@dimen/dp_10"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1">
 
-                    <FrameLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="人员编号："
+                                        android:layout_gravity="center"
+                                        android:textColor="@color/black">
+                                    </TextView>
+                                    <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/ce_work_code"
-                            style="@style/EditTextLineStyle"
-                            android:layout_height="30dp"
-                            android:hint="请输入工ID" />
+                                            <AutoCompleteTextView
+                                                android:id="@+id/tv_dc_emcode"
+                                                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_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="岗位资源：">
-                    </TextView>
+                                            <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_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center"
+                                        android:text="不良归属：">
+                                    </TextView>
 
-                    <FrameLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
+                                    <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="请输入岗位资源" />
+                                        <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>
+                                        <ImageView
+                                            android:id="@+id/iv_station"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_gravity="center|right"
+                                            android:layout_marginRight="13dp"
+                                            android:src="@drawable/wrong"
+                                            android:visibility="gone" />
+                                    </FrameLayout>
+                                    <ImageView
+                                        android:id="@+id/iv_resources"
+                                        android:layout_gravity="center"
+                                        android:layout_width="30dp"
+                                        android:layout_height="match_parent"
+                                        android:layout_marginRight="10dp"
+                                        android:layout_marginLeft="5dp"
+                                        android:background="@drawable/bg_button"
+                                        android:src="@drawable/search_48" />
+                                </LinearLayout>
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="center"
+                                        android:text="工单流水：">
+                                    </TextView>
 
-            </LinearLayout>
-            <LinearLayout
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:id="@+id/tv_macode"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="工单号"
-                    android:textColor="@color/black">
-                </TextView>
-                <TextView
-                    android:id="@+id/tv_pr_code"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="产品编号"
-                    android:layout_gravity="center"
-                    android:textColor="@color/black">
-                </TextView>
-                <TextView
-                    android:id="@+id/tv_pr_detail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="产品名称"
-                    android:layout_gravity="center"
-                    android:textColor="@color/black">
-                </TextView>
+                                    <FrameLayout
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1">
 
-            </LinearLayout>
+                                        <AutoCompleteTextView
+                                            android:id="@+id/ce_work_code"
+                                            style="@style/EditTextLineStyle"
+                                            android:layout_height="30dp"
+                                            android:hint="请输入工单流水" />
 
-            <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>
+                                        <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>
+                            </LinearLayout>
+                            <LinearLayout
+                                android:layout_marginRight="5dp"
+                                android:layout_marginTop="@dimen/dp_10"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
 
-    </LinearLayout>
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1">
 
-    <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">
-    </com.uas.collection.view.ClearableEditText>
+                                </LinearLayout>
 
 
-    <LinearLayout
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="@dimen/dp_10"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/tv_save"
-            android:layout_width="100dp"
-            android:layout_height="70dp"
-            android:text="保存"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textSize="@dimen/textsize_20"
-            android:background="@color/gray_light">
-        </TextView>
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <LinearLayout
-                android:layout_marginLeft="30dp"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="产品条码："
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
+                            </LinearLayout>
 
-                <com.uas.collection.view.ClearableEditText
-                    android:id="@+id/ce_product_bar_code"
-                    style="@style/EditTextLineStyle"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:textColor="@color/black"
-                    android:layout_marginRight="@dimen/dp_10"
-                    />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_marginLeft="30dp"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="产品长度："
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
+                            <LinearLayout
+                                android:layout_marginTop="@dimen/dp_10"
+                                android:layout_marginBottom="@dimen/dp_10"
+                                android:orientation="horizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <TextView
+                                    android:id="@+id/tv_macode"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:text="计划单号"
+                                    android:textColor="@color/black">
+                                </TextView>
+                                <TextView
+                                    android:id="@+id/tv_pr_code"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:text="产品代码"
+                                    android:layout_gravity="center"
+                                    android:textColor="@color/black">
+                                </TextView>
+                                <TextView
+                                    android:id="@+id/tv_pr_detail"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:text="产品名称"
+                                    android:layout_gravity="center"
+                                    android:textColor="@color/black">
+                                </TextView>
 
-                <AutoCompleteTextView
-                    android:id="@+id/ce_length"
-                    style="@style/EditTextLineStyle"
-                    android:layout_gravity="center"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="30dp"
-                    android:text="0"
-                    android:inputType="number"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:textColor="@color/black"
-                    android:layout_marginRight="@dimen/dp_10"
-                    />
-                <TextView
-                    android:id="@+id/tv_length"
-                    android:layout_gravity="center"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="0"
-                    android:textColor="@color/blue_900"
-                    android:gravity="center"
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
-            </LinearLayout>
+                            </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_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>
 
+                        </LinearLayout>
+                        <com.bin.david.form.core.SmartTable
+                            android:id="@+id/jlt_storage_in_filter_list_st"
+                            android:layout_width="0dp"
+                            android:layout_weight="0.3"
+                            android:layout_height="match_parent" />
+                    </LinearLayout>
 
-    </LinearLayout>
-<TextView
-    android:id="@+id/tv_gonema_code"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:visibility="gone">
-</TextView>
+                    <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_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_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:visibility="gone">
+                    </TextView>
+
+
+                </LinearLayout>
+
+
+            </android.support.v4.widget.NestedScrollView>
 
+        </android.support.design.widget.CollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
 
 
 </LinearLayout>

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

@@ -33,12 +33,13 @@
             android:id="@+id/ce_other"
             style="@style/EditTextLineStyle"
             android:layout_gravity="center"
-            android:layout_width="200dp"
+            android:layout_width="85dp"
             android:layout_height="@dimen/textsize_20"
             android:layout_weight="1"
-            android:layout_marginLeft="@dimen/dp_10"
             android:textColor="@color/black"
-            android:visibility="gone" />
+            android:padding="0dp"
+            android:text=""
+            android:visibility="gone"/>
 
         <AutoCompleteTextView
             android:id="@+id/ce_qty"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout style="@style/ActionBar"
-                xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Button
         android:id="@+id/btn_actionbar_withback"
@@ -15,7 +15,19 @@
         <TextView
             android:id="@+id/tv_actionbar_withback"
             style="@style/ActionBarTextView"
-            android:layout_width="wrap_content" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="" />
+        <TextView
+            android:id="@+id/tv_person"
+            style="@style/ActionBarTextView"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_below="@+id/tv_actionbar_withback"
+            android:gravity="center"
+            android:layout_centerHorizontal="true"
+            android:text=""/>
         <!--<com.uas.uaspda.customview.ClearableEditText
             android:id="@+id/et_actionbar_withback"
             style="@style/ActionBarEditText"/>-->

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

@@ -17,17 +17,10 @@
                 android:layout_width="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_height="wrap_content">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="人员照片"
-                    android:layout_gravity="center"
-                    android:gravity="center">
-                </TextView>
                 <ImageView
                     android:id="@+id/iv_personnel_data"
                     android:layout_width="100dp"
-                    android:layout_height="120dp"
+                    android:layout_height="100dp"
                     android:scaleType="fitXY"
                     android:background="@drawable/bg_imageview_rauide">
                 </ImageView>
@@ -59,17 +52,26 @@
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
-                            <com.uas.collection.view.ClearableEditText
-                                android:id="@+id/tv_dc_emcode"
-                                style="@style/EditTextLineStyle"
-                                android:text=""
-                                android:hint="请输入人员编号"
-                                android:layout_width="match_parent"
-                                android:layout_height="30dp"
-                                android:layout_weight="1"
-                                android:textColor="@color/black"
-                                />
+                            <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"
@@ -77,10 +79,10 @@
                                 android:layout_gravity="center"
                                 android:layout_marginRight="10dp"
                                 android:layout_marginLeft="5dp"
-                                android:clickable="false"
-                                android:src="@drawable/ic_edittext_scan" />
+                                android:clickable="false" />
                         </LinearLayout>
                     </LinearLayout>
+
                     <LinearLayout
                         android:layout_marginLeft="@dimen/dp_10"
                         android:layout_width="0dp"
@@ -90,7 +92,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:text="工单号：">
+                            android:text="不良归属：">
                         </TextView>
 
                         <FrameLayout
@@ -99,13 +101,13 @@
                             android:layout_weight="1">
 
                             <AutoCompleteTextView
-                                android:id="@+id/ce_work_code"
+                                android:id="@+id/at_station"
                                 style="@style/EditTextLineStyle"
                                 android:layout_height="30dp"
-                                android:hint="请输入工单号" />
+                                android:hint="请输入不良归属" />
 
                             <ImageView
-                                android:id="@+id/iv_work_code"
+                                android:id="@+id/iv_station"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center|right"
@@ -114,8 +116,8 @@
                                 android:visibility="gone" />
                         </FrameLayout>
                         <ImageView
+                            android:id="@+id/iv_resources"
                             android:layout_gravity="center"
-                            android:id="@+id/iv_popuwindow"
                             android:layout_width="30dp"
                             android:layout_height="match_parent"
                             android:layout_marginRight="10dp"
@@ -132,7 +134,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:text="岗位资源：">
+                            android:text="工单流水：">
                         </TextView>
 
                         <FrameLayout
@@ -141,13 +143,13 @@
                             android:layout_weight="1">
 
                             <AutoCompleteTextView
-                                android:id="@+id/at_station"
+                                android:id="@+id/ce_work_code"
                                 style="@style/EditTextLineStyle"
                                 android:layout_height="30dp"
-                                android:hint="请输入岗位资源" />
+                                android:hint="请输入工单流水" />
 
                             <ImageView
-                                android:id="@+id/iv_station"
+                                android:id="@+id/iv_work_code"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center|right"
@@ -156,8 +158,8 @@
                                 android:visibility="gone" />
                         </FrameLayout>
                         <ImageView
-                            android:id="@+id/iv_resources"
                             android:layout_gravity="center"
+                            android:id="@+id/iv_popuwindow"
                             android:layout_width="30dp"
                             android:layout_height="match_parent"
                             android:layout_marginRight="10dp"
@@ -165,11 +167,11 @@
                             android:background="@drawable/bg_button"
                             android:src="@drawable/search_48" />
                     </LinearLayout>
-
                 </LinearLayout>
                 <LinearLayout
                     android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginBottom="@dimen/dp_10"
+                    android:layout_marginLeft="10dp"
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -178,7 +180,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="工单号"
+                        android:text="计划单号"
                         android:textColor="@color/black">
                     </TextView>
                     <TextView
@@ -186,7 +188,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="产品编号"
+                        android:text="产品代码"
                         android:layout_gravity="center"
                         android:textColor="@color/black">
                     </TextView>
@@ -199,7 +201,6 @@
                         android:layout_gravity="center"
                         android:textColor="@color/black">
                     </TextView>
-
                 </LinearLayout>
                 <TextView
                     android:layout_marginLeft="@dimen/dp_10"
@@ -252,104 +253,28 @@
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_marginLeft="5dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="5dp"
         android:text=""
+        android:gravity="top"
         android:textSize="15sp"
         android:layout_marginRight="@dimen/dp_10"
         android:focusable="false"
         android:background="@drawable/bg_line_edittext">
     </com.uas.collection.view.ClearableEditText>
-    <LinearLayout
-        android:layout_marginLeft="5dp"
-        android:layout_marginTop="30dp"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/tv_save"
-            android:layout_width="80dp"
-            android:layout_height="90dp"
-            android:text="保存"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textSize="@dimen/textsize_20"
-            android:background="@color/gray_light">
-        </TextView>
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <LinearLayout
-                android:layout_marginLeft="30dp"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="产品条码："
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
-
-                <com.uas.collection.view.ClearableEditText
-                    android:id="@+id/ce_product_bar_code"
-                    style="@style/EditTextLineStyle"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:textColor="@color/black"
-                    android:layout_marginRight="@dimen/dp_10"
-                    />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_marginLeft="30dp"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="产品长度："
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
-
-                <com.uas.collection.view.ClearableEditText
-                    android:id="@+id/ce_length"
-                    style="@style/EditTextLineStyle"
-                    android:layout_gravity="center"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="30dp"
-                    android:text="0"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:inputType="number"
-                    android:textColor="@color/black"
-                    android:layout_marginRight="@dimen/dp_10"
-                    />
-                <TextView
-                    android:id="@+id/tv_length"
-                    android:layout_gravity="center"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="0"
-                    android:textColor="@color/blue_900"
-                    android:gravity="center"
-                    android:textSize="@dimen/dp_40">
-                </TextView>
-            </LinearLayout>
-
-        </LinearLayout>
-
-
-    </LinearLayout>
+    <TextView
+        android:id="@+id/tv_save"
+        android:layout_width="100dp"
+        android:layout_height="50dp"
+        android:text="提交"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textSize="@dimen/textsize_20"
+        android:background="@drawable/bg_button">
+    </TextView>
     <TextView
         android:id="@+id/tv_gonema_code"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:visibility="gone">
     </TextView>
 </LinearLayout>

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

@@ -32,7 +32,8 @@
                             android:orientation="vertical"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_weight="3">
+                            android:layout_weight="3"
+                            android:layout_marginLeft="@dimen/dp_10">
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent">
@@ -48,11 +49,13 @@
                                         android:layout_marginTop="@dimen/spacing_big"
                                         android:stretchColumns="1">
                                         <TableRow>
+
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="工单ID"
                                                 android:layout_gravity="center"
+                                                android:gravity="center"
+                                                android:text="工单流水:"
                                                 android:textColor="@color/black">
                                             </TextView>
                                             <LinearLayout
@@ -68,9 +71,9 @@
                                                     <AutoCompleteTextView
                                                         android:id="@+id/et_linecode_smts"
                                                         style="@style/EditTextLineStyle"
-                                                        android:layout_height="30dp"
+                                                        android:layout_height="20dp"
                                                         android:layout_marginLeft="23dp"
-                                                        android:hint="请输入工单ID" />
+                                                        android:hint="请输入工单流水" />
 
                                                     <ImageView
                                                         android:id="@+id/iocout_smts"
@@ -92,155 +95,206 @@
                                                     android:src="@drawable/search_48" />
                                             </LinearLayout>
                                         </TableRow>
-                                        <TableRow>
+                                        <TableRow
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="工单号  "
+                                                android:text="计划单号:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
-                                            <TextView
-                                                android:id="@+id/tv_macode"
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text=""
-                                                android:gravity="left"
-                                                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="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        android:hint=""
+                                                        android:focusable="false"/>
+
+                                                </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>
                                         </TableRow>
-                                        <LinearLayout
-                                            android:layout_marginTop="@dimen/dp_10"
-                                            android:orientation="horizontal"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content">
+
+                                        <TableRow
+                                            android:layout_marginTop="5dp">
                                             <TextView
-                                                android:id="@+id/tv_pr_code"
-                                                android:layout_width="match_parent"
+                                                android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:layout_weight="1"
-                                                android:text="产品编号"
+                                                android:text="产品代码:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
-                                            <TextView
-                                                android:id="@+id/tv_pr_detail"
+                                            <LinearLayout
                                                 android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:layout_weight="1"
-                                                android:text="产品名称"
-                                                android:layout_gravity="center"
-                                                android:textColor="@color/black">
-                                            </TextView>
-                                        </LinearLayout>
+                                                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="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        android:hint=""
+                                                        android:focusable="false"/>
+
+                                                </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>
+
+
+
+
+                                        </TableRow>
+
 
                                         <TableRow
-                                            android:layout_marginTop="@dimen/dp_10">
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="人员编号"
+                                                android:text="产品名称:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
                                             <LinearLayout
                                                 android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:layout_marginLeft="23dp">
-                                                <com.uas.collection.view.ClearableEditText
-                                                    android:id="@+id/tv_dc_emcode"
-                                                    style="@style/EditTextLineStyle"
-                                                    android:text=""
-                                                    android:hint="请输入人员编号"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="30dp"
-                                                    android:layout_weight="1"
-                                                    android:textColor="@color/black"
-                                                    />
+                                                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="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        android:hint=""
+                                                        android:focusable="false"/>
 
+                                                </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"
-                                                    android:src="@drawable/ic_edittext_scan" />
+                                                    />
                                             </LinearLayout>
 
 
 
 
                                         </TableRow>
+
+
                                         <TableRow
-                                            android:layout_marginTop="@dimen/dp_10">
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="线体"
+                                                android:text="人员编号:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
                                             <LinearLayout
                                                 android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:layout_marginLeft="23dp">
-                                                <com.uas.collection.view.ClearableEditText
-                                                    android:id="@+id/tv_dc_line"
-                                                    style="@style/EditTextLineStyle"
-                                                    android:text=""
-                                                    android:hint="请输入线体"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="30dp"
-                                                    android:layout_weight="1"
-                                                    android:textColor="@color/black"
-                                                    />
+                                                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="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        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_line"
+                                                    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"
-                                                    android:src="@drawable/ic_edittext_scan" />
+                                                    />
                                             </LinearLayout>
 
 
 
 
                                         </TableRow>
-
                                         <TableRow
-                                            android:layout_marginTop="@dimen/dp_10">
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="岗位资源"
+                                                android:text="物理线体:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
                                             <LinearLayout
-                                                android:orientation="horizontal"
                                                 android:layout_width="match_parent"
                                                 android:layout_height="wrap_content">
-
                                                 <FrameLayout
                                                     android:layout_width="0dp"
                                                     android:layout_height="wrap_content"
                                                     android:layout_weight="1">
 
                                                     <AutoCompleteTextView
-                                                        android:id="@+id/ce_resources"
+                                                        android:id="@+id/tv_dc_line"
                                                         style="@style/EditTextLineStyle"
-                                                        android:layout_height="30dp"
+                                                        android:layout_height="20dp"
                                                         android:layout_marginLeft="23dp"
-                                                        android:hint="请输入岗位资源" />
+                                                        android:hint="请输入物理线体" />
 
                                                     <ImageView
-                                                        android:id="@+id/iv_resources_delete"
+                                                        android:id="@+id/iv_dc_line_delete"
                                                         android:layout_width="wrap_content"
                                                         android:layout_height="wrap_content"
                                                         android:layout_gravity="center|right"
@@ -248,24 +302,29 @@
                                                         android:src="@drawable/wrong"
                                                         android:visibility="gone" />
                                                 </FrameLayout>
+
                                                 <ImageView
-                                                    android:id="@+id/iv_resources"
-                                                    android:layout_gravity="center"
+                                                    android:id="@+id/iv_dc_line"
                                                     android:layout_width="30dp"
-                                                    android:layout_height="match_parent"
+                                                    android:layout_height="wrap_content"
+                                                    android:layout_gravity="center"
                                                     android:layout_marginRight="10dp"
                                                     android:layout_marginLeft="5dp"
-                                                    android:background="@drawable/bg_button"
-                                                    android:src="@drawable/search_48" />
+                                                    android:clickable="false"
+                                                    />
                                             </LinearLayout>
+
+
+
+
                                         </TableRow>
 
                                         <TableRow
-                                            android:layout_marginTop="@dimen/dp_10">
+                                            android:layout_marginTop="5dp">
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="位号"
+                                                android:text="岗位资源:"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
@@ -274,25 +333,39 @@
                                                 android:layout_width="match_parent"
                                                 android:layout_height="wrap_content">
 
-                                                <com.uas.collection.view.ClearableEditText
-                                                    android:id="@+id/ce_bit_number"
-                                                    style="@style/EditTextLineStyle"
-                                                    android:layout_gravity="center"
+                                                <FrameLayout
                                                     android:layout_width="0dp"
-                                                    android:layout_height="30dp"
-                                                    android:layout_weight="1"
-                                                    android:layout_marginLeft="23dp"
-                                                    android:hint="请输入位号"
-                                                    android:textColor="@color/black"
-                                                    />
-                                                <View
+                                                    android:layout_height="wrap_content"
+                                                    android:layout_weight="1">
+
+                                                    <AutoCompleteTextView
+                                                        android:id="@+id/ce_resources"
+                                                        style="@style/EditTextLineStyle"
+                                                        android:layout_height="20dp"
+                                                        android:layout_marginLeft="23dp"
+                                                        android:hint="请输入岗位资源" />
+
+                                                    <ImageView
+                                                        android:id="@+id/iv_resources_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_resources"
                                                     android:layout_gravity="center"
                                                     android:layout_width="30dp"
                                                     android:layout_height="match_parent"
                                                     android:layout_marginRight="10dp"
-                                                    android:layout_marginLeft="5dp" />
+                                                    android:layout_marginLeft="5dp"
+                                                    android:background="@drawable/bg_button"
+                                                    android:src="@drawable/search_48" />
                                             </LinearLayout>
                                         </TableRow>
+
                                         <TableRow
                                             android:visibility="gone"
                                             android:layout_marginTop="@dimen/dp_10">
@@ -352,16 +425,17 @@
                                     <TextView
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:text="人员照片"
+                                        android:text=""
                                         android:layout_gravity="center"
                                         android:gravity="center">
                                     </TextView>
                                     <ImageView
                                         android:id="@+id/iv_personnel_data"
                                         android:layout_width="match_parent"
-                                        android:layout_height="match_parent"
+                                        android:layout_height="200dp"
                                         android:scaleType="fitXY"
-                                        android:background="@drawable/bg_imageview_rauide">
+                                        android:background="@drawable/bg_imageview_rauide"
+                                        >
                                     </ImageView>
                                     <android.support.v7.widget.RecyclerView
                                         android:visibility="gone"
@@ -377,11 +451,11 @@
                                 android:layout_height="wrap_content"
                                 android:stretchColumns="1">
                                 <TableRow
-                                    android:layout_marginTop="@dimen/dp_10">
+                                    android:layout_marginTop="5dp">
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="不良现象"
+                                        android:text="不良现象:"
                                         android:layout_gravity="center"
                                         android:textColor="@color/black">
                                     </TextView>
@@ -392,67 +466,110 @@
                                     </android.support.v7.widget.RecyclerView>
                                 </TableRow>
                                 <TableRow
-                                    android:layout_marginTop="@dimen/dp_10">
+                                    android:layout_marginTop="5dp">
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="数量"
+                                        android:text="不良数量:"
                                         android:layout_gravity="center"
                                         android:textColor="@color/black">
                                     </TextView>
-                                    <LinearLayout
-                                        android:orientation="horizontal"
+                                    <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
-                                            android:id="@+id/rv_datapassqty"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content">
-                                        </android.support.v7.widget.RecyclerView>
-                                    </LinearLayout>
+                                    </android.support.v7.widget.RecyclerView>
                                 </TableRow>
                                 <TableRow
-                                    android:layout_marginTop="@dimen/dp_10">
+                                    android:layout_marginTop="5dp">
                                     <TextView
+                                        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>
-                                    <LinearLayout
-                                        android:orientation="horizontal"
+                                    <android.support.v7.widget.RecyclerView
+                                        android:id="@+id/rv_undesirable"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content">
+                                    </android.support.v7.widget.RecyclerView>
+                                </TableRow>
 
-
+                                <TableRow
+                                    android:id="@+id/tb_master"
+                                    android:visibility="gone"
+                                    android:layout_marginTop="5dp">
+                                    <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"
+                                        android:orientation="vertical">
+                                        <android.support.v7.widget.RecyclerView
+                                            android:id="@+id/rv_master_copy"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content">
+                                        </android.support.v7.widget.RecyclerView>
                                         <android.support.v7.widget.RecyclerView
-                                            android:id="@+id/rv_undesirable"
+                                            android:id="@+id/rv_original_copy"
                                             android:layout_width="match_parent"
                                             android:layout_height="wrap_content">
                                         </android.support.v7.widget.RecyclerView>
                                     </LinearLayout>
+
                                 </TableRow>
+
+                                <TableRow
+                                    android:id="@+id/tb_color"
+                                    android:visibility="gone"
+                                    android:layout_marginTop="5dp">
+                                    <TextView
+                                        android:id="@+id/tv_mastercolor"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="原件位号:"
+                                        android:layout_gravity="center"
+                                        android:textColor="@color/black">
+                                    </TextView>
+                                    <android.support.v7.widget.RecyclerView
+                                        android:id="@+id/rv_mastercolor"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content">
+                                    </android.support.v7.widget.RecyclerView>
+                                </TableRow>
+
                             </TableLayout>
+
+                        </LinearLayout>
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1.5"
+                            android:orientation="vertical">
+                            <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.5" />
                             <TextView
                                 android:layout_marginTop="@dimen/dp_10"
                                 android:id="@+id/tv_save"
-                                android:layout_width="100dp"
-                                android:layout_height="wrap_content"
-                                android:text="保存"
+                                android:layout_width="150dp"
+                                android:layout_height="50dp"
+                                android:text="提交"
                                 android:layout_gravity="center"
                                 android:gravity="center"
                                 android:textSize="@dimen/textsize_20"
-                                android:background="@color/gray_light">
+                                android:background="@drawable/bg_button">
                             </TextView>
                         </LinearLayout>
-                        <com.bin.david.form.core.SmartTable
-                            android:id="@+id/jlt_storage_in_filter_list_st"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="2" />
 
                     </LinearLayout>
 

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

@@ -14,17 +14,10 @@
             android:layout_width="wrap_content"
             android:layout_marginTop="@dimen/dp_10"
             android:layout_height="wrap_content">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="人员照片"
-                android:layout_gravity="center"
-                android:gravity="center">
-            </TextView>
             <ImageView
                 android:id="@+id/iv_personnel_data"
                 android:layout_width="100dp"
-                android:layout_height="120dp"
+                android:layout_height="100dp"
                 android:scaleType="fitXY"
                 android:background="@drawable/bg_imageview_rauide">
             </ImageView>
@@ -56,17 +49,26 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
-                        <com.uas.collection.view.ClearableEditText
-                            android:id="@+id/tv_dc_emcode"
-                            style="@style/EditTextLineStyle"
-                            android:text=""
-                            android:hint="请输入人员编号"
-                            android:layout_width="match_parent"
-                            android:layout_height="30dp"
-                            android:layout_weight="1"
-                            android:textColor="@color/black"
-                            />
+                        <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"
@@ -75,7 +77,7 @@
                             android:layout_marginRight="10dp"
                             android:layout_marginLeft="5dp"
                             android:clickable="false"
-                            android:src="@drawable/ic_edittext_scan" />
+                            />
                     </LinearLayout>
                 </LinearLayout>
                 <LinearLayout
@@ -86,7 +88,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        android:text="工单ID：">
+                        android:text="不良归属：">
                     </TextView>
 
                     <FrameLayout
@@ -95,13 +97,13 @@
                         android:layout_weight="1">
 
                         <AutoCompleteTextView
-                            android:id="@+id/ce_work_code"
+                            android:id="@+id/at_station"
                             style="@style/EditTextLineStyle"
                             android:layout_height="30dp"
-                            android:hint="请输入工ID" />
+                            android:hint="请输入不良归属" />
 
                         <ImageView
-                            android:id="@+id/iv_work_code"
+                            android:id="@+id/iv_station"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center|right"
@@ -110,8 +112,8 @@
                             android:visibility="gone" />
                     </FrameLayout>
                     <ImageView
+                        android:id="@+id/iv_resources"
                         android:layout_gravity="center"
-                        android:id="@+id/iv_popuwindow"
                         android:layout_width="30dp"
                         android:layout_height="match_parent"
                         android:layout_marginRight="10dp"
@@ -127,7 +129,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        android:text="岗位资源：">
+                        android:text="工单流水：">
                     </TextView>
 
                     <FrameLayout
@@ -136,13 +138,13 @@
                         android:layout_weight="1">
 
                         <AutoCompleteTextView
-                            android:id="@+id/at_station"
+                            android:id="@+id/ce_work_code"
                             style="@style/EditTextLineStyle"
                             android:layout_height="30dp"
-                            android:hint="请输入岗位资源" />
+                            android:hint="请输入工单流水" />
 
                         <ImageView
-                            android:id="@+id/iv_station"
+                            android:id="@+id/iv_work_code"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center|right"
@@ -151,8 +153,8 @@
                             android:visibility="gone" />
                     </FrameLayout>
                     <ImageView
-                        android:id="@+id/iv_resources"
                         android:layout_gravity="center"
+                        android:id="@+id/iv_popuwindow"
                         android:layout_width="30dp"
                         android:layout_height="match_parent"
                         android:layout_marginRight="10dp"
@@ -173,7 +175,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="工单号"
+                    android:text="计划单号"
                     android:textColor="@color/black">
                 </TextView>
                 <TextView
@@ -181,7 +183,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="产品编号"
+                    android:text="产品代码"
                     android:layout_gravity="center"
                     android:textColor="@color/black">
                 </TextView>
@@ -194,6 +196,7 @@
                     android:layout_gravity="center"
                     android:textColor="@color/black">
                 </TextView>
+
             </LinearLayout>
 
             <TextView
@@ -226,104 +229,27 @@
     <com.uas.collection.view.ClearableEditText
         android:id="@+id/tv_hintshow"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        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">
     </com.uas.collection.view.ClearableEditText>
+    <TextView
+        android:id="@+id/tv_save"
+        android:layout_width="100dp"
+        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:layout_marginLeft="5dp"
-        android:layout_marginTop="@dimen/dp_10"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:id="@+id/tv_save"
-            android:layout_width="100dp"
-            android:layout_height="70dp"
-            android:text="保存"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textSize="@dimen/textsize_20"
-            android:background="@color/gray_light">
-        </TextView>
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <LinearLayout
-                android:layout_marginLeft="30dp"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="产品条码："
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
-
-                <com.uas.collection.view.ClearableEditText
-                    android:id="@+id/ce_product_bar_code"
-                    style="@style/EditTextLineStyle"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:textColor="@color/black"
-                    android:layout_marginRight="@dimen/dp_10"
-                    />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_marginLeft="30dp"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="产品长度："
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
-
-                <AutoCompleteTextView
-                    android:id="@+id/ce_length"
-                    style="@style/EditTextLineStyle"
-                    android:layout_gravity="center"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="30dp"
-                    android:text="0"
-                    android:inputType="number"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:textColor="@color/black"
-                    android:layout_marginRight="@dimen/dp_10"
-                    />
-                <TextView
-                    android:id="@+id/tv_length"
-                    android:layout_gravity="center"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="0"
-                    android:textColor="@color/blue_900"
-                    android:gravity="center"
-                    android:textSize="@dimen/textsize_20">
-                </TextView>
-            </LinearLayout>
-
-        </LinearLayout>
-
-
-    </LinearLayout>
     <TextView
         android:id="@+id/tv_gonema_code"
         android:layout_width="match_parent"

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

@@ -33,12 +33,13 @@
             android:id="@+id/ce_other"
             style="@style/EditTextLineStyle"
             android:layout_gravity="center"
-            android:layout_width="200dp"
+            android:layout_width="85dp"
             android:layout_height="@dimen/textsize_20"
             android:layout_weight="1"
-            android:layout_marginLeft="@dimen/dp_10"
             android:textColor="@color/black"
-            android:visibility="gone" />
+            android:padding="0dp"
+            android:text=""
+            android:visibility="gone"/>
 
         <AutoCompleteTextView
             android:id="@+id/ce_qty"

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

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