物料整理

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.ygtx.emcs"
         minSdk 27
         targetSdk 31
-        versionCode 26
-        versionName "1.3.6"
+        versionCode 27
+        versionName "1.3.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/java/com/ygtx/emcs/activity/StockInNewActivity.java

@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -54,6 +55,7 @@ public class StockInNewActivity extends BaseActivity {
     private String from;
     private String erpInstockCode;
     private boolean isSubmit = true;
+    private boolean isResumed = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -332,15 +334,35 @@ public class StockInNewActivity extends BaseActivity {
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 1)
     public void onReceiveMsg(EventMessage message){
         if(message.getType() == 2){
-            if(StringUtils.isEmpty(erpInstockCode)){
-                erpInstockCode = message.getMessage();
-            }
-            if(!StringUtils.isEmpty(erpInstockCode)){
-                loadErpTask();
-            }
+            new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                if(StringUtils.isEmpty(erpInstockCode)){
+                    erpInstockCode = message.getMessage();
+                }
+                if(!StringUtils.isEmpty(erpInstockCode)){
+                    loadErpTask();
+                }
+            }, 1000);
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        isResumed = true;
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        isResumed = false;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
     @Override
     protected String getCommonTopTitle() {
         return "入库单信息";

app/src/main/java/com/ygtx/emcs/activity/StockOutNewActivity.java

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -43,6 +44,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 
 public class StockOutNewActivity extends BaseActivity {
@@ -613,12 +615,14 @@ public class StockOutNewActivity extends BaseActivity {
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 1)
     public void onReceiveMsg(EventMessage message){
         if(message.getType() == 3){
-            if(StringUtils.isEmpty(erpOutstockCode)){
-                erpOutstockCode = message.getMessage();
-            }
-            if(!StringUtils.isEmpty(erpOutstockCode)) {
-                loadErpTask(1);
-            }
+            new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                if(StringUtils.isEmpty(erpOutstockCode)){
+                    erpOutstockCode = message.getMessage();
+                }
+                if(!StringUtils.isEmpty(erpOutstockCode)) {
+                    loadErpTask(1);
+                }
+            }, 1000);
         }
     }
 
@@ -626,6 +630,7 @@ public class StockOutNewActivity extends BaseActivity {
     protected void onDestroy() {
         super.onDestroy();
         handler.removeCallbacks(runnable);
+        EventBus.getDefault().unregister(this);
     }
 
     @Override