修改岗位资源逻辑

app/src/main/AndroidManifest.xml

@@ -71,7 +71,8 @@
         </activity>
         <service android:name="com.uas.collection.webtcp.WebSocketService"
             />
-        <provider xmlns:tools="http://schemas.android.com/tools"
+        <provider
+            xmlns:tools="http://schemas.android.com/tools"
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.uas.collection.fileprovider"
             android:exported="false"

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

@@ -7,8 +7,17 @@ public class LinecodeBean {
     private String MA_CODE;
     private String PR_CODE;
     private String PR_DETAIL;
+    private String MA_ID;
     private boolean checked;
 
+    public String getMA_ID() {
+        return MA_ID;
+    }
+
+    public void setMA_ID(String MA_ID) {
+        this.MA_ID = MA_ID;
+    }
+
     public boolean getChecked() {
         return checked;
     }

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

@@ -100,6 +100,10 @@ public class BreakdownRepairFragment extends BaseFragment{
     private int mFocusId;
     private static final int SCAN_BARCODE_CODESD = 925;
     private ImageView iv_dc_emcode;
+    private String sc_codecollethree;
+    private String ma_id;
+    private TextView tv_gonema_code;
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_breakdownrepair;
@@ -127,6 +131,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         tv_dc_emcode = root.findViewById(R.id.tv_dc_emcode);
         iv_personnel_data = root.findViewById(R.id.iv_personnel_data);
         iv_dc_emcode = root.findViewById(R.id.iv_dc_emcode);
+        tv_gonema_code = root.findViewById(R.id.tv_gonema_code);
 //        ce_length.setEnabled(false);
 //        ce_length.setFocusable(false);
 //        ce_length.setKeyListener(null);//重点
@@ -355,7 +360,8 @@ public class BreakdownRepairFragment extends BaseFragment{
             }
         });
 
-
+        sc_codecollethree = SharedPreUtil.getString(mActivity, "sc_codecollethree", null);
+        at_station.setText(sc_codecollethree);
     }
     public void getOrImage(String em_code){
         progressDialog.show();
@@ -435,6 +441,7 @@ public class BreakdownRepairFragment extends BaseFragment{
                             bean.setMA_CODE(data.getString("MA_CODE"));
                             bean.setPR_CODE(data.getString("PR_CODE"));
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
+                            bean.setMA_ID(data.getString("MA_ID"));
 
                             linecodeBeanList.add(bean);
                         }
@@ -565,7 +572,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         String alonedatatwo = null;
         String alonedatathree = null;
         String Qtycetwo = null;
-        String ce_work_codetrim = ce_work_code.getText().toString().trim();
+        String ce_work_codetrim = tv_gonema_code.getText().toString().trim();
         String at_stationtrim = at_station.getText().toString().trim();
         ArrayList<StorageRechargeAloneBean> selectedItemone = myAdapterone.getSelectedItem();
         if (selectedItemone.size()==0){
@@ -671,7 +678,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         String alonedatatwo = null;
         String alonedatathree = null;
         String Qtycetwo = null;
-        String ce_work_codetrim = ce_work_code.getText().toString().trim();
+        String ce_work_codetrim = tv_gonema_code.getText().toString().trim();
         String at_stationtrim = at_station.getText().toString().trim();
         ArrayList<StorageRechargeAloneBean> selectedItemone = myAdapterone.getSelectedItem();
         if (selectedItemone.size()==0){
@@ -989,7 +996,7 @@ public class BreakdownRepairFragment extends BaseFragment{
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 List<LinecodeBean> ipAndPortBeans = ipAndlinecodePortAdapter.getmList();
                 ma_code = ipAndPortBeans.get(position).getMA_CODE();
-
+                ma_id = ipAndPortBeans.get(position).getMA_ID();
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -1003,7 +1010,8 @@ public class BreakdownRepairFragment extends BaseFragment{
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ce_work_code.setText(ma_code);
+                ce_work_code.setText(ma_id);
+                tv_gonema_code.setText(ma_code);
                 closeListPopupWindow();
             }
         });
@@ -1126,6 +1134,9 @@ public class BreakdownRepairFragment extends BaseFragment{
             @Override
             public void onClick(View v) {
                 at_station.setText(sc_code);
+                if (!StringUtil.isEmpty(sc_code)){
+                    SharedPreUtil.saveString(mActivity,"sc_codecollethree",sc_code);
+                }
                 closeListPopupWindow();
             }
         });
@@ -1530,7 +1541,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         }
         @Override
         protected void convert(BaseViewHolder helper, LinecodeBean item) {
-            helper.setText(R.id.macode_ip__Tv,item.getMA_CODE()+"-"+item.getPR_CODE()+"-"+item.getPR_DETAIL());
+            helper.setText(R.id.macode_ip__Tv,item.getMA_ID()+"-"+item.getMA_CODE()+"-"+item.getPR_CODE()+"-"+item.getPR_DETAIL());
             LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
             if (item.getChecked()) {
                 line_true.setSelected(true);

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

@@ -136,6 +136,12 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     private RecyclerView rv_datapassqty;
     private ArrayList<StorageRechargeAloneBean> passFeededListQty;
     private SelectAdapterQty selectAdapterQty;
+    private String sc_codecolleone;
+    private String ma_id;
+    private TextView tv_macode;
+    private String va_codechushihua;
+    private String st_remarkce;
+    private List<String> listce;
 
     @Override
     protected int getLayout() {
@@ -177,6 +183,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         iv_dc_emcode = root.findViewById(R.id.iv_dc_emcode);
         rv_datachange = root.findViewById(R.id.rv_datachange);
         rv_datapassqty = root.findViewById(R.id.rv_datapassqty);
+        tv_macode = root.findViewById(R.id.tv_macode);
 
         mFilterStorageInBeans = Collections.synchronizedList(new ArrayList<>());
 
@@ -186,13 +193,14 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         myAdapter = new ComListAdapter(mList);
         myAdapter.setmList(mList);
         rv_data.setAdapter(myAdapter);
-        em_name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMNAME,null);
-        tv_em_name.setText("人员名称："+ em_name);
+        em_name = SharedPreUtil.getString(mActivity, Constants.FLAG.CACHE_USER_EMCODE,null);
+        tv_em_name.setText("人员编号："+ em_name);
 
     }
 
     @Override
     protected void initDatas() {
+        resourcesBeanList = new ArrayList<>();
         WindowManager wm = mActivity.getWindowManager();
         int screenWith = wm.getDefaultDisplay().getWidth()/3;
         mSmartTable.getConfig().setMinTableWidth(screenWith)
@@ -271,6 +279,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 et_linecode_smts.requestFocus();
             }
         });
