From 9c23ce9f665c8629980b3e7f71b5e9f90c15157e Mon Sep 17 00:00:00 2001
From: ml <1522572907@qq.com>
Date: Wed, 13 Nov 2024 09:36:19 +0800
Subject: [PATCH] 1.0.14

---
 app/build.gradle                                         | 2 +-
 app/release/output.json                                  | 2 +-
 .../main/java/com/techscan/wk/model/AnalysisBarBean.java | 9 +++++++++
 .../java/com/techscan/wk/ui/proreq/ProReqActivity.java   | 4 ++--
 .../java/com/techscan/wk/utils/BarAnalysisUtils.java     | 1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c2e4577..4a168e5 100644
--- a/app/build.gradle
+++ b/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'
diff --git a/app/release/output.json b/app/release/output.json
index cebe078..a91a777 100644
--- a/app/release/output.json
+++ b/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":{}}]
\ No newline at end of file
+[{"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":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/techscan/wk/model/AnalysisBarBean.java b/app/src/main/java/com/techscan/wk/model/AnalysisBarBean.java
index 7f7da69..3ac1e4e 100644
--- a/app/src/main/java/com/techscan/wk/model/AnalysisBarBean.java
+++ b/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;
     }
diff --git a/app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java b/app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java
index 4b337b7..50fbf73 100644
--- a/app/src/main/java/com/techscan/wk/ui/proreq/ProReqActivity.java
+++ b/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
diff --git a/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java b/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java
index e69d4e4..01f4f18 100644
--- a/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java
+++ b/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;