From f4944eb4fe2a5ced8c859565fe2b9a3c93c2818d Mon Sep 17 00:00:00 2001
From: ml <1522572907@qq.com>
Date: Thu, 7 Nov 2024 12:05:31 +0800
Subject: [PATCH] 1.0.12

---
 app/build.gradle                              |   2 +-
 app/release/output.json                       |   2 +-
 app/src/main/assets/FlowReportWorkUI.json     |   2 +-
 app/src/main/assets/ReportWorkUI.json         |   2 +-
 app/src/main/assets/litepal.xml               |   2 +-
 .../com/techscan/wk/app/BaseApplication.java  |  11 +-
 .../com/techscan/wk/base/BaseActivity.java    |   2 +
 .../techscan/wk/model/ProReqOrdeTaskBean.java |  36 +++---
 .../techscan/wk/rxretrofit/BaseObserver.java  |  26 ++--
 .../techscan/wk/rxretrofit/HttpMethods.java   |   2 +-
 .../techscan/wk/ui/proreq/ProReqActivity.java |  61 +++++----
 .../ui/reportwork/FlowReportWorkActivity.java | 117 +++++++++++++-----
 12 files changed, 174 insertions(+), 91 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c444ebe..c5d4d7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.11"
+        versionName "1.0.12"
         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 d6b3417..4d6bdd4 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.11","enabled":true,"outputFile":"维科上料报工系统_v1.0.11.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.11.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.12","enabled":true,"outputFile":"维科上料报工系统_v1.0.12.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.12.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/assets/FlowReportWorkUI.json b/app/src/main/assets/FlowReportWorkUI.json
index 951a953..bbf3ac9 100644
--- a/app/src/main/assets/FlowReportWorkUI.json
+++ b/app/src/main/assets/FlowReportWorkUI.json
@@ -132,7 +132,7 @@
     "values": [],
     "mast": false,
     "canChange": true,