+        linecodeBeanList = new ArrayList<>();
         iv_popuwindow.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -322,6 +331,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 
             }
         });
+        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(resourcesBeanList);
         iv_resources.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -390,7 +400,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 getNewData();
             }
         });
-
+        ipAndunhealthyPortAdapter = new IpAndunhealthyPortAdapter(resourcesBeanList);
         tv_dc_emcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -424,6 +434,23 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             }
         });
 
+
+        sc_codecolleone = SharedPreUtil.getString(mActivity, "sc_codecolleone", null);
+        ce_resources.setText(sc_codecolleone);
+        tv_station.setText(sc_codecolleone);
+        va_codechushihua = ce_resources.getText().toString().trim();
+        listce = new ArrayList<>();
+            getfuzzySearchSourceData(va_codechushihua,"不良");
+//            for (int i=0;i<resourcesBeanList.size();i++){
+//                st_remarkce = resourcesBeanList.get(i).getST_REMARK();
+//            }
+
+
+
+
+
+
+
     }
     private void handleFeededDataTwo(JSONArray dataArray) {
         StorageRechargeAloneBean bean;
@@ -516,6 +543,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         LogUtil.i("mList", JSON.toJSONString(mList));
         selectAdapter = new SelectAdapter(mList);
         rv_datachange.setAdapter(selectAdapter);
+        selectAdapter.notifyDataSetChanged();
     }
 
     private class ComDataBean{
@@ -661,7 +689,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         }
         @Override
         protected void convert(BaseViewHolder helper, LinecodeBean item) {
-            helper.setText(R.id.macode_ip__Tv,item.getMA_CODE()+"-"+item.getPR_CODE()+"-"+item.getPR_DETAIL());
+            helper.setText(R.id.macode_ip__Tv,item.getMA_ID()+"-"+item.getMA_CODE()+"-"+item.getPR_CODE()+"-"+item.getPR_DETAIL());
             LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
             if (item.getChecked()) {
                 line_true.setSelected(true);
@@ -768,6 +796,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                             bean.setMA_CODE(data.getString("MA_CODE"));
                             bean.setPR_CODE(data.getString("PR_CODE"));
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
+                            bean.setMA_ID(data.getString("MA_ID"));
 
                             linecodeBeanList.add(bean);
                         }
@@ -846,16 +875,32 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                             for(Object index:dataArrayone){
                                 JSONObject data = (JSONObject) index;
                                 String st_remark = data.getString("ST_REMARK");
-                                if (st_remark.contains("|")){
-                                    String[] split = st_remark.split("\\|");
-                                    for (int i=0;i<split.length;i++){
-                                        ResourcesBean bean = new ResourcesBean();
-                                        bean.setST_REMARK(split[i]);
-                                        resourcesBeanList.add(bean);
-                                    }
+                                if (!StringUtil.isEmpty(st_remark)){
+                                    if (st_remark.contains("|")){
+                                        String[] split = st_remark.split("\\|");
+                                        for (int i=0;i<split.length;i++){
+                                            ResourcesBean bean = new ResourcesBean();
+                                            bean.setST_REMARK(split[i]);
+                                            resourcesBeanList.add(bean);
+                                        }
 
+                                    }
                                 }
+
+                            }
+                            JSONObject jsonObjectce = new JSONObject();
+                            JSONArray jsonArrayce = new JSONArray();
+                            JSONObject object_1ce = new JSONObject();
+                            for (int i = 0; i< resourcesBeanList.size(); i++){
+                                StorageRechargeAloneBean bean=new StorageRechargeAloneBean(resourcesBeanList.get(i).getST_REMARK());
+                                object_1ce.put("alone", resourcesBeanList.get(i).getST_REMARK());
+                                Log.e("listce===",resourcesBeanList.get(i).getST_REMARK()+"!");
+                                jsonArrayce.add(bean);
                             }
+
+                            jsonObjectce.put("formStore", jsonArrayce);
+                            JSONArray dataArrayce = FastjsonUtil.getJSONArray(jsonObjectce.toString(), "formStore");
+                            handleFeededData(dataArrayce);
                             ipAndunhealthyPortAdapter.setmList(resourcesBeanList);
                             ipAndunhealthyPortAdapter.notifyDataSetChanged();
                         }else {
@@ -960,7 +1005,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
     }
     String ec_passqtytrim;
     public void getNewData(){
-        String ce_work_codetrim = et_linecode_smts.getText().toString().trim();
+        String ce_work_codetrim = tv_macode.getText().toString().trim();
         String at_stationtrim = ce_resources.getText().toString().trim();
         String ce_bit_numbertrim = ce_bit_number.getText().toString().trim();
         if (ce_bit_numbertrim.isEmpty()){
@@ -1010,7 +1055,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastYESRepeat(mActivity, "保存成功");
-                getTestcollectdata(et_linecode_smts.getText().toString().trim(),ce_resources.getText().toString().trim());
+                getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
             }
 
             @Override
@@ -1027,7 +1072,7 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
      * 关于工单号弹框
      */
     private void initlinecodePopupWindow() {
-        linecodeBeanList = new ArrayList<>();
+
         ipAndlinecodePortAdapter = new IpAndlinecodePortAdapter(linecodeBeanList);
         View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_edit_pup, null);
         edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
@@ -1062,12 +1107,15 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         });
 
         ipAndlinecodePortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 List<LinecodeBean> ipAndPortBeans = ipAndlinecodePortAdapter.getmList();
                 ma_code = ipAndPortBeans.get(position).getMA_CODE();
                 pr_code = ipAndPortBeans.get(position).getPR_CODE();
                 pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
