已上料列表接口传参修改

app/src/main/java/com/uas/gdstorage/fragment/FeededListFragment.java

@@ -272,6 +272,10 @@ public class FeededListFragment extends BaseFragment {
             CommonUtil.toastNoRepeat(mActivity, "岗位资源为空");
             return;
         }
+        if (ma_code == null) {
+            CommonUtil.toastNoRepeat(mActivity, "工单号为空");
+            return;
+        }
         mFeededList.clear();
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
@@ -281,6 +285,7 @@ public class FeededListFragment extends BaseFragment {
                         .tag(TAG + "getLoadingData ")
                         .flag(0)
                         .addParam("sc_code", sc_code)
+                        .addParam("ma_code", ma_code)
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {

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

@@ -540,10 +540,10 @@ public class GloableParams {
      * 材料入库
      */
     // 仓库管理：入库管理，页面一：材料入库采集单据页面
-    private static String ADDRESSTAIL_INFUZZYSEARCH = "/api/pda/inMaterial/fuzzySearch.action";
-    private static String ADDRESSTAIL_INGETPRODIN = "/api/pda/inMaterial/getProdIn.action";
+    private static final String ADDRESSTAIL_INFUZZYSEARCH = "/api/pda/inMaterial/fuzzySearch.action";
+    private static final String ADDRESSTAIL_INGETPRODIN = "/api/pda/inMaterial/getProdIn.action";
     // 仓库管理：入库管理，页面二：材料入库采集页面
-    private static String ADDRESSTAIL_INGETINBAR = "";
+    private static final String ADDRESSTAIL_INGETINBAR = "";
 
     //材料入库确认采集
     private static final String ADDRESSTAIL_SAVE_BARCODE = "/api/pda/inMaterial/saveBarcode.action";
@@ -574,91 +574,91 @@ public class GloableParams {
     private static final String ADDRESSTAIL_OUTBYBATCH = "/api/pda/outMaterial/outByBatch.action";
     private static final String ADDRESSTAIL_OUT_BYBATCH_DEAL = "/api/pda/outMaterial/outByBatchDeal.action";
     //仓库管理：出库管理，已采集页面
-    private static String ADDRESSTAIL_OUT_DELETE_DETAIL = "/pda/out/deleteDetail.action";
-    private static String ADDRESSTAIL_OUT_DELETE_DETAIL_PRODCODE = "/api/pda/outMaterial/deleteDetailByProdcode.action";
-    private static String ADDRESSTAIL_OUT_DELETE_DETAIL_BATCH = "/api/pda/outMaterial/deleteDetailByBatch.action";
+    private static final String ADDRESSTAIL_OUT_DELETE_DETAIL = "/pda/out/deleteDetail.action";
+    private static final String ADDRESSTAIL_OUT_DELETE_DETAIL_PRODCODE = "/api/pda/outMaterial/deleteDetailByProdcode.action";
+    private static final String ADDRESSTAIL_OUT_DELETE_DETAIL_BATCH = "/api/pda/outMaterial/deleteDetailByBatch.action";
     //获取原材料出库采集方式配置
-    private static String ADDRESSTAIL_GET_FIELD_DATA = "/api/pda/common/getFieldData.action";
+    private static final String ADDRESSTAIL_GET_FIELD_DATA = "/api/pda/common/getFieldData.action";
     //材料出库自由采集
-    private static String ADDRESSTAIL_OUT_MATERIAL_FREEOUT = "/api/pda/outMaterial/freeOut.action";
+    private static final String ADDRESSTAIL_OUT_MATERIAL_FREEOUT = "/api/pda/outMaterial/freeOut.action";
     //获取材料出库待采集数据
-    private static String ADDRESSTAIL_OUT_NEED_GET_LIST = "/api/pda/outMaterial/getNeedGetList.action";
-    private static String ADDRESSTAIL_OUT_SAVE_BARCODE = "/api/pda/outMaterial/saveAll.action";
-    private static String ADDRESSTAIL_OUT_NEED_GET_LIST_DEAL = "/api/pda/outMaterial/getNeedGetListDeal.action";
+    private static final String ADDRESSTAIL_OUT_NEED_GET_LIST = "/api/pda/outMaterial/getNeedGetList.action";
+    private static final String ADDRESSTAIL_OUT_SAVE_BARCODE = "/api/pda/outMaterial/saveAll.action";
+    private static final String ADDRESSTAIL_OUT_NEED_GET_LIST_DEAL = "/api/pda/outMaterial/getNeedGetListDeal.action";
     //材料出库获取下一采集货品信息
-    private static String ADDRESSTAIL_OUT_GET_NEXT_PRODCODE = "/api/pda/outMaterial/getNextByProdcode.action";
-    private static String ADDRESSTAIL_OUT_GET_NEXT_BATCH = "/api/pda/outMaterial/getNextByBatch.action";
-    private static String ADDRESSTAIL_OUT_GET_NEXT_BATCH_DEAL = "/api/pda/outMaterial/getNextByBatchDeal.action";
+    private static final String ADDRESSTAIL_OUT_GET_NEXT_PRODCODE = "/api/pda/outMaterial/getNextByProdcode.action";
+    private static final String ADDRESSTAIL_OUT_GET_NEXT_BATCH = "/api/pda/outMaterial/getNextByBatch.action";
+    private static final String ADDRESSTAIL_OUT_GET_NEXT_BATCH_DEAL = "/api/pda/outMaterial/getNextByBatchDeal.action";
     //材料出库撤销备料
-    private static String ADDRESSTAIL_OUT_MATERIAL_DELETE_DETAIL = "/api/pda/outMaterial/deleteDetail.action";
-    private static String ADDRESSTAIL_OUT_MATERIAL_DELETE_DETAIL_DEAL = "/api/pda/outMaterial/deleteDetailDeal.action";
+    private static final String ADDRESSTAIL_OUT_MATERIAL_DELETE_DETAIL = "/api/pda/outMaterial/deleteDetail.action";
+    private static final String ADDRESSTAIL_OUT_MATERIAL_DELETE_DETAIL_DEAL = "/api/pda/outMaterial/deleteDetailDeal.action";
     //材料出库修改数量获取条码信息
-    private static String ADDRESSTAIL_OUT_MATERIAL_GET_BARCODE_DATA = "/api/pda/outMaterial/getBarcodeData.action";
-    private static String ADDRESSTAIL_SMT_GET_BARCODE_DATA = "/api/pda/smt/getBarcodeData.action";
+    private static final String ADDRESSTAIL_OUT_MATERIAL_GET_BARCODE_DATA = "/api/pda/outMaterial/getBarcodeData.action";
+    private static final String ADDRESSTAIL_SMT_GET_BARCODE_DATA = "/api/pda/smt/getBarcodeData.action";
     //材料出库修改数量提交接口
-    private static String ADDRESSTAIL_OUT_MATERIAL_UPDATE_BARCODE = "/api/pda/outMaterial/updateBarCodeQty.action";
-    private static String ADDRESSTAIL_SMT_UPDATE_BARCODE = "/api/pda/smt/updateBarCodeQty.action";
+    private static final String ADDRESSTAIL_OUT_MATERIAL_UPDATE_BARCODE = "/api/pda/outMaterial/updateBarCodeQty.action";
+    private static final String ADDRESSTAIL_SMT_UPDATE_BARCODE = "/api/pda/smt/updateBarCodeQty.action";
     //材料出库特殊出库确认接口
-    private static String ADDRESSTAIL_OUT_MATERIAL_SPECIAL_OUT = "/api/pda/outMaterial/specialOut.action";
-    private static String ADDRESSTAIL_OUT_MATERIAL_SPECIAL_OUT_DEAL = "/api/pda/outMaterial/specialOutDeal.action";
-    private static String ADDRESSTAIL_OUT_MATERIAL_SPECIAL_OUT_BREAK = "/api/pda/outMaterial/specialOutBreaking.action";
+    private static final String ADDRESSTAIL_OUT_MATERIAL_SPECIAL_OUT = "/api/pda/outMaterial/specialOut.action";
+    private static final String ADDRESSTAIL_OUT_MATERIAL_SPECIAL_OUT_DEAL = "/api/pda/outMaterial/specialOutDeal.action";
+    private static final String ADDRESSTAIL_OUT_MATERIAL_SPECIAL_OUT_BREAK = "/api/pda/outMaterial/specialOutBreaking.action";
 
     /**
      * 完工品入库
      */
     //完工品入库
-    private static String ADDRESSTAIL_IN_FINISH_SAVEALL = "/api/pda/inFinish/saveAll.action";
+    private static final String ADDRESSTAIL_IN_FINISH_SAVEALL = "/api/pda/inFinish/saveAll.action";
     //完工品入库模糊查询
-    private static String ADDRESSTAIL_IN_FINISH_FUZZYSEARCH = "/api/pda/inFinish/fuzzySearch.action";
+    private static final String ADDRESSTAIL_IN_FINISH_FUZZYSEARCH = "/api/pda/inFinish/fuzzySearch.action";
     //完工品入库单据信息获取
-    private static String ADDRESSTAIL_IN_FINISH_GET_PRODIN = "/api/pda/inFinish/getProdIn.action";
+    private static final String ADDRESSTAIL_IN_FINISH_GET_PRODIN = "/api/pda/inFinish/getProdIn.action";
     //完工品入库确认采集
-    private static String ADDRESSTAIL_IN_FINISH_SAVE = "/api/pda/inFinish/save.action";
+    private static final String ADDRESSTAIL_IN_FINISH_SAVE = "/api/pda/inFinish/save.action";
     //完工品入库已采集列表删除
-    private static String ADDRESSTAIL_IN_FINISH_DELETE_DETAIL = "/api/pda/inFinish/deleteDetail.action";
+    private static final String ADDRESSTAIL_IN_FINISH_DELETE_DETAIL = "/api/pda/inFinish/deleteDetail.action";
     //仓库管理：入库管理，完工品入库管理页面
-    private static String ADDRESSTAIL_IN_FINISH_NEEDGET = "/api/pda/inFinish/getNeedGetList.action";
+    private static final String ADDRESSTAIL_IN_FINISH_NEEDGET = "/api/pda/inFinish/getNeedGetList.action";
 
     /**
      * 完工品出库
      */
     //完工品出库模糊查询
-    private static String ADDRESSTAIL_OUT_FINISH_FUZZY_SEARCH = "/api/pda/outFinish/fuzzySearch.action";
+    private static final String ADDRESSTAIL_OUT_FINISH_FUZZY_SEARCH = "/api/pda/outFinish/fuzzySearch.action";
     //完工品出库确认事件
-    private static String ADDRESSTAIL_OUT_GET_FINISH_PROD_OUT = "/api/pda/outFinish/getProdOut.action";
+    private static final String ADDRESSTAIL_OUT_GET_FINISH_PROD_OUT = "/api/pda/outFinish/getProdOut.action";
     //完工品出库未采集明细
-    private static String ADDRESSTAIL_OUT_FINISH_NEED_GET_LIST = "/api/pda/outFinish/getNeedGetList.action";
+    private static final String ADDRESSTAIL_OUT_FINISH_NEED_GET_LIST = "/api/pda/outFinish/getNeedGetList.action";
     //完工品出库重新采集
-    private static String ADDRESSTAIL_OUT_FINISH_CLEAR_GET = "/api/pda/outFinish/clearGet.action";
+    private static final String ADDRESSTAIL_OUT_FINISH_CLEAR_GET = "/api/pda/outFinish/clearGet.action";
     //完工品出库已采集未提交数据提交
-    private static String ADDRESSTAIL_OUT_FINISH_OUT_ALL = "/api/pda/outFinish/saveAll.action";
+    private static final String ADDRESSTAIL_OUT_FINISH_OUT_ALL = "/api/pda/outFinish/saveAll.action";
     //完工品出库采集
-    private static String ADDRESSTAIL_OUT_FINISH_OUT = "/api/pda/outFinish/save.action";
+    private static final String ADDRESSTAIL_OUT_FINISH_OUT = "/api/pda/outFinish/save.action";
     //完工品出库已采集列表
-    private static String ADDRESSTAIL_OUT_FINISH_GET_SUBMIT = "/api/pda/outFinish/getHaveSubmitList.action";
+    private static final String ADDRESSTAIL_OUT_FINISH_GET_SUBMIT = "/api/pda/outFinish/getHaveSubmitList.action";
     //完工品出库已采集数据删除
-    private static String ADDRESSTAIL_OUT_FINISH_DELETE_DETAIL = "/api/pda/outFinish/deleteDetail.action";
+    private static final String ADDRESSTAIL_OUT_FINISH_DELETE_DETAIL = "/api/pda/outFinish/deleteDetail.action";
     //获取出库单列表
     private static final String ADDRESSTAIL_PDAIO_OUT_GETPOSTEDPRODINOUTLIST = "/api/pdaio/pdaioOut/getPostedProdinoutList.action";
 
     /**
      * 收料
      */
-    private static String ADDRESSTAIL_RECHARGE_GETDATA_BARCODE = "/api/pda/acceptNToVerify/getDataByBar.action";
-    private static String ADDRESSTAIL_RECHARGE_TURN_VERIFY = "/api/pda/acceptNToVerify/turnVerify.action";
-    private static String ADDRESSTAIL_RECHARGE_GETLIST_NEEDGET = "/api/pda/acceptNToVerify/getNeedGetList.action";
+    private static final String ADDRESSTAIL_RECHARGE_GETDATA_BARCODE = "/api/pda/acceptNToVerify/getDataByBar.action";
+    private static final String ADDRESSTAIL_RECHARGE_TURN_VERIFY = "/api/pda/acceptNToVerify/turnVerify.action";
+    private static final String ADDRESSTAIL_RECHARGE_GETLIST_NEEDGET = "/api/pda/acceptNToVerify/getNeedGetList.action";
     /**
      * 送检
      */
-    private static String ADDRESSTAIL_INSPECTION_GETDATA_BARCODE = "/api/pda/verifyToQC/getDataByBar.action";
-    private static String ADDRESSTAIL_RECHARGE_TURN_QC = "/api/pda/acceptNToVerify/turnQC.action";
-    private static String ADDRESSTAIL_INSPECTION_GETLIST_NEEDGET = "/api/pda/verifyToQC/getNeedGetList.action";
+    private static final String ADDRESSTAIL_INSPECTION_GETDATA_BARCODE = "/api/pda/verifyToQC/getDataByBar.action";
+    private static final String ADDRESSTAIL_RECHARGE_TURN_QC = "/api/pda/acceptNToVerify/turnQC.action";
+    private static final String ADDRESSTAIL_INSPECTION_GETLIST_NEEDGET = "/api/pda/verifyToQC/getNeedGetList.action";
     /**
      * IQC入库
      */
-    private static String ADDRESSTAIL_IQC_GETDATA_BARCODE = "/api/pda/QCToPurcCheckin/getDataByBar.action";
-    private static String ADDRESSTAIL_IQC_TURN_PURC_STORAGE = "/api/pda/QCToPurcCheckin/turnPurcStorage.action";
-    private static String ADDRESSTAIL_IQC_GETLIST_NEEDGET = "/api/pda/QCToPurcCheckin/getNeedGetList.action";
+    private static final String ADDRESSTAIL_IQC_GETDATA_BARCODE = "/api/pda/QCToPurcCheckin/getDataByBar.action";
+    private static final String ADDRESSTAIL_IQC_TURN_PURC_STORAGE = "/api/pda/QCToPurcCheckin/turnPurcStorage.action";
+    private static final String ADDRESSTAIL_IQC_GETLIST_NEEDGET = "/api/pda/QCToPurcCheckin/getNeedGetList.action";
 
     /**
      * 设置页面

pda_libs/pulltoreflashlibrary/build/generated/source/buildConfig/debug/com/handmark/pulltorefresh/library/BuildConfig.java

@@ -8,6 +8,6 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "com.handmark.pulltorefresh.library";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "v1.0";
+  public static final int VERSION_CODE = 11;
+  public static final String VERSION_NAME = "v1.1";
 }

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="1"
-    android:versionName="v1.0" >
+    android:versionCode="11"
+    android:versionName="v1.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/aapt/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.handmark.pulltorefresh.library"
-    android:versionCode="1"
-    android:versionName="v1.0" >
+    android:versionCode="11"
+    android:versionName="v1.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

pda_libs/pulltoreflashlibrary/build/intermediates/manifests/full/debug/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"v1.0","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"v1.1","enabled":true,"outputFile":"pulltoreflashlibrary-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.handmark.pulltorefresh.library","split":""}}]