数据采集页面增加新的刷新表格接口,用于岗位资源和提交时调用, 同时替换掉老接口的获取表格数据

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

@@ -133,7 +133,7 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
         String itemName = (String) gridItemList.get(position).get(DataSourceManager.KEY_GRID_ITEMNAME);
         Intent intent = new Intent(HomeActivity.this, FunctionActivity.class);
         switch (itemName) {
-            case GloableParams.WAREHOUSINGMANAGEMENT://扫一扫
+            case GloableParams.WAREHOUSINGMANAGEMENT://扫一扫 === (数据采集)
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
                 break;

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

@@ -1616,7 +1616,8 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 tv_dc_emcode.clearFocus();
                 ce_resources.clearFocus();
                 if (!ce_resources.getText().toString().trim().equals("线材目检")){
-                    getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
+//                    getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
+
 //                    getunhealthyDataList(ce_resources.getText().toString().trim());
 //                    recycleDataundesirable(ce_resources.getText().toString().trim());
                     recyclemaster_copyData(ce_resources.getText().toString().trim());//
@@ -1624,13 +1625,19 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                     recyclemaster_colorData(ce_resources.getText().toString().trim());
                 }
 
-                getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
+//                getTestcollectdata(tv_macode.getText().toString().trim(),ce_resources.getText().toString().trim());
+
 //                getunhealthyDataList(ce_resources.getText().toString().trim());
 //                recycleDataundesirable(ce_resources.getText().toString().trim());
                 setAdaptertwo(passFeededListQty);
                 recyclemaster_copyData(ce_resources.getText().toString().trim());//
                 recycleoriginal_copyData(ce_resources.getText().toString().trim());
                 recyclemaster_colorData(ce_resources.getText().toString().trim());
+
+                //刷新表格数据接口
+                if (!TextUtils.isEmpty(sc_code)) {
+                    getTableData(sc_code);
+                }
             }
 
             @Override
@@ -2349,6 +2356,9 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
                 recycleoriginal_copyData(sc_code);
                 recyclemaster_colorData(sc_code);
                 closeListPopupWindow();
+
+                //刷新表格数据接口
+                getTableData(sc_code);
             }
         });
 
@@ -2408,14 +2418,58 @@ public class DataCollectionFragment extends BaseFragment implements View.OnClick
 //
 //        });
 
-
     }
 
+    /**
+     * 提交后的表格数据
+     * */
+    private void getTableData(String sc_code) {
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADD_GET_REPAIRDATA)
+                .method(Request.Method.GET)
+                .addParam("sourcecode",sc_code)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+//                progressDialog.dismiss();
+                try {
+                    //返回三个参数sr_badname 不良现象,sr_ngqty 数量 ，SR_REASON原因
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    List<TestcollectDataBean> list=new ArrayList<>();
+                    list.clear();
+                    if (dataArray != null && dataArray.size() > 0) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                TestcollectDataBean jltStorageInBean = new TestcollectDataBean();
+                                jltStorageInBean.setSR_BADNAME(FastjsonUtil.getText(dataObject, "SR_BADNAME"));
+                                jltStorageInBean.setSR_REASON(FastjsonUtil.getText(dataObject, "SR_REASON"));
+                                jltStorageInBean.setSR_LOCATION(FastjsonUtil.getText(dataObject, "SR_LOCATION"));
+                                jltStorageInBean.setSR_NGQTY(FastjsonUtil.getText(dataObject, "SR_NGQTY"));
+                                list.add(jltStorageInBean);
+                            }
+                        }
+                    }
+                    mFilterStorageInBeans = list;
+                    setFilterTableData(mFilterStorageInBeans);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+//                progressDialog.dismiss();
+//                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
 
     /**
      * 关于物理线体弹框
      */
-
     private void initgetLinePopupWindow() {
         getLinePortAdapter = new GetLinePortAdapter(codeEntityArrayList);
         View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_line_pup, null);

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

@@ -481,10 +481,6 @@ public class GdTimeReportFragment extends BaseFragment {
                         mOlUnuseEt.setText("");//报废数
                         mOlRemarkEt.setText("");//备注
                         ed_pichi.requestFocus();
-
-
-
-
                     }
                 });
     }

app/src/main/java/com/uas/hycollection/global/GloableParams.java

@@ -342,6 +342,8 @@ public class GloableParams {
 
     public static String ADD_GET_PERSONNEL_ID;        //获取人员编号接口
 
+    public static String ADD_GET_REPAIRDATA;        //数据采集提交表格接口
+
     /**
      * 新版设备管理
      */
@@ -377,6 +379,9 @@ public class GloableParams {
     //人员编号
     public static String ADDRESSTAIL_GET_PERSONNEL_ID="/api/pda/spm/getEmployee.action";
 
+    //数据采集提交表格
+    public static String ADDRESSTAIL_GET_REPAIRDATA="/api/pda/smt/getRepairData.action";
+
     //线别筛选
     private static final String ADDRESSTAIL_SPM_GETLINE = "/api/pda/spm/getLine.action";
     private static final String ADDRESSTAIL_SPM_GETBADINFO = "/api/pda/smt/getBadInfo.action";
@@ -1525,6 +1530,7 @@ public class GloableParams {
         GloableParams.ADDRESS_SPM_FUZZYSEARCHSOURCE= uriHead + GloableParams.ADDRESSTAIL_SPM_FUZZYSEARCHSOURCE;
         GloableParams.ADDRESS_SPM_FUZZYSEARCHBADCODE= uriHead + GloableParams.ADDRESSTAIL_SMT_FUZZY_FUZZYSEARCHBADCODE;
 
-        GloableParams.ADD_GET_PERSONNEL_ID= uriHead + GloableParams.ADDRESSTAIL_GET_PERSONNEL_ID;
+        GloableParams.ADD_GET_PERSONNEL_ID = uriHead + GloableParams.ADDRESSTAIL_GET_PERSONNEL_ID;
+        GloableParams.ADD_GET_REPAIRDATA = uriHead + GloableParams.ADDRESSTAIL_GET_REPAIRDATA;
     }
 }