+                ma_id = ipAndPortBeans.get(position).getMA_ID();
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -1081,9 +1129,10 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                et_linecode_smts.setText(ma_code);
+                et_linecode_smts.setText(ma_id);
                 tv_pr_code.setText("产品编号  "+pr_code);
                 tv_pr_detail.setText("产品名称  "+pr_detail);
+                tv_macode.setText(""+ma_code);
                 closeListPopupWindow();
             }
         });
@@ -1153,8 +1202,8 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
      * 关于岗位资源弹框
      */
     private void initresourcesPopupWindow() {
-        resourcesBeanList = new ArrayList<>();
-        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(resourcesBeanList);
+
+
         View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_edit_pup, null);
         edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
         TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
@@ -1209,6 +1258,10 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
             public void onClick(View v) {
                 list.clear();
                 ce_resources.setText(sc_code);
+                if (!StringUtil.isEmpty(sc_code)){
+                    SharedPreUtil.saveString(mActivity,"sc_codecolleone",sc_code);
+                }
+
                 tv_station.setText("当前岗位："+sc_code);
                 if (!StringUtil.isEmpty(st_remark)){
                     if (st_remark.contains("|")){
@@ -1217,22 +1270,19 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                     }else {
                         list.add(st_remark);
                     }
-                    JSONObject jsonObject = new JSONObject();
-                    JSONArray jsonArray = new JSONArray();
-                    JSONObject object_1 = new JSONObject();
-                    for (int i=0;i<list.size();i++){
-                        StorageRechargeAloneBean bean=new StorageRechargeAloneBean(list.get(i));
-                        object_1.put("alone", list.get(i));
-                        jsonArray.add(bean);
-                    }
-
-                    jsonObject.put("formStore", jsonArray);
-                    Log.e("alone===2",jsonObject.toString());
-
-                    JSONArray dataArray = FastjsonUtil.getJSONArray(jsonObject.toString(), "formStore");
-                    handleFeededData(dataArray);
+                }
+                JSONObject jsonObject = new JSONObject();
+                JSONArray jsonArray = new JSONArray();
+                JSONObject object_1 = new JSONObject();
+                for (int i=0;i<list.size();i++){
+                    StorageRechargeAloneBean bean=new StorageRechargeAloneBean(list.get(i));
+                    object_1.put("alone", list.get(i));
+                    jsonArray.add(bean);
                 }
 
+                jsonObject.put("formStore", jsonArray);
+                JSONArray dataArray = FastjsonUtil.getJSONArray(jsonObject.toString(), "formStore");
+                handleFeededData(dataArray);
 
 
                 closeListPopupWindow();
@@ -1301,134 +1351,6 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 
 
 
-    /**
-     * 关于不良现象弹框
-     */
-    private void initunhealthyPopupWindow() {
-        resourcesBeanList = new ArrayList<>();
-        ipAndunhealthyPortAdapter = new IpAndunhealthyPortAdapter(resourcesBeanList);
-        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_edit_pup, null);
-        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
-        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
-        TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
-        ImageView search_im = contView.findViewById(R.id.search_im);
-
-        RecyclerView rv_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
-        rv_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
-        rv_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
-        ipAndunhealthyPortAdapter.setmList(resourcesBeanList);
-        rv_ip_port_data.setAdapter(ipAndunhealthyPortAdapter);
-        getfuzzySearchSourceData(ce_resources.getText().toString().trim(),"不良");
-
-        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
-        editPW.setTouchable(true);
-        editPW.setBackgroundDrawable(new BitmapDrawable());
-        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                closeListPopupWindow();
-            }
-        });
-        View parentView = mActivity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
-        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
-        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
-        search_im.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getfuzzySearchSourceData(ce_resources.getText().toString().trim(),"不良");
-            }
-        });
-
-
-        ipAndunhealthyPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-
-            @Override
-            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                List<ResourcesBean> ipAndPortBeans = ipAndunhealthyPortAdapter.getmList();
-                st_remark = ipAndPortBeans.get(position).getST_REMARK();
-
-                for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                    ipAndPortBeans.get(i).setChecked(false);
-                }
-                ipAndPortBeans.get(position).setChecked(true);
-                ipAndunhealthyPortAdapter.notifyDataSetChanged();
-            }
-        });
-
-
-        //确定
-        sure_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                closeListPopupWindow();
-            }
-        });
-
-        //取消
-        cancle_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                closeListPopupWindow();
-            }
-        });
-
-
-        edit_et.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) { }
-            @Override
-            public void afterTextChanged(Editable s) {
-                if (resourcesBeanList.isEmpty()){
-                    getfuzzySearchSourceData(ce_resources.getText().toString().trim(),"不良");
-                }
-                if (s.length() >= 0) {
-                    String mSearchStr = s.toString().trim();
-                    LogUtil.i("mSearchStr",mSearchStr);
-                    List<ResourcesBean> thisList = new ArrayList<>();
-                    for(int i=0;i<resourcesBeanList.size();i++){
-                        if (!StringUtil.isEmpty(resourcesBeanList.get(i).getST_REMARK())){
-                            if(resourcesBeanList.get(i).getST_REMARK().contains(mSearchStr)){
-                                thisList.add(resourcesBeanList.get(i));
-                            }
-                            if(i == resourcesBeanList.size() -1){
-                                ipAndunhealthyPortAdapter = new IpAndunhealthyPortAdapter(thisList);
-                                rv_ip_port_data.setAdapter(ipAndunhealthyPortAdapter);
-                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
-                            }
-                        }
-
-                    }
-                    ipAndunhealthyPortAdapter.notifyDataSetChanged();
-
-                } else {
-
-                    ipAndunhealthyPortAdapter = new IpAndunhealthyPortAdapter(resourcesBeanList);
-                    rv_ip_port_data.setAdapter(ipAndunhealthyPortAdapter);
-
-                }
-                ipAndunhealthyPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-                    @Override
-                    public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                        List<ResourcesBean> ipAndPortBeans = ipAndunhealthyPortAdapter.getmList();
-                        for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                            ipAndPortBeans.get(i).setChecked(false);
-                        }
-                        ipAndPortBeans.get(position).setChecked(true);
-                        ipAndunhealthyPortAdapter.notifyDataSetChanged();
-                    }
-                });
-            }
-
-        });
-
-
-    }
-
-
-
     public class SelectAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         private int checkedPosition = -1;
         private boolean onBind;

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

