فهرست منبع

2021040079 撤销备料增加 库位 +供应商列表中文筛选提示系统错误bug

shuij 4 سال پیش
والد
کامیت
06b2c16089

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
         android:name=".application.PdaApplication"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
-        android:label="@string/app_name_test"
+        android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:allowBackup">

+ 2 - 1
app/src/main/java/com/uas/storage_manage/fragment/MaterialOutRevocationStockFragment.java

@@ -220,7 +220,8 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
                                         + ";数量:" + FastjsonUtil.getText(dataObject, "sumQty")
                                         + ";lotno:" + FastjsonUtil.getText(dataObject, "BI_LOTNO")
                                         + ";Datecode:" + FastjsonUtil.getText(dataObject, "BI_DATECODE")
-                                        + ";PO:" + FastjsonUtil.getText(dataObject, "BI_ORDERCODE");
+                                        + ";PO:" + FastjsonUtil.getText(dataObject, "BI_ORDERCODE")
+                                        + ";库位:" + FastjsonUtil.getText(dataObject, "BAR_LOCATION");
 
                                 if (mResultTextView != null) {
                                     mResultTextView.setText(barcodeResult);

+ 9 - 1
app/src/main/java/com/uas/storage_manage/fragment/SingleSelectionFragment.java

@@ -32,6 +32,8 @@ import com.uas.storage_manage.util.VollyRequest;
 import com.uas.storage_manage.view.ClearableEditText;
 import com.uas.storage_manage.view.EmptyLayout;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -316,9 +318,15 @@ public class SingleSelectionFragment extends BaseFragment implements HttpCallbac
     }
 
     private void getVendorList() {
+        String encode = null;
+        try {
+            encode = URLEncoder.encode(mKeyword ,"utf-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
-                        .url(GloableParams.ADDRESS_PDAIO_IN_GETVENDOR + "?condition=" + mKeyword
+                        .url(GloableParams.ADDRESS_PDAIO_IN_GETVENDOR + "?condition=" +encode
                                 + "&page=" + mPageIndex + "&pageSize=" + mPageSize)
                         .method(Request.Method.GET)
                         .flag(FLAG_PDAIO_IN_GETVENDOR)

+ 2 - 2
build.gradle

@@ -42,8 +42,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 30,
-            versionName      : "v3.0"
+            versionCode      : 32,
+            versionName      : "v3.2"
     ]
 
     depsVersion = [