增加工单物料核界面

app/src/main/java/com/uas/pda_smart_com_lg/fragment/WorkOrderMaterialCheckFragment.java

@@ -220,7 +220,7 @@ public class WorkOrderMaterialCheckFragment extends BaseFragment {
     private void fuzzySearch() {
         String url = null;
         try {
-            url = GloableParams.ADDRESS_OUTFUZZYSEARCH
+            url = GloableParams.ADDRESS_OUTFUZZYSEARCH2
                     + "?inoutNo=" + URLEncoder.encode(mNumEdittext.getText().toString().toLowerCase(), "utf-8");
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -267,10 +267,10 @@ public class WorkOrderMaterialCheckFragment extends BaseFragment {
         //发送请求至服务器进行确认
         String url = null;
         try {
-            url = GloableParams.ADDRESS_OUTGETPRODOUT
+            url = GloableParams.ADDRESS_OUTGETPRODOUT2
                     + "?inoutNo=" + URLEncoder.encode(inOutNoString, "utf-8");
         } catch (UnsupportedEncodingException e) {
-            url = GloableParams.ADDRESS_OUTGETPRODOUT
+            url = GloableParams.ADDRESS_OUTGETPRODOUT2
                     + "?inoutNo=" + inOutNoString;
             e.printStackTrace();
         }

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

@@ -79,7 +79,9 @@ public class GloableParams {
     public static String ADDRESS_MSDINOVEN;
     public static String ADDRESS_MSDOUTOVEN;
     public static String ADDRESS_OUTFUZZYSEARCH;
+    public static String ADDRESS_OUTFUZZYSEARCH2;
     public static String ADDRESS_OUTGETPRODOUT;
+    public static String ADDRESS_OUTGETPRODOUT2;
     public static String ADDRESS_CLEARGET;
     public static String ADDRESS_OUTGETOUTBAR;
 
@@ -538,7 +540,9 @@ public class GloableParams {
      */
     // 仓库管理:出库管理，页面一：材料出库采集单据页面
     private static final String ADDRESSTAIL_OUTFUZZYSEARCH = "/api/pda/outMaterial/fuzzySearch.action";
+    private static final String ADDRESSTAIL_OUTFUZZYSEARCH2 = "/api/pda/outMaterial/fuzzySearchCheck.action";
     private static final String ADDRESSTAIL_OUTGETPRODOUT = "/api/pda/outMaterial/getProdOut.action";
+    private static final String ADDRESSTAIL_OUTGETPRODOUT2= "/api/pda/outMaterial/getProdInOut.action";
     private static final String ADDRESSTAIL_OUT_GET_PRODOUT_STATUS = "/api/pda/outMaterial/getProdOutStatus.action";
     private static final String ADDRESSTAIL_CLEARGET = "/api/pda/common/clearGet.action";
     // 仓库管理:出库管理，页面二：材料出库采集页面
@@ -945,7 +949,9 @@ public class GloableParams {
         GloableParams.ADDRESS_MSDINOVEN = uriHead + GloableParams.ADDRESSTAIL_MSDINOVEN;
         GloableParams.ADDRESS_MSDOUTOVEN = uriHead + GloableParams.ADDRESSTAIL_MSDOUTOVEN;
         GloableParams.ADDRESS_OUTFUZZYSEARCH = uriHead + GloableParams.ADDRESSTAIL_OUTFUZZYSEARCH;
+        GloableParams.ADDRESS_OUTFUZZYSEARCH2 = uriHead + GloableParams.ADDRESSTAIL_OUTFUZZYSEARCH2;
         GloableParams.ADDRESS_OUTGETPRODOUT = uriHead + GloableParams.ADDRESSTAIL_OUTGETPRODOUT;
+        GloableParams.ADDRESS_OUTGETPRODOUT2 = uriHead + GloableParams.ADDRESSTAIL_OUTGETPRODOUT2;
         GloableParams.ADDRESS_CLEARGET = uriHead + GloableParams.ADDRESSTAIL_CLEARGET;
         GloableParams.ADDRESS_OUTGETOUTBAR = uriHead + GloableParams.ADDRESSTAIL_OUTGETOUTBAR;
         GloableParams.ADDRESS_INFUZZYSEARCH = uriHead + GloableParams.ADDRESSTAIL_INFUZZYSEARCH;

build.gradle

@@ -43,8 +43,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 33,
-            versionName      : "v2.3.9"
+            versionCode      : 34,
+            versionName      : "v2.4.0"
     ]
 
     depsVersion = [