From 23a7fec93883dc1a041e958f7d0d15562fefaf1a Mon Sep 17 00:00:00 2001
From: ml <1522572907@qq.com>
Date: Tue, 10 Sep 2024 11:06:40 +0800
Subject: [PATCH] 1.0.3

---
 app/build.gradle                              |   2 +-
 app/release/output.json                       |   2 +-
 app/src/main/assets/FlowReportWorkUI.json     |   2 +-
 app/src/main/assets/ProReqBodyUI.json         |  64 ++++-
 app/src/main/assets/litepal.xml               |   3 +-
 .../wk/model/FlowReportWorkProOrderBean.java  | 216 ++++++++++++++++
 .../techscan/wk/model/ProReqDetailBean.java   |   1 +
 .../techscan/wk/ui/proreq/ProReqActivity.java |  39 ++-
 .../ui/reportwork/FlowReportWorkActivity.java | 240 ++++++++++++------
 app/src/main/res/values-en/strings.xml        |   3 +
 app/src/main/res/values-th-rTH/strings.xml    |   5 +-
 app/src/main/res/values/strings.xml           |   3 +
 12 files changed, 480 insertions(+), 100 deletions(-)
 create mode 100644 app/src/main/java/com/techscan/wk/model/FlowReportWorkProOrderBean.java

diff --git a/app/build.gradle b/app/build.gradle
index 5c7f339..dd91b86 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.2"
+        versionName "1.0.3"
         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 2ea9764..c51baa7 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.2","enabled":true,"outputFile":"维科上料报工系统_v1.0.2.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.2.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.3","enabled":true,"outputFile":"维科上料报工系统_v1.0.3.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.3.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 b5faedb..ec432d6 100644
--- a/app/src/main/assets/FlowReportWorkUI.json
+++ b/app/src/main/assets/FlowReportWorkUI.json
@@ -26,7 +26,7 @@
     "editExp": 0,
     "values": [],
     "mast": false,
-    "canChange": true,
+    "canChange": false,
     "isShow": true,
     "isFocus": false,
     "language": {
diff --git a/app/src/main/assets/ProReqBodyUI.json b/app/src/main/assets/ProReqBodyUI.json
index 35e9aea..4b7547a 100644
--- a/app/src/main/assets/ProReqBodyUI.json
+++ b/app/src/main/assets/ProReqBodyUI.json
@@ -16,9 +16,8 @@
       "th": "喙冟笂喙夃箑喔о弗喔�"
     }
   },
-
   {
-    "id": 4,
+    "id": 2,
     "type": 2,
     "fieldName": "AUFNR",
     "name": "宸ュ崟鍙�",
@@ -35,6 +34,40 @@
       "th": "喔浮喔侧涪喙�喔ム競喔笝喙夃覆"
     }
   },
+  {
+    "id": 3,
+    "type": 2,
+    "fieldName": "ZCJBM",
+    "name": "杞﹂棿缂栫爜",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": true,
+    "isShow": true,
+    "language": {
+      "zh": "杞﹂棿缂栫爜",
+      "en": "Shop coding",
+      "th": "喔佮覆喔｀箑喔傕箟喔侧福喔副喔競喔竾喔箟喔竾喔涏笍喔脆笟喔编笗喔脆竵喔侧福"
+    }
+  },
+  {
+    "id": 4,
+    "type": 2,
+    "fieldName": "ZGWH",
+    "name": "宸ヤ綅鍙�",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": true,
+    "isShow": true,
+    "language": {
+      "zh": "宸ヤ綅鍙�",
+      "en": "working location number",
+      "th": "喔堗赋喔權抚喔權竸喔權竾喔侧笝"
+    }
+  },
   {
     "id": 5,
     "type": 2,
@@ -53,7 +86,7 @@
     }
   },
   {
-    "id": 3,
+    "id": 6,
     "type": 1,
     "fieldName": "lgort",
     "name": "搴撳瓨鍦扮偣",
@@ -70,7 +103,7 @@
     }
   },
   {
-    "id": 6,
+    "id": 7,
     "type": 2,
     "fieldName": "MATNR",
     "name": "鐗╂枡鍙�",
@@ -87,7 +120,7 @@
     }
   },
   {
-    "id": 7,
+    "id": 8,
     "type": 2,
     "fieldName": "ZXTPC",
     "name": "绠卞彿",
@@ -104,7 +137,7 @@
     }
   },
   {
-    "id": 8,
+    "id": 9,
     "type": 2,
     "fieldName": "ZPC",
     "name": "鎵规",
@@ -121,7 +154,7 @@
     }
   },
   {
-    "id": 9,
+    "id": 10,
     "type": 2,
     "fieldName": "quantity",
     "name": "鏁伴噺",
@@ -136,5 +169,22 @@
       "en": "quantity",
       "th": "喔堗赋喔權抚喔�"
     }