-    "isShow": false,
+    "isShow": true,
     "language": {
       "zh": "鎶ュ伐鏁伴噺",
       "en": "Quantity reported",
diff --git a/app/src/main/assets/ReportWorkUI.json b/app/src/main/assets/ReportWorkUI.json
index bf0a0f5..b00d0c9 100644
--- a/app/src/main/assets/ReportWorkUI.json
+++ b/app/src/main/assets/ReportWorkUI.json
@@ -78,7 +78,7 @@
     "values": [],
     "mast": false,
     "canChange": true,
-    "isShow": false,
+    "isShow": true,
     "language": {
       "zh": "鎶ュ伐鏁伴噺",
       "en": "Quantity reported",
diff --git a/app/src/main/assets/litepal.xml b/app/src/main/assets/litepal.xml
index 0a8ae3a..0542ff2 100644
--- a/app/src/main/assets/litepal.xml
+++ b/app/src/main/assets/litepal.xml
@@ -19,7 +19,7 @@
 			For example:
     	<version value="1" />
     -->
-    <version value="23" />
+    <version value="24" />
     <!--
     	Define your models in the list with mapping tag, LitePal will
     	create tables for each mapping class. The supported fields
diff --git a/app/src/main/java/com/techscan/wk/app/BaseApplication.java b/app/src/main/java/com/techscan/wk/app/BaseApplication.java
index be4315b..9c719c7 100644
--- a/app/src/main/java/com/techscan/wk/app/BaseApplication.java
+++ b/app/src/main/java/com/techscan/wk/app/BaseApplication.java
@@ -162,11 +162,11 @@ public class BaseApplication extends Application {
         Log.d("BaseApplication", "xCrash SDK init: end");
 
         // Send all pending crash log files.
-        new Thread(() -> {
-            for (File file : TombstoneManager.getAllTombstones()) {
-                sendThenDeleteCrashLog(file.getAbsolutePath(), null);
-            }
-        }).start();
+//        new Thread(() -> {
+//            for (File file : TombstoneManager.getAllTombstones()) {
+//                sendThenDeleteCrashLog(file.getAbsolutePath(), null);
+//            }
+//        }).start();
     }
 
     private void sendThenDeleteCrashLog(String logPath, String emergency) {
@@ -201,6 +201,7 @@ public class BaseApplication extends Application {
         requestJson.addProperty("pid", map.get("pid"));
         requestJson.addProperty("javaStacktrace", map.get("java stacktrace"));
         requestJson.addProperty("crashTime", map.get("Crash time"));
+        Log.e("seedErrorLog", "seedErrorLog");
         HttpMethods.getInstance().seedErrorLog(requestJson, new BaseObserver<ResponseBody>() {
             @Override
             protected void onSuccess(ResponseBody responseBody) {
diff --git a/app/src/main/java/com/techscan/wk/base/BaseActivity.java b/app/src/main/java/com/techscan/wk/base/BaseActivity.java
index 00969c0..30c0a37 100644
--- a/app/src/main/java/com/techscan/wk/base/BaseActivity.java
+++ b/app/src/main/java/com/techscan/wk/base/BaseActivity.java
@@ -54,6 +54,7 @@ public abstract class BaseActivity extends QMUIActivity implements NetBroadcastR
         isBody = body;
     }
 
+
     /**
      * 閫氳繃鍙嶅皠鎵ц澶栭儴鏂规硶
      *
@@ -122,6 +123,7 @@ public abstract class BaseActivity extends QMUIActivity implements NetBroadcastR
         super.onDestroy();
     }
 
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
diff --git a/app/src/main/java/com/techscan/wk/model/ProReqOrdeTaskBean.java b/app/src/main/java/com/techscan/wk/model/ProReqOrdeTaskBean.java
index 968c416..a3f727d 100644
--- a/app/src/main/java/com/techscan/wk/model/ProReqOrdeTaskBean.java
+++ b/app/src/main/java/com/techscan/wk/model/ProReqOrdeTaskBean.java
@@ -8,20 +8,20 @@ public class ProReqOrdeTaskBean extends LitePalSupport {
     @Column(defaultValue = "0")
     private Boolean complete;           //鏄惁瀹屾垚
     @Column(defaultValue = "0.00")
-    private Double completeNum;         //宸插畬鎴愭暟閲�
+    private double completeNum;         //宸插畬鎴愭暟閲�
     private long rowid;         //鑷畾涔夎id
     private String aufnr;//璁㈠崟鍙�
     private String ausch;//閮ㄤ欢搴熷搧鐧惧垎鏁�
-    private Double bdmng;//缁勪欢鐢ㄩ噺 //浠诲姟鏁伴噺
-    private Double bmeng;//鍩烘湰鏁伴噺
-    private Double enmng;//鎻愯揣鏁�
+    private double bdmng;//缁勪欢鐢ㄩ噺 //浠诲姟鏁伴噺
+    private double bmeng;//鍩烘湰鏁伴噺
+    private double enmng;//鎻愯揣鏁�
     private String erfme;//缁勪欢鍗曚綅
-    private Double erfmg;//缁勪欢鐢ㄩ噺锛圔OM鍗曚綅锛�
+    private double erfmg;//缁勪欢鐢ㄩ噺锛圔OM鍗曚綅锛�
     private String lgort;//搴撳瓨鍦扮偣
     private String lgortName;//搴撳瓨鍦扮偣鍚嶇О
     private String matnr;//缁勪欢鐗╂枡缂栫爜
     private String meins;//缁勪欢鍗曚綅 //浠诲姟鏁伴噺鐢ㄥ埌鐨勫崟浣�
-    private Double menge;//鍗曚綅鐢ㄩ噺
+    private double menge;//鍗曚綅鐢ㄩ噺
     private String posnr;//琛岄」鐩�
     private String rgekz;//鍙嶅啿
     private String rsnum;//棰勭暀鍙�
@@ -61,11 +61,11 @@ public class ProReqOrdeTaskBean extends LitePalSupport {
         this.complete = complete;
     }
 
-    public Double getCompleteNum() {
+    public double getCompleteNum() {
         return completeNum;
     }
 
-    public void setCompleteNum(Double completeNum) {
+    public void setCompleteNum(double completeNum) {
         this.completeNum = completeNum;
     }
 
@@ -85,27 +85,27 @@ public class ProReqOrdeTaskBean extends LitePalSupport {
         this.ausch = ausch;
     }
 
-    public Double getBdmng() {
+    public double getBdmng() {
         return bdmng;
     }
 
-    public void setBdmng(Double bdmng) {
+    public void setBdmng(double bdmng) {
         this.bdmng = bdmng;
     }
 
-    public Double getBmeng() {
+    public double getBmeng() {
         return bmeng;
     }
 
-    public void setBmeng(Double bmeng) {
+    public void setBmeng(double bmeng) {
         this.bmeng = bmeng;
     }
 
-    public Double getEnmng() {
+    public double getEnmng() {
         return enmng;
     }
 
-    public void setEnmng(Double enmng) {
+    public void setEnmng(double enmng) {
         this.enmng = enmng;
     }
 
@@ -117,11 +117,11 @@ public class ProReqOrdeTaskBean extends LitePalSupport {
         this.erfme = erfme;
     }
 
-    public Double getErfmg() {
+    public double getErfmg() {
         return erfmg;
     }
 
-    public void setErfmg(Double erfmg) {
+    public void setErfmg(double erfmg) {
         this.erfmg = erfmg;
     }
 
@@ -149,11 +149,11 @@ public class ProReqOrdeTaskBean extends LitePalSupport {
         this.meins = meins;
     }
 
-    public Double getMenge() {
+    public double getMenge() {
         return menge;
     }
 
-    public void setMenge(Double menge) {
+    public void setMenge(double menge) {
         this.menge = menge;
     }
 
diff --git a/app/src/main/java/com/techscan/wk/rxretrofit/BaseObserver.java b/app/src/main/java/com/techscan/wk/rxretrofit/BaseObserver.java
index dad640e..dcf309a 100644
--- a/app/src/main/java/com/techscan/wk/rxretrofit/BaseObserver.java
+++ b/app/src/main/java/com/techscan/wk/rxretrofit/BaseObserver.java
@@ -102,18 +102,28 @@ public abstract class BaseObserver<T> implements Observer<T> {
 
     private void showProgressDialog() {
         if (context == null)return;
-        qmuiTipDialog = new QMUITipDialog.Builder(context).setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
-                .setTipWord(context.getString(R.string.Loading))
-                .create();
-        qmuiTipDialog.setCancelable(false);
-        qmuiTipDialog.setCanceledOnTouchOutside(false);
-        qmuiTipDialog.show();
+        if(isContextExisted(context)){
+            qmuiTipDialog = new QMUITipDialog.Builder(context).setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                    .setTipWord(context.getString(R.string.Loading))
+                    .create();
+            qmuiTipDialog.setCancelable(false);
+            qmuiTipDialog.setCanceledOnTouchOutside(false);
+            qmuiTipDialog.show();
+        }
+
     }
 
     private void closeProgressDialog() {
         if (qmuiTipDialog == null) return;
-        if (qmuiTipDialog.isShowing())
-            qmuiTipDialog.dismiss();
+        try {
+            if(isContextExisted(context)){
+                if (qmuiTipDialog.isShowing())
+                    qmuiTipDialog.dismiss();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
     /**
diff --git a/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java b/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java
index 9520d76..e40f327 100644
--- a/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java
+++ b/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java
@@ -105,7 +105,7 @@ public class HttpMethods {
                 .retryOnConnectionFailure(true)
                 .writeTimeout(TIME_OUT, TimeUnit.SECONDS)
                 .connectTimeout(TIME_OUT_CONN, TimeUnit.SECONDS)
-                .readTimeout(TIME_OUT_CONN, TimeUnit.SECONDS)
+                .readTimeout(TIME_OUT_CONN * 5, TimeUnit.SECONDS)
                 .build();
 
         /*
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 14b6aac..c156a37 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
@@ -72,6 +72,7 @@ import com.techscan.wk.widgets.CustomBottomSheet;
 import org.litepal.LitePal;
 
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -124,8 +125,6 @@ public class ProReqActivity extends CommonFunctionActivity {
     private Map<String, List<String>> scanBarcodeListMap;//瀛樻斁鏉＄爜鎵弿鏄庣粏
     private ProReqOrderBean proReqOrderBean;
     private boolean isSave = false;
-    private AnalysisBarBean barDataBean;
-
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -336,7 +335,25 @@ public class ProReqActivity extends CommonFunctionActivity {
                     getBarcodeInfo(value);
                     break;
                 case "quantity":
-                    addDetailCheck(value);
+                    DynamicFormBean barcodeItem = dynamicFormAdapter.getItemByFieldName("barcode");//鏉＄爜
+                    String barcodeItemValue = barcodeItem.getValue();
+                    checkBarcode = BarAnalysisUtils.checkBarcodePresuffix(barcodeItemValue);
+                    if (!checkBarcode) {
+                        setNextFocus("barcode");
+                        showError(getString(R.string.The_barcode_format_is_incorrect) + value);
+                        return;
+                    }
+
+                    AnalysisBarBean barDataBean = BarAnalysisUtils.analysisBarcode(barcodeItemValue);
+                    barDataBean.setQuantity(value);
+
+                    String materiel = barDataBean.getMateriel();
+                    if (TextUtils.isEmpty(materiel)) {
+                        setNextFocus("barcode");
+                        showError(getString(R.string.There_is_no_aterial_information_in_the_barcode_please_confirm));
+                        return;
+                    }
+                    addDetailCheck(barDataBean);
                     break;
                 default:
                     break;
@@ -350,7 +367,7 @@ public class ProReqActivity extends CommonFunctionActivity {
      * @param value 鏉＄爜鍐呭
      */
     private void getBarcodeInfo(String value) {
-        barDataBean = BarAnalysisUtils.analysisBarcode(value);
+        AnalysisBarBean barDataBean = BarAnalysisUtils.analysisBarcode(value);
         String materiel = barDataBean.getMateriel();
         if (TextUtils.isEmpty(materiel)) {
             setNextFocus("barcode");
@@ -408,7 +425,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                     //鍒ゆ柇鏄惁寮�鍚� 鎵弿鑷姩鍔犲叆鏄庣粏
                     boolean aBoolean = PreferencesUtil.getBoolean(context, AppConst.SCAN_ADD_DETAIL, true);
                     if (aBoolean) {
-                        new Handler().postDelayed(() -> addDetailCheck(barDataBean.getQuantity()), 300);
+                        new Handler().postDelayed(() -> addDetailCheck(barDataBean), 200);
                     }
 
                 });
@@ -418,7 +435,7 @@ public class ProReqActivity extends CommonFunctionActivity {
     /**
      * 鍔犲叆鏄庣粏鍓嶆牎楠�
      */
-    private void addDetailCheck(String quantity) {
+    private void addDetailCheck(AnalysisBarBean barDataBean) {
         if (LitePal.count(ProReqOrdeTaskBean.class) == 0) {
             showError(getString(R.string.Please_scan_the_ticket_number_first));
             setNextFocus("AUFNR");
@@ -429,7 +446,7 @@ public class ProReqActivity extends CommonFunctionActivity {
             setNextFocus("barcode");
             return;
         }
-
+        String quantity = barDataBean.getQuantity();
         if (TextUtils.isEmpty(quantity)) {
             setNextFocus("quantity");
             showError(getString(R.string.The_quantity_cannot_be_empty));
@@ -441,20 +458,21 @@ public class ProReqActivity extends CommonFunctionActivity {
             setNextFocus("quantity");
             return;
         }
+
+        BigDecimal quantityBD = new BigDecimal(quantity);
         //褰撳墠鍔犲叆鏄庣粏鐨勬暟閲�
-        double currenScanNum = Double.parseDouble(quantity);
+        double currenScanNum = quantityBD.doubleValue();
         if (currenScanNum <= 0) {
             showError(getString(R.string.The_number_of_scanned_codes_must_be_greater_than_0));
             return;
         }
-        //鏉＄爜鏁伴噺
-        String barNum = barDataBean.getQuantity();
+
         String packageNumber = barDataBean.getPackageNumber();
-        if (!TextUtils.isEmpty(barNum) && checkNumber(barNum)) {
+        if (!TextUtils.isEmpty(quantity) && checkNumber(quantity) && packageNumber != null && !TextUtils.isEmpty(packageNumber)) {
             //璁＄畻鍑哄綋鍓嶇鍙峰湪鏄庣粏涓凡鎵弿鐨勬暟閲�
             Double hisScanNum = LitePal.where("zboxid = ? ", packageNumber).sum(ProReqDetailBean.class, "erfmg", double.class);
             double finalHisScanNum = hisScanNum;
-            double finalBarNum = Double.parseDouble(barNum);
+            double finalBarNum = Double.parseDouble(quantity);
             double finalCurrenScanNum = currenScanNum;
             HttpMethods.getInstance().getByzboxid(packageNumber, new BaseObserver<ResponseBody>(context) {
                 @Override
@@ -476,7 +494,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                             DialogUtil.showErrorInfoDialog(context, "褰撳墠鏁伴噺" + quantity + "锛屽巻鍙插凡鎵暟閲�" + (finalHisScanNum + data) +
                                     "锛屽凡鎵暟閲忔�诲拰瓒呰繃鏉＄爜鏁伴噺" + finalBarNum + "锛岃纭");
                         } else {
-                            addDetail();
+                            addDetail(barDataBean,currenScanNum);
                         }
                     }
                 }
@@ -488,7 +506,7 @@ public class ProReqActivity extends CommonFunctionActivity {
             });
 
         } else {
-            addDetail();
+            addDetail(barDataBean,currenScanNum);
         }
 
     }
@@ -496,7 +514,7 @@ public class ProReqActivity extends CommonFunctionActivity {
     /**
      * 鍔犲叆鏄庣粏鏂规硶
      */
-    private void addDetail() {
+    private void addDetail(AnalysisBarBean barDataBean,double currenScanNum) {
         //DynamicFormBean ZLYSJItem = dynamicFormAdapter.getItemByFieldName("ZLYSJ");//棰嗙敤鏃堕棿
         DynamicFormBean ZCJBMItem = dynamicFormAdapter.getItemByFieldName("ZCJBM");//杞﹂棿缂栫爜
         DynamicFormBean ZGWHItem = dynamicFormAdapter.getItemByFieldName("ZGWH");//宸ヤ綅鍙�
@@ -505,7 +523,6 @@ public class ProReqActivity extends CommonFunctionActivity {
         DynamicFormBean MATNRItem = dynamicFormAdapter.getItemByFieldName("MATNR");//鐗╂枡缂栫爜
         DynamicFormBean ZXTPCItem = dynamicFormAdapter.getItemByFieldName("ZXTPC");//绠卞彿
         DynamicFormBean ZPCItem = dynamicFormAdapter.getItemByFieldName("ZPC");//鎵规
-        DynamicFormBean quantityItem = dynamicFormAdapter.getItemByFieldName("quantity");//鏁伴噺
         DynamicFormBean erfmeItem = dynamicFormAdapter.getItemByFieldName("erfme");//鍗曚綅
 
         if (TextUtils.isEmpty(lgortItem.getValue())) {
@@ -513,14 +530,13 @@ public class ProReqActivity extends CommonFunctionActivity {
             return;
         }
 
-        String barcode = barcodeItem.getValue();
+        String barcode = barDataBean.getBarcode();
         if (TextUtils.isEmpty(barcode)) {
             showError(getString(R.string.The_bar_code_cannot_be_blank));
             setNextFocus("barcode");
             return;
         }
 
-
         LitePal
                 //.where("matnr = ? and complete = ?", MATNRItem.getValue(), "0")
                 .where("matnr = ?", MATNRItem.getValue())
@@ -531,7 +547,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                         showError(getString(R.string.There_is_no_data_of_the_same_dimension_in_the_task_list));
                         return;
                     }
-                    double scanQuantity = Double.parseDouble(quantityItem.getValue());
+                    double scanQuantity = currenScanNum;
                     String gid = System.currentTimeMillis() + "";
                     //鍔犲叆鏄庣粏锛屽苟涓斿彲浠ヨ秴閲忥紝姣忔鍙尮閰嶄换鍔′竴琛�
                     for (ProReqOrdeTaskBean bean : proReqOrdeTaskBeans) {
@@ -546,7 +562,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                         bean.save();
 
                         ProReqDetailBean detailBean = new ProReqDetailBean();
-                        detailBean.setBarcode(barDataBean.getBarcode());
+                        detailBean.setBarcode(barcode);
                         detailBean.setTaskRowId(bean.getRowid());
                         detailBean.setGid(gid);
                         detailBean.setAufnr(bean.getAufnr());
@@ -581,7 +597,6 @@ public class ProReqActivity extends CommonFunctionActivity {
                     scanBarcodeListMap.put(gid, keyBarcodes);
 
                     runOnUiThread(() -> {
-                        barDataBean = null;
                         SoundUtils.playSound(this, R.raw.ok);
                         if (KeyboardUtils.isSoftInputVisible(context)) {
                             KeyboardUtils.hideSoftInput(context);
@@ -626,7 +641,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                 }
 
                 List<ProReqOrderBean> data = baseResponseBean.getData();
-                if (data.size() == 0) {
+                if (data == null || data.size() == 0) {
                     showError(getString(R.string.No_data_was_obtained));
                     setNextFocus("AUFNR");
                     showTaskDetailBadgeNum();
@@ -939,7 +954,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                 }
             }
             dynamicFormAdapter.notifyDataSetChanged();
-        }, 200);
+        }, 100);
     }
 
 
diff --git a/app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java b/app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java
index cc38023..bb085c3 100644
--- a/app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java
+++ b/app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java
@@ -50,10 +50,12 @@ import com.techscan.wk.rxbus.RxBus;
 import com.techscan.wk.rxretrofit.BaseObserver;
 import com.techscan.wk.rxretrofit.BaseResponseBean;
 import com.techscan.wk.rxretrofit.HttpMethods;
+import com.techscan.wk.rxretrofit.exception.ApiException;
 import com.techscan.wk.ui.baseAct.BasicDataListActivity;
 import com.techscan.wk.ui.scan.CustomCaptureActivity;
 import com.techscan.wk.utils.AntiShakeUtils;
 import com.techscan.wk.utils.BarAnalysisUtils;
+import com.techscan.wk.utils.DialogUtil;
 import com.techscan.wk.utils.FindUtils;
 import com.techscan.wk.utils.SoundUtils;
 import com.techscan.wk.utils.ToastUtil;
@@ -65,6 +67,9 @@ import org.litepal.LitePal;
 
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -118,7 +123,6 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
     private Map<String, List<String>> scanBarcodeListMap;//瀛樻斁鏉＄爜鎵弿鏄庣粏
     private boolean isSave = false;
     private String[] items = new String[]{};
-    private AnalysisBarBean barDataBean;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -422,7 +426,6 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
 
                     break;
                 case "PacketBarcode":
-                    barDataBean = null;
                     if (TextUtils.isEmpty(value)) {
                         setNextFocus("PacketBarcode");
                         showError(getString(R.string.The_packet_barcode_cannot_be_empty));
@@ -465,12 +468,58 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                     break;
                 //鎶ュ伐鏁伴噺
                 case "GMNGA":
+                    DynamicFormBean PacketBarcodeItem = dynamicFormAdapter.getItemByFieldName("PacketBarcode");//鍖呮潯鐮�
+                    String barcodeItemValue = PacketBarcodeItem.getValue();
+                    if (TextUtils.isEmpty(barcodeItemValue)) {
+                        setNextFocus("PacketBarcode");
+                        showError(getString(R.string.The_packet_barcode_cannot_be_empty));
+                        return;
+                    }
+                    checkBarcode = BarAnalysisUtils.checkBarcodePresuffix(barcodeItemValue);
+                    if (!checkBarcode) {
+                        showError(getString(R.string.The_barcode_format_is_incorrect) + barcodeItemValue);
+                        for (int i = 0; i < dynamicFormBeans.size(); i++) {
+                            if (dynamicFormBeans.get(i).getFieldName().equals("AUFNR") ||
+                                    dynamicFormBeans.get(i).equals("ScanRule") ||
+                                    dynamicFormBeans.get(i).equals("FlowOrder")) {
+                                continue;
+                            }
+                            dynamicFormBeans.get(i).setValue("");
+                        }
+                        setNextFocus("PacketBarcode");
+                        return;
+                    }
+                    //鍒ゆ柇鏉＄爜鏄惁宸茬粡琚壂鎻�
+                    if (isInBarcodeList(scanBarcodeListMap, barcodeItemValue)) {
+                        showError(getString(R.string.Do_not_scan_the_barcode_again));
+                        for (int i = 0; i < dynamicFormBeans.size(); i++) {
+                            if (dynamicFormBeans.get(i).getFieldName().equals("AUFNR") ||
+                                    dynamicFormBeans.get(i).equals("ScanRule") ||
+                                    dynamicFormBeans.get(i).equals("FlowOrder")) {
+                                continue;
+                            }
+                            dynamicFormBeans.get(i).setValue("");
+                        }
+                        setNextFocus("PacketBarcode");
+                        return;
+                    }
+
                     DynamicFormBean MATNRItem = dynamicFormAdapter.getItemByFieldName("MATNR");//鐗╂枡鍙�
                     if (TextUtils.isEmpty(MATNRItem.getValue())) {
                         showError(getString(R.string.Please_scan_the_package_barcode_first));
                         setNextFocus("PacketBarcode");
                         return;
                     }
+
+                    if (TextUtils.isEmpty(value)) {
+                        showError(getString(R.string.The_number_of_reports_cannot_be_empty));
+                        setNextFocus("GMNGA");
+                        return;
+                    }
+
+                    AnalysisBarBean barBean = BarAnalysisUtils.analysisBarcode(PacketBarcodeItem.getValue());
+                    barBean.setQuantity(value);
+
                     LitePal
                             .where("matnr = ?", MATNRItem.getValue())
                             .findAsync(FlowReportWorkProOrderBean.class)
@@ -481,7 +530,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                                     dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
                                     return;
                                 }
-                                addDetailCheck(orderBeans.get(0), value);
+                                addDetailCheck(orderBeans.get(0), barBean);
 
                             });
                     break;
@@ -525,10 +574,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
             }
         }
 
-        barDataBean = barBean;
         //鍏堟牴鎹潯鐮佺墿鏂欎俊鎭瘮瀵瑰伐鍗曚骇鍝佷俊鎭�
         LitePal
-                .where("matnr = ?", barDataBean.getMateriel())
+                .where("matnr = ?", barBean.getMateriel())
                 .findAsync(FlowReportWorkProOrderBean.class)
                 .listen(orderBeans -> {
                     if (orderBeans.size() == 0) {
@@ -541,19 +589,19 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                     for (DynamicFormBean d : dynamicFormBeans) {
                         switch (d.getFieldName()) {
                             case "MATNR"://鐗╂枡鍙�
-                                d.setValue(barDataBean.getMateriel());
+                                d.setValue(barBean.getMateriel());
                                 d.setFocus(false);
                                 break;
                             case "ZXTPC"://鍖呰瀹瑰櫒鍙� --绠卞彿
-                                d.setValue(barDataBean.getPackageNumber());
+                                d.setValue(barBean.getPackageNumber());
                                 d.setFocus(false);
                                 break;
                             case "ZPC"://鎵规
-                                d.setValue(barDataBean.getBatch());
+                                d.setValue(barBean.getBatch());
                                 d.setFocus(false);
                                 break;
                             case "GMNGA"://鎶ュ伐鏁伴噺
-                                d.setValue(barDataBean.getQuantity());
+                                d.setValue(barBean.getQuantity());
                                 d.setFocus(false);
                                 break;
                             default:
@@ -564,7 +612,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                     dynamicFormAdapter.setList(dynamicFormBeans);
                     dynamicFormAdapter.notifyDataSetChanged();
 
-                    new Handler().postDelayed(() -> addDetailCheck(orderBeans.get(0), barDataBean.getQuantity()), 300);
+                    new Handler().postDelayed(() -> addDetailCheck(orderBeans.get(0), barBean), 200);
 
                 });
 
@@ -573,25 +621,26 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
     /**
      * 鍔犲叆鏄庣粏鍓嶆牎楠�
      */
-    private void addDetailCheck(FlowReportWorkProOrderBean workProOrderBean, String quantity) {
-        if (barDataBean == null) {
+    private void addDetailCheck(FlowReportWorkProOrderBean workProOrderBean, AnalysisBarBean barBean) {
+        if (barBean == null) {
             showError(getString(R.string.The_packet_barcode_cannot_be_empty));
             setNextFocus("PacketBarcode");
             return;
         }
-        int count = LitePal.where("zxtpc =?", barDataBean.getPackageNumber()).count(FlowReportWorkDetailBean.class);
+        int count = LitePal.where("zxtpc =?", barBean.getPackageNumber()).count(FlowReportWorkDetailBean.class);
         if (count > 0) {
             showError(getString(R.string.The_case_number_cannot_be_scanned_repeatedly));
             return;
         }
-
+        String quantity = barBean.getQuantity();
         if (TextUtils.isEmpty(quantity)) {
             showError(getString(R.string.The_number_of_reports_cannot_be_empty));
             setNextFocus("GMNGA");
             return;
         }
 
-        if (Double.parseDouble(quantity) <= 0) {
+        BigDecimal gmnga = new BigDecimal(quantity);//褰撳墠鎵弿鐨勬姤宸ユ暟閲�
+        if (gmnga.doubleValue() <= 0) {
             showError(getString(R.string.The_number_of_jobs_reported_cannot_be_0_or_smaller_than_0));
             setNextFocus("GMNGA");
             return;
@@ -613,7 +662,6 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
         BigDecimal psmngdecimal = new BigDecimal(psmng);//璁㈠崟鏁伴噺
         BigDecimal gwemgdecimal = new BigDecimal(gwemg);//宸蹭氦璐ф暟閲�
 
-        BigDecimal gmnga = new BigDecimal(quantity);//褰撳墠鎵弿鐨勬姤宸ユ暟閲�
 
         //缁熻鏄庣粏閲屽凡鎶ュ伐鐨勬暟閲�
         Double sum = LitePal.sum(FlowReportWorkDetailBean.class, "gmnga", double.class);
@@ -641,12 +689,12 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                     .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss())
                     .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> {
                         dialog.dismiss();
-                        addDetail(workProOrderBean);
+                        addDetail(workProOrderBean, gmnga.doubleValue());
                     })
                     .create(R.style.QMUI_Dialog);
             qmuiDialog.show();
         } else {
-            addDetail(workProOrderBean);
+            addDetail(workProOrderBean, gmnga.doubleValue());
         }
     }
 
@@ -654,12 +702,11 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
     /**
      * 鍔犲叆鏄庣粏鍒楄〃
      */
-    private void addDetail(FlowReportWorkProOrderBean workProOrderBean) {
+    private void addDetail(FlowReportWorkProOrderBean workProOrderBean, double quantity) {
         DynamicFormBean ScanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule");//鎵弿瑙勫垯
         DynamicFormBean aufnrItem = dynamicFormAdapter.getItemByFieldName("AUFNR");//宸ュ崟
         DynamicFormBean flowOrderItem = dynamicFormAdapter.getItemByFieldName("FlowOrder");//娴佽浆鍗�
         DynamicFormBean PacketBarcodeItem = dynamicFormAdapter.getItemByFieldName("PacketBarcode");//鍖呮潯鐮�
-        DynamicFormBean gmngaItem = dynamicFormAdapter.getItemByFieldName("GMNGA");//鎶ュ伐鏁伴噺
         DynamicFormBean MATNRItem = dynamicFormAdapter.getItemByFieldName("MATNR");//鐗╂枡鍙�
         DynamicFormBean ZXTPCItem = dynamicFormAdapter.getItemByFieldName("ZXTPC");//绠卞彿
         DynamicFormBean ZPCItem = dynamicFormAdapter.getItemByFieldName("ZPC");//鎵规
@@ -706,7 +753,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                         bean.setFlowOrders(flowOrderItem.getValue());
                         bean.setFlowOrders(flowOrderSb.substring(0, flowOrderSb.length() - 1));
                         bean.setPacketBarcode(barcode);
-                        bean.setGmnga(gmngaItem.getValue());
+                        bean.setGmnga(String.valueOf(quantity));
                         bean.setUeeto(workProOrderBean.getUeeto());
                         bean.setPsmng(workProOrderBean.getPsmng());
                         bean.setXmnga("");
@@ -719,7 +766,6 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                             List<String> keyBarcodes = new ArrayList<>();
                             keyBarcodes.add(barcode);
                             scanBarcodeListMap.put(gid, keyBarcodes);
-                            barDataBean = null;
                             reInitUI(ScanRuleItem.getValue());
                         } else {
                             showError(getString(R.string.Failed_to_join_details));
@@ -745,7 +791,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
             bean.setMeinh(workProOrderBean.getAmein());
             bean.setFlowOrders(flowOrderItem.getValue());
             bean.setPacketBarcode(barcode);
-            bean.setGmnga(gmngaItem.getValue());
+            bean.setGmnga(String.valueOf(quantity));
             bean.setUeeto(workProOrderBean.getUeeto());
             bean.setPsmng(workProOrderBean.getPsmng());
             bean.setXmnga("");
@@ -756,7 +802,6 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                 List<String> keyBarcodes = new ArrayList<>();
                 keyBarcodes.add(barcode);
                 scanBarcodeListMap.put(gid, keyBarcodes);
-                barDataBean = null;
                 reInitUI(ScanRuleItem.getValue());
             } else {
                 showError(getString(R.string.Failed_to_join_details));
@@ -982,7 +1027,11 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
 
                 @Override
                 protected void onFailure(Throwable e) throws Exception {
-                    CustomErrorDialog(e, FlowReportWorkActivity.this);
+                    if (e instanceof SocketTimeoutException || e instanceof SocketException) {
+                        DialogUtil.showErrorInfoDialog(context, "鍝嶅簲瓒呮椂,璇疯仈绯荤鐞嗗憳纭鏁版嵁鏄惁宸插湪澶勭悊,鍦ㄧ户缁笅涓�姝ユ搷浣�!!!");
+                    } else {
+                        CustomErrorDialog(e, FlowReportWorkActivity.this);
+                    }
                 }
             });
 
@@ -1120,15 +1169,21 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
         }
     }
 
+
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            finishActivity();
-            return true;
-        }
-        return super.onKeyDown(keyCode, event);
+    protected void doOnBackPressed() {
+        finishActivity();
     }
 
+//    @Override
+//    public boolean onKeyDown(int keyCode, KeyEvent event) {
+//        if (keyCode == KeyEvent.KEYCODE_BACK) {
+//            finishActivity();
+//            return true;
+//        }
+//        return super.onKeyDown(keyCode, event);
+//    }
+
     /**
      * 鍒ゆ柇鐣岄潰鏄惁濉啓鏁版嵁
      *