From c31e74d12c4e19fb0929529ce2abe3546d97d429 Mon Sep 17 00:00:00 2001
From: FoxV <jp18752920760@163.com>
Date: Wed, 21 Sep 2022 21:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                          | 2 +-
 .../icspda/activity/DispatchListReturnActivity.java       | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5610e3f..2f35ad4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {compileSdkVersion 30
         applicationId "com.icssoft.icspda"
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 6
+        versionCode 9
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/icssoft/icspda/activity/DispatchListReturnActivity.java b/app/src/main/java/com/icssoft/icspda/activity/DispatchListReturnActivity.java
index a187557..5e14481 100644
--- a/app/src/main/java/com/icssoft/icspda/activity/DispatchListReturnActivity.java
+++ b/app/src/main/java/com/icssoft/icspda/activity/DispatchListReturnActivity.java
@@ -233,6 +233,12 @@ public class DispatchListReturnActivity extends AppCompatActivity {
                     @Override
                     public void run() {
                         DispatchIN();
+                        if (IsFinish==true){
+                            Looper.prepare();
+                            barWithNumber.setProgress(100);
+                            dialog.dismiss();
+                            IsFinish=false;
+                        }
                     }
                 }).start();
 
@@ -401,7 +407,7 @@ public class DispatchListReturnActivity extends AppCompatActivity {
 //        GetLotDataForDispatchReturn();//获得一条条码数据（含单据号）
         lotDatas = applicationModel.getData();
         for (Data lotData : lotDatas) {
-            lotData.setQuantity(HelpUtil.getAssignedFigures(lotData.getCurrentQty(),LoginActivity.DEFAULT_DECIMAL_FIGURE));
+            lotData.setQuantity(HelpUtil.getAssignedFigures(lotData.getQuantity(),LoginActivity.DEFAULT_DECIMAL_FIGURE));
         }
         boolean isExist = false;
         try {