+  },
+  {
+    "id": 11,
+    "type": 2,
+    "fieldName": "erfme",
+    "name": "鍗曚綅",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": false,
+    "isShow": true,
+    "language": {
+      "zh": "鍗曚綅",
+      "en": "unit",
+      "th": "喔笝喙堗抚喔�"
+    }
   }
 ]
\ No newline at end of file
diff --git a/app/src/main/assets/litepal.xml b/app/src/main/assets/litepal.xml
index d8bbea4..ca8b2ca 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="14" />
+    <version value="18" />
     <!--
     	Define your models in the list with mapping tag, LitePal will
     	create tables for each mapping class. The supported fields
@@ -37,6 +37,7 @@
         <mapping class="com.techscan.wk.model.ProReqDetailBean" />
         <mapping class="com.techscan.wk.model.FlowOrderDetailBean" />
         <mapping class="com.techscan.wk.model.FlowReportWorkDetailBean" />
+        <mapping class="com.techscan.wk.model.FlowReportWorkProOrderBean" />
     </list>
 
     <!--
diff --git a/app/src/main/java/com/techscan/wk/model/FlowReportWorkProOrderBean.java b/app/src/main/java/com/techscan/wk/model/FlowReportWorkProOrderBean.java
new file mode 100644
index 0000000..fcf92d6
--- /dev/null
+++ b/app/src/main/java/com/techscan/wk/model/FlowReportWorkProOrderBean.java
@@ -0,0 +1,216 @@
+package com.techscan.wk.model;
+
+
+import org.litepal.crud.LitePalSupport;
+
+public class FlowReportWorkProOrderBean extends LitePalSupport {
+
+    private String amein;
+    private String aufnr;
+    private String bmeng;
+    private String dauat;
+    private String dispo;
+    private String dwerk;
+    private String fevor;
+    private String gltrp;
+    private String gstrp;
+    private String lgort;
+    private String matnr;
+    private String plnal;
+    private String plnnr;
+    private String projn;
+    private String psmng;
+    private String stlal;
+    private String ueeto;
+    private String ybzq;
+    private String zremark;
+    private String zszjd;
+    private String zwlbc;
+    private String zzt;
+    private String zzy;
+
+    public void setAmein(String amein) {
+        this.amein = amein;
+    }
+
+    public String getAmein() {
+        return amein;
+    }
+
+    public void setAufnr(String aufnr) {
+        this.aufnr = aufnr;
+    }
+
+    public String getAufnr() {
+        return aufnr;
+    }
+
+    public void setBmeng(String bmeng) {
+        this.bmeng = bmeng;
+    }
+
+    public String getBmeng() {
+        return bmeng;
+    }
+
+    public void setDauat(String dauat) {
+        this.dauat = dauat;
+    }
+
+    public String getDauat() {
+        return dauat;
+    }
+
+    public void setDispo(String dispo) {
+        this.dispo = dispo;
+    }
+
+    public String getDispo() {
+        return dispo;
+    }
+
+    public void setDwerk(String dwerk) {
+        this.dwerk = dwerk;
+    }
+
+    public String getDwerk() {
+        return dwerk;
+    }
+
+    public void setFevor(String fevor) {
+        this.fevor = fevor;
+    }
+
+    public String getFevor() {
+        return fevor;
+    }
+
+    public void setGltrp(String gltrp) {
+        this.gltrp = gltrp;
+    }
+
+    public String getGltrp() {
+        return gltrp;
+    }
+
+    public void setGstrp(String gstrp) {
+        this.gstrp = gstrp;
+    }
+
+    public String getGstrp() {
+        return gstrp;
+    }
+
+
+    public void setLgort(String lgort) {
+        this.lgort = lgort;
+    }
+
+    public String getLgort() {
+        return lgort;
+    }
+
+    public void setMatnr(String matnr) {
+        this.matnr = matnr;
+    }
+
+    public String getMatnr() {
+        return matnr;
+    }
+
+    public void setPlnal(String plnal) {
+        this.plnal = plnal;
+    }
+
+    public String getPlnal() {
+        return plnal;
+    }
+
+    public void setPlnnr(String plnnr) {
+        this.plnnr = plnnr;
+    }
+
+    public String getPlnnr() {
+        return plnnr;
+    }
+
+    public void setProjn(String projn) {
+        this.projn = projn;
+    }
+
+    public String getProjn() {
+        return projn;
+    }
+
+    public void setPsmng(String psmng) {
+        this.psmng = psmng;
+    }
+
+    public String getPsmng() {
+        return psmng;
+    }
+
+    public void setStlal(String stlal) {
+        this.stlal = stlal;
+    }
+
+    public String getStlal() {
+        return stlal;
+    }
+
+    public void setUeeto(String ueeto) {
+        this.ueeto = ueeto;
+    }
+
+    public String getUeeto() {
+        return ueeto;
+    }
+
+    public void setYbzq(String ybzq) {
+        this.ybzq = ybzq;
+    }
+
+    public String getYbzq() {
+        return ybzq;
+    }
+
+    public void setZremark(String zremark) {
+        this.zremark = zremark;
+    }
+
+    public String getZremark() {
+        return zremark;
+    }
+
+    public void setZszjd(String zszjd) {
+        this.zszjd = zszjd;
+    }
+
+    public String getZszjd() {
+        return zszjd;
+    }
+
+    public void setZwlbc(String zwlbc) {
+        this.zwlbc = zwlbc;
+    }
+
+    public String getZwlbc() {
+        return zwlbc;
+    }
+
+    public void setZzt(String zzt) {
+        this.zzt = zzt;
+    }
+
+    public String getZzt() {
+        return zzt;
+    }
+
+    public void setZzy(String zzy) {
+        this.zzy = zzy;
+    }
+
+    public String getZzy() {
+        return zzy;
+    }
+}
diff --git a/app/src/main/java/com/techscan/wk/model/ProReqDetailBean.java b/app/src/main/java/com/techscan/wk/model/ProReqDetailBean.java
index e0bb0fe..5c10d7c 100644
--- a/app/src/main/java/com/techscan/wk/model/ProReqDetailBean.java
+++ b/app/src/main/java/com/techscan/wk/model/ProReqDetailBean.java
@@ -23,6 +23,7 @@ public class ProReqDetailBean extends LitePalSupport {
     private String lgort;//搴撳瓨鍦扮偣
     private String lgortName;//搴撳瓨鍦扮偣
 
+
     public String getZboxid() {
         return zboxid;
     }
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 8c37568..4ffcfe9 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
@@ -286,6 +286,8 @@ public class ProReqActivity extends CommonFunctionActivity {
                                             DynamicFormBean bean = dynamicFormBeans.get(j);
                                             if (bean.getFieldName().equals("lgort") ||
                                                     bean.getFieldName().equals("AUFNR") ||
+                                                    bean.getFieldName().equals("ZGWH") ||
+                                                    bean.getFieldName().equals("ZCJBM") ||
                                                     bean.getFieldName().equals("ZLYSJ")) {
                                                 continue;
                                             } else {
@@ -302,6 +304,12 @@ public class ProReqActivity extends CommonFunctionActivity {
                     }
                     query(value);
                     break;
+                case "ZCJBM":
+                    setNextFocus("ZGWH");
+                    break;
+                case "ZGWH":
+                    setNextFocus("barcode");
+                    break;
                 case "barcode":
                     if (LitePal.count(ProReqOrdeTaskBean.class) == 0) {
                         showError(getString(R.string.Please_scan_the_ticket_number_first));
@@ -322,12 +330,12 @@ public class ProReqActivity extends CommonFunctionActivity {
                         return;
                     }
 
-                    //鍒ゆ柇鏉＄爜鏄惁宸茬粡琚壂鎻�
-                    if (isInBarcodeList(scanBarcodeListMap, value)) {
-                        showError(getString(R.string.Do_not_scan_the_barcode_again));
-                        dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
-                        return;
-                    }
+//                    //鍒ゆ柇鏉＄爜鏄惁宸茬粡琚壂鎻�
+//                    if (isInBarcodeList(scanBarcodeListMap, value)) {
+//                        showError(getString(R.string.Do_not_scan_the_barcode_again));
+//                        dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
+//                        return;
+//                    }
 
                     getBarcodeInfo(value);
                     break;
@@ -379,6 +387,10 @@ public class ProReqActivity extends CommonFunctionActivity {
                                 d.setValue(bean.getQuantity());
                                 d.setFocus(true);
                                 break;
+                            case "erfme"://鍗曚綅
+                                d.setValue(proReqOrdeTaskBeans.get(0).getMeins());
+                                d.setFocus(true);
+                                break;
                             default:
                                 d.setFocus(false);
                                 break;
@@ -387,7 +399,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                     dynamicFormAdapter.setList(dynamicFormBeans);
                     dynamicFormAdapter.notifyDataSetChanged();
 
-                    boolean aBoolean = PreferencesUtil.getBoolean(context, AppConst.SCAN_ADD_DETAIL,true);
+                    boolean aBoolean = PreferencesUtil.getBoolean(context, AppConst.SCAN_ADD_DETAIL, true);
                     if (aBoolean) {
                         new Handler().postDelayed(new Runnable() {
                             @Override
@@ -419,7 +431,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                             qmuiTipDialog.setCancelable(false);
                             qmuiTipDialog.setCanceledOnTouchOutside(false);
                             qmuiTipDialog.show();
-                            setNextFocus("barcode");
+                            setNextFocus("ZCJBM");
                             for (int i = 0; i < item.size(); i++) {
                                 ProReqOrdeTaskBean taskBean = item.get(i);
                                 taskBean.setRowid(System.currentTimeMillis());
@@ -453,12 +465,15 @@ public class ProReqActivity extends CommonFunctionActivity {
 
     private void addDetail() {
         DynamicFormBean ZLYSJItem = dynamicFormAdapter.getItemByFieldName("ZLYSJ");//棰嗙敤鏃堕棿
+        DynamicFormBean ZCJBMItem = dynamicFormAdapter.getItemByFieldName("ZCJBM");//杞﹂棿缂栫爜
+        DynamicFormBean ZGWHItem = dynamicFormAdapter.getItemByFieldName("ZGWH");//宸ヤ綅鍙�
         DynamicFormBean lgortItem = dynamicFormAdapter.getItemByFieldName("lgort");//搴撳瓨鍦扮偣
         DynamicFormBean barcodeItem = dynamicFormAdapter.getItemByFieldName("barcode");//鏉＄爜
         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 (LitePal.count(ProReqOrdeTaskBean.class) == 0) {
             showError(getString(R.string.Please_scan_the_ticket_number_first));
@@ -519,12 +534,12 @@ public class ProReqActivity extends CommonFunctionActivity {
                         detailBean.setTaskRowId(bean.getRowid());
                         detailBean.setGid(gid);
                         detailBean.setAufnr(bean.getAufnr());
-                        detailBean.setErfme(bean.getErfme());
+                        detailBean.setErfme(bean.getMeins());
                         detailBean.setErfmg(scanQuantity);
                         detailBean.setMatnr(bean.getMatnr());
                         detailBean.setWerks(proReqOrderBean != null ? proReqOrderBean.getDwerk() : "");
-                        detailBean.setZcjbm("");
-                        detailBean.setZgwh("");
+                        detailBean.setZcjbm(ZCJBMItem.getValue());
+                        detailBean.setZgwh(ZGWHItem.getValue());
                         detailBean.setZitemo(bean.getRspos());
                         detailBean.setZlysj(ZLYSJItem.getValue());
                         detailBean.setZboxid(ZXTPCItem.getValue());
@@ -557,6 +572,8 @@ public class ProReqActivity extends CommonFunctionActivity {
                         for (int i = 0; i < dynamicFormBeans.size(); i++) {
                             DynamicFormBean dynamicFormBean = dynamicFormBeans.get(i);
                             if (dynamicFormBean.getFieldName().equals("AUFNR") ||
+                                    dynamicFormBean.getFieldName().equals("ZGWH") ||
+                                    dynamicFormBean.getFieldName().equals("ZCJBM") ||
                                     dynamicFormBean.getFieldName().equals("ZLYSJ")) {
                                 continue;
                             }
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 3a72e4d..6b520c2 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
@@ -43,6 +43,7 @@ import com.techscan.wk.model.AnalysisBarBean;
 import com.techscan.wk.model.DynamicFormBean;
 import com.techscan.wk.model.FlowOrderDetailBean;
 import com.techscan.wk.model.FlowReportWorkDetailBean;
+import com.techscan.wk.model.FlowReportWorkProOrderBean;
 import com.techscan.wk.model.ReportWorkDetailBean;
 import com.techscan.wk.rxbus.Event;
 import com.techscan.wk.rxbus.RxBus;
@@ -292,7 +293,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                             if (rvUiHaveData() || count > 0 || detailCount > 0) {
                                 new QMUIDialog.MessageDialogBuilder(context).setTitle(getResources().getString(R.string.tips_title))
                                         .setCancelable(false)
-                                        .setMessage("鏄惁鍒囨崲鎵弿瑙勫垯锛燂紙鍒囨崲灏嗘竻绌虹晫闈㈠拰鎵�鏈夋壂鎻忔槑缁嗗唴瀹癸級")
+                                        .setMessage(getString(R.string.Do_you_want_to_change_scan_rules_Switching_will_clear_the_interface_and_all_scan_details))
                                         .addAction(getResources().getString(R.string.cancel_info), (dialog1, index) -> dialog1.dismiss())
                                         .addAction(getResources().getString(R.string.confirm_info), (dialog1, index) -> {
                                             dialog1.dismiss();
@@ -348,20 +349,20 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
             String value = dynamicFormBean.getValue();
             switch (dynamicFormBean.getFieldName()) {
                 case "AUFNR":
-                    DynamicFormBean scanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule");
-//                    String value1 = scanRuleItem.getValue();
-//                    if (TextUtils.isEmpty(value1)) {
-//                        dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
-//                        showError(getString(R.string.Select_a_scan_rule_first));
+//                    DynamicFormBean scanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule");
+////                    String value1 = scanRuleItem.getValue();
+////                    if (TextUtils.isEmpty(value1)) {
+////                        dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
+////                        showError(getString(R.string.Select_a_scan_rule_first));
+////                        return;
+////                    }
+//                    if (TextUtils.isEmpty(value)) {
+//                        showError(getString(R.string.The_work_order_number_cannot_be_empty));
 //                        return;
 //                    }
-                    if (TextUtils.isEmpty(value)) {
-                        showError(getString(R.string.The_work_order_number_cannot_be_empty));
-                        return;
-                    }
-                    dynamicFormBean.setCanChange(false);
-                    dynamicFormAdapter.notifyDataSetChanged();
-                    setNextFocus("FlowOrder");
+//                    dynamicFormBean.setCanChange(false);
+//                    dynamicFormAdapter.notifyDataSetChanged();
+//                    setNextFocus("FlowOrder");
                     break;
                 case "FlowOrder":
                     DynamicFormBean AUFNRItem = dynamicFormAdapter.getItemByFieldName("AUFNR");
@@ -370,7 +371,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
 //                        return;
 //                    }
 
-                    scanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule");
+                    DynamicFormBean scanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule");
                     if (TextUtils.isEmpty(scanRuleItem.getValue())) {
                         dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
                         showError(getString(R.string.Select_a_scan_rule_first));
@@ -382,52 +383,62 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                         return;
                     }
 
+                    if (TextUtils.isEmpty(scanRuleItem.getValue())) {
+                        setNextFocus(dynamicFormBean.getFieldName());
+                        showError(getString(R.string.Select_a_scan_rule_first));
+                        return;
+                    }
+
                     if (value.startsWith("T") && value.length() > 9) {
                         int t = value.indexOf("T");
-                        String substring = value.substring(t + 1, 9);
+                        String workOrder = value.substring(t + 1, 9);
                         String aufnrItemValue = AUFNRItem.getValue();
                         if (TextUtils.isEmpty(aufnrItemValue)) {
-                            AUFNRItem.setValue(substring);
+                            AUFNRItem.setValue(workOrder);
                             AUFNRItem.setCanChange(false);
+                            LitePal.deleteAll(FlowReportWorkProOrderBean.class);
+                            query(workOrder, value, scanRuleItem, dynamicFormBean);
                             dynamicFormAdapter.setItemByFieldName(AUFNRItem.getFieldName(), AUFNRItem);
                             dynamicFormAdapter.notifyDataSetChanged();
                         } else {
-                            if (!substring.equals(aufnrItemValue)) {
+                            if (!workOrder.equals(aufnrItemValue)) {
                                 ToastUtils.showLong(R.string.order_number_in_the_flow_order_is_inconsistent);
                                 dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
                                 return;
+                            } else {
+                                if (scanRuleItem.getValue().equals(items[1])) {
+                                    LitePal
+                                            .where("flowOrder = ?", value)
+                                            .findAsync(FlowOrderDetailBean.class)
+                                            .listen(reportWorkDetailBean -> {
+                                                if (reportWorkDetailBean.size() > 0) {
+                                                    dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
+                                                    showError(getString(R.string.The_current_flow_order_number_has_been_scanned));
+                                                    return;
+                                                }
+                                                String gid = System.currentTimeMillis() + "";
+                                                FlowOrderDetailBean bean = new FlowOrderDetailBean();
+                                                bean.setGid(gid);
+                                                bean.setFlowOrder(value);
+                                                bean.save();
+                                                showOrderDetailBadgeNum();
+                                                SoundUtils.playSound(this, R.raw.ok);
+                                                dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
+                                            });
+                                } else {
+                                    dynamicFormBean.setCanChange(false);
+                                    dynamicFormAdapter.notifyDataSetChanged();
+                                    setNextFocus("PacketBarcode");
+                                }
                             }
                         }
-                    }
 
-                    if (TextUtils.isEmpty(scanRuleItem.getValue())) {
-                        setNextFocus(dynamicFormBean.getFieldName());
-                        showError(getString(R.string.Select_a_scan_rule_first));
-                        return;
-                    }
-                    if (scanRuleItem.getValue().equals(items[1])) {
-                        LitePal
-                                .where("flowOrder = ?", value)
-                                .findAsync(FlowOrderDetailBean.class)
-                                .listen(reportWorkDetailBean -> {
-                                    if (reportWorkDetailBean.size() > 0) {
-                                        dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
-                                        showError(getString(R.string.The_current_flow_order_number_has_been_scanned));
-                                        return;
-                                    }
-                                    String gid = System.currentTimeMillis() + "";
-                                    FlowOrderDetailBean bean = new FlowOrderDetailBean();
-                                    bean.setGid(gid);
-                                    bean.setFlowOrder(value);
-                                    bean.save();
-                                    showOrderDetailBadgeNum();
-                                    SoundUtils.playSound(this, R.raw.ok);
-                                    dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
-                                });
                     } else {
-                        dynamicFormBean.setCanChange(false);
-                        dynamicFormAdapter.notifyDataSetChanged();
-                        setNextFocus("PacketBarcode");
+
+                        ToastUtils.showLong(R.string.The_flow_order_number_format_is_incorrect);
+                        dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
+                        return;
+
                     }
                     break;
                 case "PacketBarcode":
@@ -467,7 +478,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                         dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
                         return;
                     }
-                    getBarcodeInfo(value);
+                    getBarcodeInfo(value, dynamicFormBean);
                     break;
                 //鎶ュ伐鏁伴噺
                 case "GMNGA":
@@ -541,6 +552,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                         bean.setAufnr(aufnrItem.getValue());
                         bean.setVornr("");
                         bean.setZxtpc(ZXTPCItem.getValue());
+                        bean.setZpc(ZPCItem.getValue());
                         bean.setFlowOrders(flowOrderItem.getValue());
                         bean.setFlowOrders(flowOrderSb.substring(0, flowOrderSb.length() - 1));
                         bean.setPacketBarcode(barcode);
@@ -575,6 +587,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
             bean.setAufnr(aufnrItem.getValue());
             bean.setVornr("");
             bean.setZxtpc(ZXTPCItem.getValue());
+            bean.setZpc(ZPCItem.getValue());
             bean.setFlowOrders(flowOrderItem.getValue());
             bean.setPacketBarcode(barcode);
             bean.setGmnga(gmngaItem.getValue());
@@ -597,39 +610,109 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
     }
 
 
-    private void getBarcodeInfo(String value) {
-        AnalysisBarBean bean = BarAnalysisUtils.analysisBarcode(value);
-        for (DynamicFormBean d : dynamicFormBeans) {
-            switch (d.getFieldName()) {
-                case "MATNR"://鐗╂枡鍙�
-                    d.setValue(bean.getMateriel());
-                    d.setFocus(false);
-                    break;
-                case "ZXTPC"://鍖呰瀹瑰櫒鍙� --绠卞彿
-                    d.setValue(bean.getPackageNumber());
-                    d.setFocus(false);
-                    break;
-                case "ZPC"://鎵规
-                    d.setValue(bean.getBatch());
-                    d.setFocus(false);
-                    break;
-                case "GMNGA"://鎶ュ伐鏁伴噺
-                    d.setValue(bean.getQuantity());
-                    d.setFocus(false);
-                    break;
-                default:
-                    d.setFocus(false);
-                    break;
+    private void query(String workOrder, String flowOrder, DynamicFormBean scanRuleItem, DynamicFormBean dynamicFormBean) {
+        HttpMethods.getInstance().getOrderInfo(workOrder, new BaseObserver<ResponseBody>(context) {
+            @Override
+            protected void onSuccess(ResponseBody body) throws Exception {
+                String string = body.string();
+                Type objectType = new TypeToken<BaseResponseBean<List<FlowReportWorkProOrderBean>>>() {
+                }.getType();
+                BaseResponseBean<List<FlowReportWorkProOrderBean>> baseResponseBean = gson.fromJson(string, objectType);
+                if (baseResponseBean.getCode() == 200) {
+                    List<FlowReportWorkProOrderBean> data = baseResponseBean.getData();
+                    if (data.size() > 0) {
+                        FlowReportWorkProOrderBean flowReportWorkProOrderBean = data.get(0);
+                        flowReportWorkProOrderBean.save();
+                        if (scanRuleItem.getValue().equals(items[1])) {
+                            LitePal
+                                    .where("flowOrder = ?", flowOrder)
+                                    .findAsync(FlowOrderDetailBean.class)
+                                    .listen(reportWorkDetailBean -> {
+                                        if (reportWorkDetailBean.size() > 0) {
+                                            dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
+                                            showError(getString(R.string.The_current_flow_order_number_has_been_scanned));
+                                            return;
+                                        }
+                                        String gid = System.currentTimeMillis() + "";
+                                        FlowOrderDetailBean bean = new FlowOrderDetailBean();
+                                        bean.setGid(gid);
+                                        bean.setFlowOrder(flowOrder);
+                                        bean.save();
+                                        showOrderDetailBadgeNum();
+                                        SoundUtils.playSound(FlowReportWorkActivity.this, R.raw.ok);
+                                        dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
+                                    });
+                        } else {
+                            dynamicFormBean.setCanChange(false);
+                            dynamicFormAdapter.notifyDataSetChanged();
+                            setNextFocus("PacketBarcode");
+                        }
+                    } else {
+                        showError(getString(R.string.No_material_information_was_obtained_for_the_workorder));
+                        setNextFocus("FlowOrder");
+
+                    }
+                } else {
+                    showError(baseResponseBean.getMsg());
+                    setNextFocus("FlowOrder");
+                }
             }
-        }
-        dynamicFormAdapter.setList(dynamicFormBeans);
-        dynamicFormAdapter.notifyDataSetChanged();
-        new Handler().postDelayed(new Runnable() {
+
             @Override
-            public void run() {
-                addDetail();
+            protected void onFailure(Throwable e) throws Exception {
+                setNextFocus("FlowOrder");
+                SoundUtils.playSound(FlowReportWorkActivity.this, R.raw.warning);
+                CustomErrorDialog(e, FlowReportWorkActivity.this);
             }
-        }, 300);
+        });
+    }
+
+    private void getBarcodeInfo(String value, DynamicFormBean dynamicFormBean) {
+        AnalysisBarBean bean = BarAnalysisUtils.analysisBarcode(value);
+        LitePal
+                .where("matnr = ?", bean.getMateriel())
+                .findAsync(FlowReportWorkProOrderBean.class)
+                .listen(orderBeans -> {
+                    if (orderBeans.size() == 0) {
+                        //鏈壘鍒扮浉鍚岀淮搴︽暟鎹紝鎶ラ敊
+                        showError("宸ュ崟鐗╂枡涓庢壂鐮佺墿鏂欎笉涓�鑷达紝璇风‘璁�");
+                        dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
+                        return;
+                    }
+
+                    for (DynamicFormBean d : dynamicFormBeans) {
+                        switch (d.getFieldName()) {
+                            case "MATNR"://鐗╂枡鍙�
+                                d.setValue(bean.getMateriel());
+                                d.setFocus(false);
+                                break;
+                            case "ZXTPC"://鍖呰瀹瑰櫒鍙� --绠卞彿
+                                d.setValue(bean.getPackageNumber());
+                                d.setFocus(false);
+                                break;
+                            case "ZPC"://鎵规
+                                d.setValue(bean.getBatch());
+                                d.setFocus(false);
+                                break;
+                            case "GMNGA"://鎶ュ伐鏁伴噺
+                                d.setValue(bean.getQuantity());
+                                d.setFocus(false);
+                                break;
+                            default:
+                                d.setFocus(false);
+                                break;
+                        }
+                    }
+                    dynamicFormAdapter.setList(dynamicFormBeans);
+                    dynamicFormAdapter.notifyDataSetChanged();
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            addDetail();
+                        }
+                    }, 300);
+
+                });
 
     }
 
@@ -802,7 +885,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
                 }
                 switch (selectDynamicFormBean.getFieldName()) {
                     case "PacketBarcode":
-                        getBarcodeInfo(scanResult);
+                        getBarcodeInfo(scanResult, selectDynamicFormBean);
                         break;
                 }
             }
@@ -847,6 +930,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity {
         if (LitePal.count(FlowOrderDetailBean.class) > 0) {
             LitePal.deleteAll(FlowOrderDetailBean.class);
         }
+        if (LitePal.count(FlowReportWorkProOrderBean.class) > 0) {
+            LitePal.deleteAll(FlowReportWorkProOrderBean.class);
+        }
     }
 
     @Override
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 5fc4f23..a607124 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -168,4 +168,7 @@
     <string name="dialog_The_quantity_cannot_be_empty">The quantity cannot be empty</string>
     <string name="dialog_The_value_cannot_be_0_or_less_than_0">The value cannot be 0 or less than 0</string>
     <string name="Quantity_of_returned_material">Quantity of returned material</string>
+    <string name="No_material_information_was_obtained_for_the_workorder">No material information was obtained for the work order</string>
+    <string name="Do_you_want_to_change_scan_rules_Switching_will_clear_the_interface_and_all_scan_details">Do you want to change scan rules? (Switching will clear the interface and all scan details)</string>
+    <string name="The_flow_order_number_format_is_incorrect">The flow order number format is incorrect</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml
index e63c6fb..ef4e2f1 100644
--- a/app/src/main/res/values-th-rTH/strings.xml
+++ b/app/src/main/res/values-th-rTH/strings.xml
@@ -167,5 +167,8 @@
     <string name="Material_number">喔浮喔侧涪喙�喔ム競喔о副喔笖喔�</string>
     <string name="dialog_The_quantity_cannot_be_empty">喙勦浮喙堗釜喔侧浮喔侧福喔栢抚喙堗覆 喔囙箘喔斷箟</string>
     <string name="dialog_The_value_cannot_be_0_or_less_than_0">喔堗赋喔權抚喔權箘喔∴箞喔覆喔∴覆喔｀笘喙�喔涏箛喔� 0 喔福喔粪腑喔權箟喔涪喔佮抚喙堗覆 0 喙勦笖喙�</string>
-    <string name="Quantity_of_returned_material">閫�鏂欐暟閲�</string>
+    <string name="Quantity_of_returned_material">喔堗赋喔權抚喔權竵喔侧福喔箞喔囙腑喔竵</string>
+    <string name="No_material_information_was_obtained_for_the_workorder">喙勦浮喙堗浮喔掂竵喔侧福喔｀副喔氞競喙夃腑喔∴腹喔ム抚喔编釜喔斷父喙冟笖 喙�</string>
+    <string name="Do_you_want_to_change_scan_rules_Switching_will_clear_the_interface_and_all_scan_details">喔堗赴喔弗喔编笟喔佮笌喔佮覆喔｀釜喙佮竵喔� 喔福喔粪腑喙勦浮喙�?(喔弗喔编笟喔佮覆喔｀弗喙夃覆喔囙腑喔脆笝喙�喔椸腑喔｀箤喙�喔熰笅 喙佮弗喔班福喔侧涪喔ム赴喙�喔傅喔⑧笖喔佮覆喔｀釜喙佮竵喔權笚喔编箟喔囙斧喔∴笖)</string>
+    <string name="The_flow_order_number_format_is_incorrect">喔浮喔侧涪喙�喔ム競喙傕福喙�喔曕腑喔｀箤喙勦浮喙堗笘喔灌竵喔曕箟喔竾</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c1d83d..ed96bc6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -179,5 +179,8 @@
     <string name="dialog_The_quantity_cannot_be_empty">鏁伴噺涓嶅彲涓虹┖</string>
     <string name="dialog_The_value_cannot_be_0_or_less_than_0">鏁伴噺涓嶈兘涓�0鎴栧皬浜�0</string>
     <string name="Quantity_of_returned_material">閫�鏂欐暟閲�</string>
+    <string name="No_material_information_was_obtained_for_the_workorder">璇ュ伐鍗曟病鏈夎幏鍙栧埌鐗╂枡淇℃伅</string>
+    <string name="Do_you_want_to_change_scan_rules_Switching_will_clear_the_interface_and_all_scan_details">鏄惁鍒囨崲鎵弿瑙勫垯锛燂紙鍒囨崲灏嗘竻绌虹晫闈㈠拰鎵�鏈夋壂鎻忔槑缁嗗唴瀹癸級</string>
+    <string name="The_flow_order_number_format_is_incorrect">娴佽浆鍗曞彿鏍煎紡涓嶆纭�</string>
 
 </resources>