1.0.14

app/build.gradle

@@ -9,7 +9,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.13"
+        versionName "1.0.14"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.13","enabled":true,"outputFile":"维科上料报工系统_v1.0.13.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.13.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.14","enabled":true,"outputFile":"维科上料报工系统_v1.0.14.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.14.apk","properties":{}}]

app/src/main/java/com/techscan/wk/model/AnalysisBarBean.java

@@ -11,8 +11,17 @@ public class AnalysisBarBean {
     private String packageNumber;//包装容器号/箱号
     private String Batch;
     private String quantity;
+    private String barQuantity;
     private String ext;
 
+    public String getBarQuantity() {
+        return barQuantity;
+    }
+
+    public void setBarQuantity(String barQuantity) {
+        this.barQuantity = barQuantity;
+    }
+
     public String getBarcode() {
         return barcode;
     }

app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java

@@ -470,11 +470,11 @@ public class ProReqActivity extends CommonFunctionActivity {
         }
 
         String packageNumber = barDataBean.getPackageNumber();
-        if (!TextUtils.isEmpty(quantity) && checkNumber(quantity) && packageNumber != null && !TextUtils.isEmpty(packageNumber)) {
+        if (!TextUtils.isEmpty(barDataBean.getBarQuantity()) && packageNumber != null && !TextUtils.isEmpty(packageNumber)) {
             //计算出当前箱号在明细中已扫描的数量
             Double hisScanNum = LitePal.where("zboxid = ? ", packageNumber).sum(ProReqDetailBean.class, "erfmg", double.class);
             double finalHisScanNum = hisScanNum;
-            double finalBarNum = Double.parseDouble(quantity);
+            double finalBarNum = Double.parseDouble(barDataBean.getBarQuantity());
             double finalCurrenScanNum = currenScanNum;
             HttpMethods.getInstance().getByzboxid(packageNumber, new BaseObserver<ResponseBody>(context) {
                 @Override

app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java

@@ -115,6 +115,7 @@ public class BarAnalysisUtils {
         bean.setPackageNumber(content3S);
         bean.setBatch(content1T);
         bean.setQuantity(contentQ);
+        bean.setBarQuantity(contentQ);
         bean.setExt(content14D);
 
         return bean;