@@ -98,6 +98,10 @@ public class StorageRechargeListFragment extends BaseFragment{
     private RecyclerView rv_two;
     private SelectAdaptertwo myAdaptertwo;
     private ArrayList<StorageRechargeAloneBean>  mFeededListtwo;
+    private String sc_codecolletwo;
+    private String ma_id;
+    private TextView tv_gonema_code;
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_storage_recharge_list;
@@ -128,6 +132,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         iv_personnel_data = root.findViewById(R.id.iv_personnel_data);
         iv_dc_emcode = root.findViewById(R.id.iv_dc_emcode);
         rv_two = root.findViewById(R.id.rv_datachangetwo);
+        tv_gonema_code = root.findViewById(R.id.tv_gonema_code);
 
 
 //        ce_length.setEnabled(false);
@@ -404,6 +409,12 @@ public class StorageRechargeListFragment extends BaseFragment{
             }
         });
 
+
+        sc_codecolletwo = SharedPreUtil.getString(mActivity, "sc_codecolletwo", null);
+        at_station.setText(sc_codecolletwo);
+
+
+
     }
     public void getOrImage(String em_code){
         progressDialog.show();
@@ -482,7 +493,7 @@ public class StorageRechargeListFragment extends BaseFragment{
                             bean.setMA_CODE(data.getString("MA_CODE"));
                             bean.setPR_CODE(data.getString("PR_CODE"));
                             bean.setPR_DETAIL(data.getString("PR_DETAIL"));
-
+                            bean.setMA_ID(data.getString("MA_ID"));
                             linecodeBeanList.add(bean);
                         }
                         ipAndlinecodePortAdapter.setmList(linecodeBeanList);
@@ -631,7 +642,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         String input_Aloneda = null;
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
-        String ce_work_codetrim = ce_work_code.getText().toString().trim();
+        String ce_work_codetrim = tv_gonema_code.getText().toString().trim();
         String at_stationtrim = at_station.getText().toString().trim();
         ArrayList<StorageRechargeAloneBean> selectedItem = myAdapter.getSelectedItem();
         if (selectedItem.size()==0){
@@ -705,7 +716,7 @@ public class StorageRechargeListFragment extends BaseFragment{
 
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
-        String ce_work_codetrim = ce_work_code.getText().toString().trim();
+        String ce_work_codetrim = tv_gonema_code.getText().toString().trim();
         String at_stationtrim = at_station.getText().toString().trim();
         ArrayList<StorageRechargeAloneBean> selectedItem = myAdapter.getSelectedItem();
         if (selectedItem.size()==0){
@@ -818,7 +829,7 @@ public class StorageRechargeListFragment extends BaseFragment{
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 List<LinecodeBean> ipAndPortBeans = ipAndlinecodePortAdapter.getmList();
                 ma_code = ipAndPortBeans.get(position).getMA_CODE();
-
+                ma_id = ipAndPortBeans.get(position).getMA_ID();
                 for (int i = 0; i < ipAndPortBeans.size(); i++) {
                     ipAndPortBeans.get(i).setChecked(false);
                 }
@@ -832,7 +843,8 @@ public class StorageRechargeListFragment extends BaseFragment{
         sure_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ce_work_code.setText(ma_code);
+                ce_work_code.setText(ma_id);
+                tv_gonema_code.setText(ma_code);
                 closeListPopupWindow();
             }
         });
@@ -955,6 +967,9 @@ public class StorageRechargeListFragment extends BaseFragment{
             @Override
             public void onClick(View v) {
                 at_station.setText(sc_code);
+                if (!StringUtil.isEmpty(sc_code)){
+                    SharedPreUtil.saveString(mActivity,"sc_codecolletwo",sc_code);
+                }
                 closeListPopupWindow();
             }
         });
@@ -1257,7 +1272,7 @@ public class StorageRechargeListFragment extends BaseFragment{
         }
         @Override
         protected void convert(BaseViewHolder helper, LinecodeBean item) {
-            helper.setText(R.id.macode_ip__Tv,item.getMA_CODE()+"-"+item.getPR_CODE()+"-"+item.getPR_DETAIL());
+            helper.setText(R.id.macode_ip__Tv,item.getMA_ID()+"-"+item.getMA_CODE()+"-"+item.getPR_CODE()+"-"+item.getPR_DETAIL());
             LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
             if (item.getChecked()) {
                 line_true.setSelected(true);

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

@@ -300,4 +300,10 @@
 
 
     </LinearLayout>
+    <TextView
+        android:id="@+id/tv_gonema_code"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+    </TextView>
 </LinearLayout>

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

@@ -51,7 +51,7 @@
                                             <TextView
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
-                                                android:text="工单号"
+                                                android:text="工单ID"
                                                 android:layout_gravity="center"
                                                 android:textColor="@color/black">
                                             </TextView>
@@ -70,7 +70,7 @@
                                                         style="@style/EditTextLineStyle"
                                                         android:layout_height="30dp"
                                                         android:layout_marginLeft="23dp"
-                                                        android:hint="请输入工单号" />
+                                                        android:hint="请输入工单ID" />
 
                                                     <ImageView
                                                         android:id="@+id/iocout_smts"
@@ -92,7 +92,23 @@
                                                     android:src="@drawable/search_48" />
                                             </LinearLayout>
                                         </TableRow>
-
+                                        <TableRow>
+                                            <TextView
+                                                android:layout_width="wrap_content"
+                                                android:layout_height="wrap_content"
+                                                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:layout_gravity="center"
+                                                android:textColor="@color/black">
+                                            </TextView>
+                                        </TableRow>
                                         <LinearLayout
                                             android:layout_marginTop="@dimen/dp_10"
                                             android:orientation="horizontal"
@@ -291,7 +307,7 @@
                                     android:orientation="vertical"
                                     android:layout_width="0dp"
                                     android:layout_height="match_parent"
-                                    android:layout_weight="0.7"
+                                    android:layout_weight="0.8"
                                     android:layout_marginLeft="@dimen/textsize_20"
                                     android:layout_marginRight="@dimen/textsize_20">
                                     <TextView
@@ -304,8 +320,8 @@
                                     <ImageView
                                         android:id="@+id/iv_personnel_data"
                                         android:layout_width="match_parent"
-                                        android:layout_height="150dp"
-                                        android:scaleType="centerCrop"
+                                        android:layout_height="match_parent"
+                                        android:scaleType="fitXY"
                                         android:background="@drawable/bg_line_edittext">
                                     </ImageView>
                                     <android.support.v7.widget.RecyclerView

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

@@ -86,7 +86,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        android:text="工单号：">
+                        android:text="工单ID：">
                     </TextView>
 
                     <FrameLayout
@@ -98,7 +98,7 @@
                             android:id="@+id/ce_work_code"
                             style="@style/EditTextLineStyle"
                             android:layout_height="30dp"
-                            android:hint="请输入工单号" />
+                            android:hint="请输入工ID" />
 
                         <ImageView
                             android:id="@+id/iv_work_code"
@@ -277,7 +277,12 @@
 
 
     </LinearLayout>
-
+<TextView
+    android:id="@+id/tv_gonema_code"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone">
+</TextView>
 
 
 

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

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

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

@@ -300,4 +300,10 @@
 
 
     </LinearLayout>
+    <TextView
+        android:id="@+id/tv_gonema_code"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+    </TextView>
 </LinearLayout>

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

@@ -278,7 +278,12 @@
 
     </LinearLayout>
 
-
+    <TextView
+        android:id="@+id/tv_gonema_code"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+    </TextView>
 
 
 </LinearLayout>

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

@@ -1,4 +1,4 @@
-#Wed Jun 28 17:18:16 CST 2023
+#Tue Jul 25 17:55:54 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