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 {