From 2d4cafabcc3b08916e6a94eb6bd502c03f329d8b Mon Sep 17 00:00:00 2001
From: ml <1522572907@qq.com>
Date: Tue, 26 Nov 2024 13:21:49 +0800
Subject: [PATCH] 1.0.15

---
 .idea/deploymentTargetDropDown.xml            |  17 +
 .idea/misc.xml                                |   5 +
 app/build.gradle                              |   2 +-
 app/release/output.json                       |   2 +-
 app/src/main/AndroidManifest.xml              |  13 +
 app/src/main/assets/MainUIForV.json           |  13 +
 app/src/main/assets/ProFeedUI.json            | 158 +++
 app/src/main/assets/litepal.xml               |   6 +-
 .../java/com/techscan/wk/app/AppConst.java    |   3 +
 .../model/MaterialAdjustmentDetailBean.java   | 141 +++
 .../techscan/wk/model/ProOrde1TaskBean.java   | 207 ++++
 .../techscan/wk/model/ProOrde2TaskBean.java   | 207 ++++
 .../com/techscan/wk/model/ProOrder1Bean.java  | 208 ++++
 .../com/techscan/wk/model/ProOrder2Bean.java  | 198 ++++
 .../techscan/wk/rxretrofit/ApiService.java    |   3 +
 .../wk/rxretrofit/BaseResponseBean.java       |   4 +
 .../techscan/wk/rxretrofit/HttpMethods.java   |   7 +
 .../java/com/techscan/wk/ui/MainActivity.java |   8 +
 .../proreq/MaterialAdjustSettingActivity.java |  79 ++
 .../ui/proreq/MaterialAdjustmentActivity.java | 987 ++++++++++++++++++
 .../techscan/wk/ui/proreq/ProReqActivity.java |  24 +-
 .../ui/reportwork/ConfigSettingActivity.java  |   7 +
 .../wk/widgets/CustomBottomSheet.java         |  58 +-
 .../res/layout/activity_config_setting.xml    |  28 +-
 .../layout/activity_mater_adjust_setting.xml  |  76 ++
 app/src/main/res/layout/activity_pro_feed.xml |  53 +
 26 files changed, 2503 insertions(+), 11 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 app/src/main/assets/ProFeedUI.json
 create mode 100644 app/src/main/java/com/techscan/wk/model/MaterialAdjustmentDetailBean.java
 create mode 100644 app/src/main/java/com/techscan/wk/model/ProOrde1TaskBean.java
 create mode 100644 app/src/main/java/com/techscan/wk/model/ProOrde2TaskBean.java
 create mode 100644 app/src/main/java/com/techscan/wk/model/ProOrder1Bean.java
 create mode 100644 app/src/main/java/com/techscan/wk/model/ProOrder2Bean.java
 create mode 100644 app/src/main/java/com/techscan/wk/ui/proreq/MaterialAdjustSettingActivity.java
 create mode 100644 app/src/main/java/com/techscan/wk/ui/proreq/MaterialAdjustmentActivity.java
 create mode 100644 app/src/main/res/layout/activity_mater_adjust_setting.xml
 create mode 100644 app/src/main/res/layout/activity_pro_feed.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..32218ea
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\MULEI\.android\avd\Nexus_5X_API_35.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2024-11-26T02:31:07.996443500Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b44cbfa..1a986ba 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/activity_flow_report_work.xml" value="0.23278985507246377" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/activity_login.xml" value="0.2246376811594203" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/activity_main.xml" value="0.23278985507246377" />
+        <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/activity_mater_adjust_setting.xml" value="0.23278985507246377" />
+        <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/activity_pro_feed.xml" value="0.23278985507246377" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/activity_pro_req_body.xml" value="0.23278985507246377" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/activity_pro_return.xml" value="0.23278985507246377" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/activity_report_work.xml" value="0.1" />
@@ -27,8 +29,11 @@
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/detail_bottom_popup.xml" value="0.23278985507246377" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/dialog_task_info.xml" value="0.2246376811594203" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/form_item_edit.xml" value="0.29257246376811596" />
+        <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/form_item_edit_select.xml" value="0.15817356205852673" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/form_item_edit_select_scan.xml" value="0.2246376811594203" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/form_item_text.xml" value="0.23278985507246377" />
+        <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/form_item_time_quantum.xml" value="0.23278985507246377" />
+        <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/form_item_title.xml" value="0.23278985507246377" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/item_multi_choice_bottom_popup.xml" value="0.2246376811594203" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/layout_bottom_btn.xml" value="0.2246376811594203" />
         <entry key="..\:/TechScanProject/VicoFeedReport/app/src/main/res/layout/layout_bottom_btn1.xml" value="0.2246376811594203" />
diff --git a/app/build.gradle b/app/build.gradle
index 4a168e5..86f13a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.14"
+        versionName "1.0.15"
         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 a91a777..65185b8 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.14","enabled":true,"outputFile":"维科上料报工系统_v1.0.14.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.14.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.15","enabled":true,"outputFile":"维科上料报工系统_v1.0.15.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.15.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9cb9ef8..997c060 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -67,6 +67,18 @@
             android:name="com.techscan.wk.ui.proreq.ProReqActivity"
             android:exported="false"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
+        <activity
+            android:name="com.techscan.wk.ui.proreq.MaterialAdjustmentActivity"
+            android:exported="false"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
+
+        </activity>  <activity
+            android:name="com.techscan.wk.ui.proreq.MaterialAdjustSettingActivity"
+            android:exported="false"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
+
+        </activity>
+
         <activity
             android:name="com.techscan.wk.ui.proreq.ProReturnActivity"
             android:exported="false"
@@ -94,6 +106,7 @@
         <activity
             android:name="com.techscan.wk.ui.login.LoginActivity"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/assets/MainUIForV.json b/app/src/main/assets/MainUIForV.json
index d0cb4e2..e2a568b 100644
--- a/app/src/main/assets/MainUIForV.json
+++ b/app/src/main/assets/MainUIForV.json
@@ -114,6 +114,19 @@
       "en": "Finished warehousing",
       "th": "喙�喔福喙囙笀喙佮弗喙夃抚喙�喔傕箟喔侧箘喔涏箖喔權斧喙夃腑喔�"
     }
+  } ,
+  {
+    "id": 17,
+    "name": "棰嗘枡璋冩暣",
+    "icon": "xtzk",
+    "to": "com.techscan.wk.ui.proreq.MaterialAdjustmentActivity",
+    "show": "1",
+    "children": [],
+    "language": {
+      "zh": "棰嗘枡璋冩暣",
+      "en": "Material requisition adjustment",
+      "th": "喔涏福喔编笟喔傕笝喔侧笖喔о副喔笖喔�"
+    }
   }
 
 ]
\ No newline at end of file
diff --git a/app/src/main/assets/ProFeedUI.json b/app/src/main/assets/ProFeedUI.json
new file mode 100644
index 0000000..b802dfd
--- /dev/null
+++ b/app/src/main/assets/ProFeedUI.json
@@ -0,0 +1,158 @@
+[
+  {
+    "id": 1,
+    "type": 2,
+    "fieldName": "ZGWH",
+    "name": "宸ヤ綅鍙�",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": true,
+    "isShow": true,
+    "language": {
+      "zh": "宸ヤ綅鍙�",
+      "en": "working location number",
+      "th": "喔堗赋喔權抚喔權竸喔權竾喔侧笝"
+    }
+  },
+  {
+    "id": 2,
+    "type": 2,
+    "fieldName": "AUFNR1",
+    "name": "鏉ユ簮宸ュ崟鍙�",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": true,
+    "isShow": true,
+    "isFocus": false,
+    "language": {
+      "zh": "鏉ユ簮宸ュ崟鍙�",
+      "en": "Source work order number",
+      "th": "喔娻阜喙堗腑喔曕箟喔�"
+    }
+  },
+
+  {
+    "id": 3,
+    "type": 2,
+    "fieldName": "AUFNR2",
+    "name": "鐩爣宸ュ崟鍙�",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": true,
+    "isShow": true,
+    "isFocus": false,
+    "language": {
+      "zh": "鐩爣宸ュ崟鍙�",
+      "en": "Target work order number",
+      "th": "喔浮喔侧涪喙�喔ム競喔｀覆喔⑧竵喔侧福喙�喔涏箟喔侧斧喔∴覆喔�"
+    }
+  },
+  {
+    "id": 4,
+    "type": 2,
+    "fieldName": "barcode",
+    "name": "鏉＄爜",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": true,
+    "isShow": true,
+    "language": {
+      "zh": "鏉＄爜",
+      "en": "barcode",
+      "th": "喔氞覆喔｀箤喙傕竸喙夃笖"
+    }
+  },
+  {
+    "id": 5,
+    "type": 2,
+    "fieldName": "lgort",
+    "name": "搴撳瓨鍦扮偣",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": false,
+    "isShow": true,
+    "language": {
+      "zh": "搴撳瓨鍦扮偣",
+      "en": "Stock location",
+      "th": "喔笘喔侧笝 喔椸傅喙堗箑喔佮箛喔氞釜喔脆笝喔勦箟喔�"
+    }
+  },
+  {
+    "id": 6,
+    "type": 2,
+    "fieldName": "MATNR",
+    "name": "鐗╂枡鍙�",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": false,
+    "isShow": true,
+    "language": {
+      "zh": "鐗╂枡鍙�",
+      "en": "Material number",
+      "th": "喔浮喔侧涪喙�喔ム競喔о副喔笖喔�"
+    }
+  },
+  {
+    "id": 7,
+    "type": 2,
+    "fieldName": "erfme",
+    "name": "鍗曚綅",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": false,
+    "isShow": true,
+    "language": {
+      "zh": "鍗曚綅",
+      "en": "unit",
+      "th": "喔笝喙堗抚喔�"
+    }
+  },
+  {
+    "id": 8,
+    "type": 2,
+    "fieldName": "ZXTPC",
+    "name": "绠卞彿",
+    "value": "",
+    "editExp": 0,
+    "values": [],
+    "mast": false,
+    "canChange": false,
+    "isShow": false,
+    "language": {
+      "zh": "绠卞彿",
+      "en": "Case number",
+      "th": "喔浮喔侧涪喙�喔ム競喔佮弗喙堗腑喔�"
+    }
+  },
+  {
+    "id": 9,
+    "type": 2,
+    "fieldName": "quantity",
+    "name": "鏁伴噺",
+    "value": "",
+    "editExp": 2,
+    "values": [],
+    "mast": false,
+    "canChange": true,
+    "isShow": true,
+    "language": {
+      "zh": "鏁伴噺",
+      "en": "quantity",
+      "th": "喔堗赋喔權抚喔�"
+    }
+  }
+]
\ No newline at end of file
diff --git a/app/src/main/assets/litepal.xml b/app/src/main/assets/litepal.xml
index 0542ff2..9d6f9d2 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="24" />
+    <version value="32" />
     <!--
     	Define your models in the list with mapping tag, LitePal will
     	create tables for each mapping class. The supported fields
@@ -38,6 +38,10 @@
         <mapping class="com.techscan.wk.model.FlowOrderDetailBean" />
         <mapping class="com.techscan.wk.model.FlowReportWorkDetailBean" />
         <mapping class="com.techscan.wk.model.FlowReportWorkProOrderBean" />
+
+        <mapping class="com.techscan.wk.model.MaterialAdjustmentDetailBean" />
+        <mapping class="com.techscan.wk.model.ProOrde1TaskBean" />
+        <mapping class="com.techscan.wk.model.ProOrde2TaskBean" />
     </list>
 
     <!--
diff --git a/app/src/main/java/com/techscan/wk/app/AppConst.java b/app/src/main/java/com/techscan/wk/app/AppConst.java
index 6d1f33a..59ef66b 100644
--- a/app/src/main/java/com/techscan/wk/app/AppConst.java
+++ b/app/src/main/java/com/techscan/wk/app/AppConst.java
@@ -18,7 +18,10 @@ public class AppConst {
     public static final String KEY_IS_CONTINUOUS = "key_continuous_scan";
 
     public static final String SCAN_ADD_DETAIL = "autoInserDetail";
+    public static final String SCAN_ADD_DETAIL2 = "autoInserDetail2";
+    public static final String HIDE_CJ = "hide_cj";
     public static final String HIDE_GW = "hide_gw";
+    public static final String HIDE_GW2 = "hide_gw2";
 
     public static final int CAMERA_CODE = 0x11;
     public static final int REQUEST_CODE_SCAN_FOR_GROUP = 0X12;
diff --git a/app/src/main/java/com/techscan/wk/model/MaterialAdjustmentDetailBean.java b/app/src/main/java/com/techscan/wk/model/MaterialAdjustmentDetailBean.java
new file mode 100644
index 0000000..ca7e31c
--- /dev/null
+++ b/app/src/main/java/com/techscan/wk/model/MaterialAdjustmentDetailBean.java
@@ -0,0 +1,141 @@
+package com.techscan.wk.model;
+
+import org.litepal.crud.LitePalSupport;
+
+public class MaterialAdjustmentDetailBean extends LitePalSupport {
+    private String gid;
+    private long taskRowId;
+    private String barcode;
+    private String aufnr1;//鏉ユ簮宸ュ崟鍙�
+    private String aufnr2;//鐩爣宸ュ崟鍙�
+    private String erfme;//鍗曚綅
+    private double erfmg;//鐗╂枡鏁伴噺
+    private String matnr;//鐗╂枡缂栫爜
+    private String werks;//宸ュ巶浠ｇ爜
+    private String zcjbm;//杞﹂棿缂栫爜
+    private String zgw;//宸ヤ綅鍙�
+    private String zboxid;//绠卞彿
+    private String zpc;//鎵规
+    private String lgort;//搴撳瓨鍦扮偣
+    private String lgortName;//搴撳瓨鍦扮偣
+
+    public String getLgort() {
+        return lgort;
+    }
+
+    public void setLgort(String lgort) {
+        this.lgort = lgort;
+    }
+
+    public String getLgortName() {
+        return lgortName;
+    }
+
+    public void setLgortName(String lgortName) {
+        this.lgortName = lgortName;
+    }
+
+    public String getGid() {
+        return gid;
+    }
+
+    public void setGid(String gid) {
+        this.gid = gid;
+    }
+
+    public long getTaskRowId() {
+        return taskRowId;
+    }
+
+    public void setTaskRowId(long taskRowId) {
+        this.taskRowId = taskRowId;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    public String getAufnr1() {
+        return aufnr1;
+    }
+
+    public void setAufnr1(String aufnr1) {
+        this.aufnr1 = aufnr1;
+    }
+
+    public String getAufnr2() {
+        return aufnr2;
+    }
+
+    public void setAufnr2(String aufnr2) {
+        this.aufnr2 = aufnr2;
+    }
+
+    public String getErfme() {
+        return erfme;
+    }
+
+    public void setErfme(String erfme) {
+        this.erfme = erfme;
+    }
+
+    public double getErfmg() {
+        return erfmg;
+    }
+
+    public void setErfmg(double erfmg) {
+        this.erfmg = erfmg;
+    }
+
+    public String getMatnr() {
+        return matnr;
+    }
+
+    public void setMatnr(String matnr) {
+        this.matnr = matnr;
+    }
+
+    public String getWerks() {
+        return werks;
+    }
+
+    public void setWerks(String werks) {
+        this.werks = werks;
+    }
+
+    public String getZcjbm() {
+        return zcjbm;
+    }
+
+    public void setZcjbm(String zcjbm) {
+        this.zcjbm = zcjbm;
+    }
+
+    public String getZgw() {
+        return zgw;
+    }
+
+    public void setZgw(String zgw) {
+        this.zgw = zgw;
+    }
+
+    public String getZboxid() {
+        return zboxid;
+    }
+
+    public void setZboxid(String zboxid) {
+        this.zboxid = zboxid;
+    }
+
+    public String getZpc() {
+        return zpc;
+    }
+
+    public void setZpc(String zpc) {
+        this.zpc = zpc;
+    }
+}
diff --git a/app/src/main/java/com/techscan/wk/model/ProOrde1TaskBean.java b/app/src/main/java/com/techscan/wk/model/ProOrde1TaskBean.java
new file mode 100644
index 0000000..2fb64db
--- /dev/null
+++ b/app/src/main/java/com/techscan/wk/model/ProOrde1TaskBean.java
@@ -0,0 +1,207 @@
+package com.techscan.wk.model;
+
+import org.litepal.annotation.Column;
+import org.litepal.crud.LitePalSupport;
+
+public class ProOrde1TaskBean extends LitePalSupport {
+    private long id;
+    @Column(defaultValue = "0")
+    private Boolean complete;           //鏄惁瀹屾垚
+    @Column(defaultValue = "0.00")
+    private double completeNum;         //宸插畬鎴愭暟閲�
+    private long rowid;         //鑷畾涔夎id
+    private String aufnr;//璁㈠崟鍙�
+    private String ausch;//閮ㄤ欢搴熷搧鐧惧垎鏁�
+    private double bdmng;//缁勪欢鐢ㄩ噺 //浠诲姟鏁伴噺
+    private double bmeng;//鍩烘湰鏁伴噺
+    private double enmng;//鎻愯揣鏁�
+    private String erfme;//缁勪欢鍗曚綅
+    private double erfmg;//缁勪欢鐢ㄩ噺锛圔OM鍗曚綅锛�
+    private String lgort;//搴撳瓨鍦扮偣
+    private String lgortName;//搴撳瓨鍦扮偣鍚嶇О
+    private String matnr;//缁勪欢鐗╂枡缂栫爜
+    private String meins;//缁勪欢鍗曚綅 //浠诲姟鏁伴噺鐢ㄥ埌鐨勫崟浣�
+    private double menge;//鍗曚綅鐢ㄩ噺
+    private String posnr;//琛岄」鐩�
+    private String rgekz;//鍙嶅啿
+    private String rsnum;//棰勭暀鍙�
+    private String rspos;//棰勭暀琛岄」鐩彿
+    private String vornr;//宸ュ簭缂栫爜
+    private String xloek;//鍒犻櫎鏍囪
+
+    public String getLgortName() {
+        return lgortName;
+    }
+
+    public void setLgortName(String lgortName) {
+        this.lgortName = lgortName;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getRowid() {
+        return rowid;
+    }
+
+    public void setRowid(long rowid) {
+        this.rowid = rowid;
+    }
+
+    public Boolean getComplete() {
+        return complete;
+    }
+
+    public void setComplete(Boolean complete) {
+        this.complete = complete;
+    }
+
+    public double getCompleteNum() {
+        return completeNum;
+    }
+
+    public void setCompleteNum(double completeNum) {
+        this.completeNum = completeNum;
+    }
+
+    public String getAufnr() {
+        return aufnr;
+    }
+
+    public void setAufnr(String aufnr) {
+        this.aufnr = aufnr;
+    }
+
+    public String getAusch() {
+        return ausch;
+    }
+
+    public void setAusch(String ausch) {
+        this.ausch = ausch;
+    }
+
+    public double getBdmng() {
+        return bdmng;
+    }
+
+    public void setBdmng(double bdmng) {
+        this.bdmng = bdmng;
+    }
+
+    public double getBmeng() {
+        return bmeng;
+    }
+
+    public void setBmeng(double bmeng) {
+        this.bmeng = bmeng;
+    }
+
+    public double getEnmng() {
+        return enmng;
+    }
+
+    public void setEnmng(double enmng) {
+        this.enmng = enmng;
+    }
+
+    public String getErfme() {
+        return erfme;
+    }
+
+    public void setErfme(String erfme) {
+        this.erfme = erfme;
+    }
+
+    public double getErfmg() {
+        return erfmg;
+    }
+
+    public void setErfmg(double erfmg) {
+        this.erfmg = erfmg;
+    }
+
+    public String getLgort() {
+        return lgort;
+    }
+
+    public void setLgort(String lgort) {
+        this.lgort = lgort;
+    }
+
+    public String getMatnr() {
+        return matnr;
+    }
+
+    public void setMatnr(String matnr) {
+        this.matnr = matnr;
+    }
+
+    public String getMeins() {
+        return meins;
+    }
+
+    public void setMeins(String meins) {
+        this.meins = meins;
+    }
+
+    public double getMenge() {
+        return menge;
+    }
+
+    public void setMenge(double menge) {
+        this.menge = menge;
+    }
+
+    public String getPosnr() {
+        return posnr;
+    }
+
+    public void setPosnr(String posnr) {
+        this.posnr = posnr;
+    }
+
+    public String getRgekz() {
+        return rgekz;
+    }
+
+    public void setRgekz(String rgekz) {
+        this.rgekz = rgekz;
+    }
+
+    public String getRsnum() {
+        return rsnum;
+    }
+
+    public void setRsnum(String rsnum) {
+        this.rsnum = rsnum;
+    }
+
+    public String getRspos() {
+        return rspos;
+    }
+
+    public void setRspos(String rspos) {
+        this.rspos = rspos;
+    }
+
+    public String getVornr() {
+        return vornr;
+    }
+
+    public void setVornr(String vornr) {
+        this.vornr = vornr;
+    }
+
+    public String getXloek() {
+        return xloek;
+    }
+
+    public void setXloek(String xloek) {
+        this.xloek = xloek;
+    }
+}
diff --git a/app/src/main/java/com/techscan/wk/model/ProOrde2TaskBean.java b/app/src/main/java/com/techscan/wk/model/ProOrde2TaskBean.java
new file mode 100644
index 0000000..9211c9b
--- /dev/null
+++ b/app/src/main/java/com/techscan/wk/model/ProOrde2TaskBean.java
@@ -0,0 +1,207 @@
+package com.techscan.wk.model;
+
+import org.litepal.annotation.Column;
+import org.litepal.crud.LitePalSupport;
+
+public class ProOrde2TaskBean extends LitePalSupport {
+    private long id;
+    @Column(defaultValue = "0")
+    private Boolean complete;           //鏄惁瀹屾垚
+    @Column(defaultValue = "0.00")
+    private double completeNum;         //宸插畬鎴愭暟閲�
+    private long rowid;         //鑷畾涔夎id
+    private String aufnr;//璁㈠崟鍙�
+    private String ausch;//閮ㄤ欢搴熷搧鐧惧垎鏁�
+    private double bdmng;//缁勪欢鐢ㄩ噺 //浠诲姟鏁伴噺
+    private double bmeng;//鍩烘湰鏁伴噺
+    private double enmng;//鎻愯揣鏁�
+    private String erfme;//缁勪欢鍗曚綅
+    private double erfmg;//缁勪欢鐢ㄩ噺锛圔OM鍗曚綅锛�
+    private String lgort;//搴撳瓨鍦扮偣
+    private String lgortName;//搴撳瓨鍦扮偣鍚嶇О
+    private String matnr;//缁勪欢鐗╂枡缂栫爜
+    private String meins;//缁勪欢鍗曚綅 //浠诲姟鏁伴噺鐢ㄥ埌鐨勫崟浣�
+    private double menge;//鍗曚綅鐢ㄩ噺
+    private String posnr;//琛岄」鐩�
+    private String rgekz;//鍙嶅啿
+    private String rsnum;//棰勭暀鍙�
+    private String rspos;//棰勭暀琛岄」鐩彿
+    private String vornr;//宸ュ簭缂栫爜
+    private String xloek;//鍒犻櫎鏍囪
+
+    public String getLgortName() {
+        return lgortName;
+    }
+
+    public void setLgortName(String lgortName) {
+        this.lgortName = lgortName;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getRowid() {
+        return rowid;
+    }
+
+    public void setRowid(long rowid) {
+        this.rowid = rowid;
+    }
+
+    public Boolean getComplete() {
+        return complete;
+    }
+
+    public void setComplete(Boolean complete) {
+        this.complete = complete;
+    }
+
+    public double getCompleteNum() {
+        return completeNum;
+    }
+
+    public void setCompleteNum(double completeNum) {
+        this.completeNum = completeNum;
+    }
+
+    public String getAufnr() {
+        return aufnr;
+    }
+
+    public void setAufnr(String aufnr) {
+        this.aufnr = aufnr;
+    }
+
+    public String getAusch() {
+        return ausch;
+    }
+
+    public void setAusch(String ausch) {
+        this.ausch = ausch;
+    }
+
+    public double getBdmng() {
+        return bdmng;
+    }
+
+    public void setBdmng(double bdmng) {
+        this.bdmng = bdmng;
+    }
+
+    public double getBmeng() {
+        return bmeng;
+    }
+
+    public void setBmeng(double bmeng) {
+        this.bmeng = bmeng;
+    }
+
+    public double getEnmng() {
+        return enmng;
+    }
+
+    public void setEnmng(double enmng) {
+        this.enmng = enmng;
+    }
+
+    public String getErfme() {
+        return erfme;
+    }
+
+    public void setErfme(String erfme) {
+        this.erfme = erfme;
+    }
+
+    public double getErfmg() {
+        return erfmg;
+    }
+
+    public void setErfmg(double erfmg) {
+        this.erfmg = erfmg;
+    }
+
+    public String getLgort() {
+        return lgort;
+    }
+
+    public void setLgort(String lgort) {
+        this.lgort = lgort;
+    }
+
+    public String getMatnr() {
+        return matnr;
+    }
+
+    public void setMatnr(String matnr) {
+        this.matnr = matnr;
+    }
+
+    public String getMeins() {
+        return meins;
+    }
+
+    public void setMeins(String meins) {
+        this.meins = meins;
+    }
+
+    public double getMenge() {
+        return menge;
+    }
+
+    public void setMenge(double menge) {
+        this.menge = menge;
+    }
+
+    public String getPosnr() {
+        return posnr;
+    }
+
+    public void setPosnr(String posnr) {
+        this.posnr = posnr;
+    }
+
+    public String getRgekz() {
+        return rgekz;
+    }
+
+    public void setRgekz(String rgekz) {
+        this.rgekz = rgekz;
+    }
+
+    public String getRsnum() {
+        return rsnum;
+    }
+
+    public void setRsnum(String rsnum) {
+        this.rsnum = rsnum;
+    }
+
+    public String getRspos() {
+        return rspos;
+    }
+
+    public void setRspos(String rspos) {
+        this.rspos = rspos;
+    }
+
+    public String getVornr() {
+        return vornr;
+    }
+
+    public void setVornr(String vornr) {
+        this.vornr = vornr;
+    }
+
+    public String getXloek() {
+        return xloek;
+    }
+
+    public void setXloek(String xloek) {
+        this.xloek = xloek;
+    }
+}
diff --git a/app/src/main/java/com/techscan/wk/model/ProOrder1Bean.java b/app/src/main/java/com/techscan/wk/model/ProOrder1Bean.java
new file mode 100644
index 0000000..01fb1d8
--- /dev/null
+++ b/app/src/main/java/com/techscan/wk/model/ProOrder1Bean.java
@@ -0,0 +1,208 @@
+package com.techscan.wk.model;
+
+import java.util.List;
+
+public class ProOrder1Bean {
+
+    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 List<ProOrde1TaskBean> item;
+    private String lgort;
+    private String lgortName;
+    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 String getLgortName() {
+        return lgortName;
+    }
+
+    public void setLgortName(String lgortName) {
+        this.lgortName = lgortName;
+    }
+
+    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 setItem(List<ProOrde1TaskBean> item) {
+        this.item = item;
+    }
+    public List<ProOrde1TaskBean> getItem() {
+        return item;
+    }
+
+    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/ProOrder2Bean.java b/app/src/main/java/com/techscan/wk/model/ProOrder2Bean.java
new file mode 100644
index 0000000..4bcf011
--- /dev/null
+++ b/app/src/main/java/com/techscan/wk/model/ProOrder2Bean.java
@@ -0,0 +1,198 @@
+package com.techscan.wk.model;
+
+import java.util.List;
+
+public class ProOrder2Bean {
+
+    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 List<ProOrde2TaskBean> item;
+    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 setItem(List<ProOrde2TaskBean> item) {
+        this.item = item;
+    }
+    public List<ProOrde2TaskBean> getItem() {
+        return item;
+    }
+
+    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/rxretrofit/ApiService.java b/app/src/main/java/com/techscan/wk/rxretrofit/ApiService.java
index a929d5c..8595d61 100644
--- a/app/src/main/java/com/techscan/wk/rxretrofit/ApiService.java
+++ b/app/src/main/java/com/techscan/wk/rxretrofit/ApiService.java
@@ -107,4 +107,7 @@ public interface ApiService {
     @POST("/web/order/savePick")
     Observable<ResponseBody> savePick(@Body Map<String,Object> name);
 
+    @POST("/web/adjustPick/saveAdjust")
+    Observable<ResponseBody> saveAdjust(@Body Map<String,Object> name);
+
 }
diff --git a/app/src/main/java/com/techscan/wk/rxretrofit/BaseResponseBean.java b/app/src/main/java/com/techscan/wk/rxretrofit/BaseResponseBean.java
index 30a06d2..78f49c1 100644
--- a/app/src/main/java/com/techscan/wk/rxretrofit/BaseResponseBean.java
+++ b/app/src/main/java/com/techscan/wk/rxretrofit/BaseResponseBean.java
@@ -1,5 +1,9 @@
 package com.techscan.wk.rxretrofit;
 
+import com.techscan.wk.model.ProReqOrderBean;
+
+import java.util.List;
+
 /**
  * @author 锛歝reated by FWS86
  * 鐗堟湰锛�1.0
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 e40f327..c07342f 100644
--- a/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java
+++ b/app/src/main/java/com/techscan/wk/rxretrofit/HttpMethods.java
@@ -394,6 +394,13 @@ public class HttpMethods {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(observer);
     }
+    public void saveAdjust(HashMap<String, Object> map, Observer<ResponseBody> observer) {
+        getApiService().saveAdjust(map)
+                .subscribeOn(Schedulers.io())
+                .unsubscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(observer);
+    }
 
     public void reportResubmit(Map<String, Object> map, Observer<ResponseBody> observer) {
         getApiService().reportResubmit(map)
diff --git a/app/src/main/java/com/techscan/wk/ui/MainActivity.java b/app/src/main/java/com/techscan/wk/ui/MainActivity.java
index 10f31bc..6197191 100644
--- a/app/src/main/java/com/techscan/wk/ui/MainActivity.java
+++ b/app/src/main/java/com/techscan/wk/ui/MainActivity.java
@@ -239,6 +239,14 @@ public class MainActivity extends BaseActivity {
                         break;
                     }
                 }
+            } else if (homeFunctionBean.getName().equals("棰嗘枡璋冩暣")) {
+                for (int i = 0; i < menus.size(); i++) {
+                    VicoUserBean.MenusBean menusBean = menus.get(i);
+                    if (menusBean.getName().equals("棰嗘枡璋冩暣")) {
+                        isHas = true;
+                        break;
+                    }
+                }
             } else if (homeFunctionBean.getName().equals("閫�鍑虹櫥褰�")) {
                 isHas = true;
             }
diff --git a/app/src/main/java/com/techscan/wk/ui/proreq/MaterialAdjustSettingActivity.java b/app/src/main/java/com/techscan/wk/ui/proreq/MaterialAdjustSettingActivity.java
new file mode 100644
index 0000000..26de6ed
--- /dev/null
+++ b/app/src/main/java/com/techscan/wk/ui/proreq/MaterialAdjustSettingActivity.java
@@ -0,0 +1,79 @@
+package com.techscan.wk.ui.proreq;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.widget.Switch;
+
+import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.techscan.wk.R;
+import com.techscan.wk.app.AppConst;
+import com.techscan.wk.base.BaseActivity;
+import com.techscan.wk.utils.PreferencesUtil;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * 璁剧疆
+ */
+public class MaterialAdjustSettingActivity extends BaseActivity {
+
+    @BindView(R.id.topbar)
+    QMUITopBar topbar;
+    @BindView(R.id.swAutoInsertDetail)
+    Switch swAutoInsertDetail;
+    @BindView(R.id.swHideGw)
+    Switch swHideGw;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_mater_adjust_setting);
+        ButterKnife.bind(this);
+
+        boolean aBoolean = PreferencesUtil.getBoolean(context, AppConst.SCAN_ADD_DETAIL2, true);
+        //boolean isHIDE_GW = PreferencesUtil.getBoolean(context, AppConst.HIDE_GW2, false);
+        swAutoInsertDetail.setChecked(aBoolean);
+        //swHideGw.setChecked(isHIDE_GW);
+
+        initTopBar();
+
+        initSwitch();
+    }
+
+    /**
+     * 鍒濆鍖栨爣棰樻爮
+     */
+    private void initTopBar() {
+        topbar.setTitle(getString(R.string.configuration));
+        topbar.addLeftBackImageButton().setOnClickListener(v -> close());
+    }
+
+    private void initSwitch() {
+        swAutoInsertDetail.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            PreferencesUtil.putBoolean(this, AppConst.SCAN_ADD_DETAIL2, isChecked);
+        });
+        swHideGw.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            //PreferencesUtil.putBoolean(this, AppConst.HIDE_GW2, isChecked);
+        });
+
+    }
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            close();
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    private void close(){
+        Intent intent = new Intent();
+        setResult(AppConst.RESULT_CONFIG, intent);
+        finish();
+    }
+
+}
diff --git a/app/src/main/java/com/techscan/wk/ui/proreq/MaterialAdjustmentActivity.java b/app/src/main/java/com/techscan/wk/ui/proreq/MaterialAdjustmentActivity.java
new file mode 100644
index 0000000..2591d87
--- /dev/null
+++ b/app/src/main/java/com/techscan/wk/ui/proreq/MaterialAdjustmentActivity.java
@@ -0,0 +1,987 @@
+package com.techscan.wk.ui.proreq;
+
+import static com.techscan.wk.app.AppConst.CAMERA_CODE;
+import static com.techscan.wk.app.AppConst.KEY_IS_CONTINUOUS;
+import static com.techscan.wk.app.AppConst.KEY_TITLE;
+import static com.techscan.wk.app.AppConst.REQUEST_CODE_SCAN_FOR_GROUP;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.blankj.utilcode.util.KeyboardUtils;
+import com.blankj.utilcode.util.StringUtils;
+import com.blankj.utilcode.util.ToastUtils;
+import com.google.gson.reflect.TypeToken;
+import com.king.zxing.Intents;
+import com.lxj.xpopup.XPopup;
+import com.qmuiteam.qmui.widget.QMUITopBar;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
+import com.techscan.wk.R;
+import com.techscan.wk.adapter.DynamicFormAdapter;
+import com.techscan.wk.app.AppConst;
+import com.techscan.wk.base.CommonFunctionActivity;
+import com.techscan.wk.model.AnalysisBarBean;
+import com.techscan.wk.model.DynamicFormBean;
+import com.techscan.wk.model.MaterialAdjustmentDetailBean;
+import com.techscan.wk.model.ProOrde1TaskBean;
+import com.techscan.wk.model.ProOrde2TaskBean;
+import com.techscan.wk.model.ProOrder1Bean;
+import com.techscan.wk.model.ProOrder2Bean;
+import com.techscan.wk.model.ProReqOrdeTaskBean;
+import com.techscan.wk.rxbus.Event;
+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.ui.scan.CustomCaptureActivity;
+import com.techscan.wk.utils.AntiShakeUtils;
+import com.techscan.wk.utils.BarAnalysisUtils;
+import com.techscan.wk.utils.FindUtils;
+import com.techscan.wk.utils.PreferencesUtil;
+import com.techscan.wk.utils.SoundUtils;
+import com.techscan.wk.utils.ToastUtil;
+import com.techscan.wk.utils.route.Router;
+import com.techscan.wk.utils.statusbar.StatusBarUtil;
+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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import io.reactivex.disposables.Disposable;
+import okhttp3.ResponseBody;
+import q.rorbin.badgeview.QBadgeView;
+
+/**
+ * Description:棰嗘枡璋冩暣
+ * [)>@06@QRPART@10V101010@1P11002177@3SX1000019400001@1T20240724001@Q20@14D20240724@@
+ *
+ * @author MULEI
+ * @date 2024/11/19
+ */
+public class MaterialAdjustmentActivity extends CommonFunctionActivity {
+
+    @BindView(R.id.topbar)
+    QMUITopBar topbar;
+    @BindView(R.id.et_value)
+    EditText etValue;
+    @BindView(R.id.iv_scan)
+    ImageView ivScan;
+    @BindView(R.id.ll_scan)
+    LinearLayout llScan;
+    @BindView(R.id.rv_ui)
+    RecyclerView rvUi;
+
+    //    @BindView(R.id.btn_task)
+//    Button btnTask;
+    @BindView(R.id.btn_detail)
+    Button btnDetail;
+    @BindView(R.id.btn_revoke)
+    Button btnRevoke;
+    @BindView(R.id.btn_submit)
+    Button btnSubmit;
+    @BindView(R.id.ll_bottom)
+    LinearLayout llBottom;
+
+    QBadgeView qTaskBadgeView, qDetailBadgeView;
+    private DynamicFormAdapter dynamicFormAdapter;
+    private List<DynamicFormBean> dynamicFormBeans;
+    private DynamicFormBean selectDynamicFormBean;
+    private Map<String, List<String>> scanBarcodeListMap;//瀛樻斁鏉＄爜鎵弿鏄庣粏
+    private boolean isSave = false;
+    private List<ProOrder1Bean> proOrder1Beans;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pro_feed);
+        if (savedInstanceState == null) {
+            clearAllData();
+        }
+        StatusBarUtil.setStatusBarColor(this, ContextCompat.getColor(this, R.color.app_color_blue));
+        ButterKnife.bind(this);
+        setBody(true);
+        scanBarcodeListMap = new HashMap<>();
+        Disposable register = RxBus.getInstance().register(Event.class, eventMsg -> {
+            /*杩欎釜鍦版柟鑾峰彇鍒版暟鎹�傚苟鎵ц鐩稿簲鐨勬搷浣�*/
+            if (eventMsg.getCode() == 0) {
+                String removeKey = eventMsg.getRemoveKey();
+                if (removeKey.contains(",")) {
+                    String[] removeKeys = removeKey.split(",");
+                    for (String s : removeKeys) {
+                        scanBarcodeListMap.remove(s);
+                    }
+                } else {
+                    scanBarcodeListMap.remove(removeKey);
+                }
+                showTaskDetailBadgeNum();
+            }
+        });
+        RxBus.getInstance().addSubscription(this, register);
+        qTaskBadgeView = new QBadgeView(context);
+        //qTaskBadgeView.bindTarget(btnTask);
+        qDetailBadgeView = new QBadgeView(context);
+        qDetailBadgeView.bindTarget(btnDetail);
+        initTopBar();
+        initListeners();
+        initRvData();
+        rvUi.postDelayed(() -> {
+            setNextFocus("ZGWH");
+        }, 100);
+    }
+
+    /**
+     * 鍒濆鍖栭《閮ㄦ爣棰樻爮
+     */
+    private void initTopBar() {
+        topbar.setTitle("棰嗘枡璋冩暣");
+        topbar.addLeftBackImageButton().setOnClickListener(v -> finishActivity());
+        topbar.addRightTextButton(getString(R.string.configuration), 0).setOnClickListener(view -> Router.newIntent(context).to(MaterialAdjustSettingActivity.class).requestCode(AppConst.REQUEST_CONFIG).launch());
+    }
+
+    /**
+     * 鐣岄潰鏁版嵁鍥炶皟鐩戝惉璁剧疆
+     */
+    private void initListeners() {
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        showTaskDetailBadgeNum();
+    }
+
+    /**
+     * 鍒濆鍖栧姩鎬佸垪琛ㄦ暟鎹�
+     */
+    private void initRvData() {
+        // 浠庤祫婧愭枃浠朵腑璇诲彇鐣岄潰鏁版嵁
+        String jsonStr = FindUtils.readJsonFromFile(context, "ProFeedUI.json");
+        // 灏嗚鍙栧埌鐨刯son鏁版嵁杞寲涓哄姩鎬佽〃鍗曞璞�
+        Type objectType = new TypeToken<List<DynamicFormBean>>() {
+        }.getType();
+        //鍔ㄦ�佽〃鍗曟暟鎹�
+        dynamicFormBeans = gson.fromJson(jsonStr, objectType);
+        // 鍔ㄦ�佽〃鍗曠粦瀹氭暟鎹苟缁戝畾閫傞厤鍣ㄥ埌recycleView涓�
+        dynamicFormAdapter = new DynamicFormAdapter(dynamicFormBeans, false, 0);
+        GridLayoutManager layout = new GridLayoutManager(this, 2);
+        layout.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int i) {
+                return dynamicFormBeans.get(i).getType() == 8 ? 1 : 2;
+            }
+        });
+        rvUi.setLayoutManager(layout);
+        rvUi.setAdapter(dynamicFormAdapter);
+        rvUi.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
+        // 璁剧疆鍔ㄦ�佽〃鍗曠偣鍑讳簨浠�
+        dynamicFormAdapter.setOnFormItemViewClickListener((dynamicFormBean, position, custom) -> {
+            if (custom.length > 0) {
+                if (custom[0].equals("scan")) {
+                    selectDynamicFormBean = dynamicFormBean;
+                    if (!hasPermission(Manifest.permission.CAMERA))
+                        requestPermission(CAMERA_CODE, Manifest.permission.CAMERA);
+                    else
+                        startScan(getResources().getString(R.string.scan_title));
+                }
+            }
+
+        });
+        dynamicFormAdapter.setOnFormItemViewActionListener((dynamicFormBean, position) -> {
+            String value = dynamicFormBean.getValue();
+            if (TextUtils.isEmpty(value)) {
+                showError(getString(R.string.Data_cannot_be_empty));
+                return;
+            }
+            switch (dynamicFormBean.getFieldName()) {
+//                case "ZCJBM":
+//                    setNextFocus("ZGWH");
+//                    break;
+                case "ZGWH":
+                    setNextFocus("AUFNR1");
+                    break;
+                case "AUFNR1":
+                    if (TextUtils.isEmpty(value)) {
+                        showError(getString(R.string.The_work_order_number_cannot_be_empty));
+                        dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
+                        return;
+                    }
+                    if (LitePal.count(MaterialAdjustmentDetailBean.class) > 0) {
+                        new QMUIDialog.MessageDialogBuilder(context)
+                                .setTitle(getResources().getString(R.string.tips_title))
+                                .setMessage(getString(R.string.Do_you_want_to_rescan_the_work_order))
+                                .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss())
+                                .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> {
+                                    dialog.dismiss();
+                                    LitePal.deleteAllAsync(MaterialAdjustmentDetailBean.class).listen(i -> {
+                                        LitePal.deleteAll(ProOrde1TaskBean.class);
+                                        for (int j = 0; j < dynamicFormBeans.size(); j++) {
+                                            DynamicFormBean bean = dynamicFormBeans.get(j);
+                                            if (bean.getFieldName().equals("AUFNR1") ||
+                                                    bean.getFieldName().equals("AUFNR2") ||
+                                                    bean.getFieldName().equals("ZGWH")) {
+                                                continue;
+                                            } else {
+                                                bean.setValue("");
+                                            }
+                                        }
+                                        dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
+                                        scanBarcodeListMap = new HashMap<>();
+                                        query(value, dynamicFormBean.getFieldName());
+                                    });
+                                })
+                                .create(R.style.QMUI_Dialog).show();
+                    } else {
+                        LitePal.deleteAll(ProOrde1TaskBean.class);
+                        query(value, dynamicFormBean.getFieldName());
+                    }
+
+                    break;
+                case "AUFNR2":
+                    if (LitePal.count(ProOrde1TaskBean.class) == 0) {
+                        showError("璇峰厛鎵爜鏉ユ簮宸ュ崟鍙�");
+                        setNextFocus("AUFNR1");
+                        return;
+                    }
+                    if (TextUtils.isEmpty(value)) {
+                        showError(getString(R.string.The_work_order_number_cannot_be_empty));
+                        dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId());
+                        return;
+                    }
+                    if (LitePal.count(MaterialAdjustmentDetailBean.class) > 0) {
+                        new QMUIDialog.MessageDialogBuilder(context)
+                                .setTitle(getResources().getString(R.string.tips_title))
+                                .setMessage(getString(R.string.Do_you_want_to_rescan_the_work_order))
+                                .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss())
+                                .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> {
+                                    dialog.dismiss();
+                                    LitePal.deleteAllAsync(MaterialAdjustmentDetailBean.class).listen(i -> {
+                                        LitePal.deleteAll(ProOrde2TaskBean.class);
+                                        for (int j = 0; j < dynamicFormBeans.size(); j++) {
+                                            DynamicFormBean bean = dynamicFormBeans.get(j);
+                                            if (bean.getFieldName().equals("AUFNR1") ||
+                                                    bean.getFieldName().equals("AUFNR2") ||
+                                                    bean.getFieldName().equals("ZGWH")) {
+                                                continue;
+                                            } else {
+                                                bean.setValue("");
+                                            }
+                                        }
+                                        dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
+                                        scanBarcodeListMap = new HashMap<>();
+                                        query(value, dynamicFormBean.getFieldName());
+                                    });
+                                })
+                                .create(R.style.QMUI_Dialog).show();
+                    } else {
+                        LitePal.deleteAll(ProOrde2TaskBean.class);
+                        query(value, dynamicFormBean.getFieldName());
+                    }
+                    break;
+                case "barcode":
+                    if (LitePal.count(ProOrde1TaskBean.class) == 0) {
+                        showError("璇峰厛鎵爜鏉ユ簮宸ュ崟鍙�");
+                        setNextFocus("AUFNR1");
+                        return;
+                    }
+                    if (LitePal.count(ProOrde2TaskBean.class) == 0) {
+                        showError("璇峰厛鎵爜鐩爣宸ュ崟鍙�");
+                        setNextFocus("AUFNR2");
+                        return;
+                    }
+                    boolean checkBarcode = BarAnalysisUtils.checkBarcodePresuffix(value);
+                    if (!checkBarcode) {
+                        showError(getString(R.string.The_barcode_format_is_incorrect) + value);
+                        return;
+                    }
+//                    //鍒ゆ柇鏉＄爜鏄惁宸茬粡琚壂鎻�
+//                    if (isInBarcodeList(scanBarcodeListMap, value)) {
+//                        showError(getString(R.string.Do_not_scan_the_barcode_again));
+//                        dynamicFormAdapter.setFocusById(dynamicFormBean.getId());
+//                        return;
+//                    }
+                    getBarcodeInfo(value);
+                    break;
+                case "quantity":
+                    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;
+            }
+        });
+    }
+
+    /**
+     * 瑙ｆ瀽鏉＄爜淇℃伅锛屽苟姣斿宸ュ崟浜у搧淇℃伅
+     *
+     * @param value 鏉＄爜鍐呭
+     */
+    private void getBarcodeInfo(String value) {
+        AnalysisBarBean barDataBean = BarAnalysisUtils.analysisBarcode(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;
+        }
+        //鏉ユ簮宸ュ崟浠诲姟鏁版嵁
+        List<ProOrde1TaskBean> proFeedOrde1TaskBeans = LitePal.where("matnr = ?", barDataBean.getMateriel()).find(ProOrde1TaskBean.class);
+        //鐩爣宸ュ崟浠诲姟鏁版嵁
+        List<ProOrde2TaskBean> proFeedOrde2TaskBeans = LitePal.where("matnr = ?", barDataBean.getMateriel()).find(ProOrde2TaskBean.class);
+        if (proFeedOrde1TaskBeans.size() == 0) {
+            setNextFocus("barcode");
+            //鏈壘鍒扮浉鍚岀淮搴︽暟鎹紝鎶ラ敊
+            showError("鏉ユ簮宸ュ崟娌℃湁璇ョ墿鏂欎俊鎭�");
+            return;
+        }
+        if (proFeedOrde2TaskBeans.size() == 0) {
+            setNextFocus("barcode");
+            //鏈壘鍒扮浉鍚岀淮搴︽暟鎹紝鎶ラ敊
+            showError("鐩爣宸ュ崟娌℃湁璇ョ墿鏂欎俊鎭�");
+            return;
+        }
+
+        //鍒ゆ柇鐩爣宸ュ崟涓槸鍚︽湁鏉ユ簮宸ュ崟涓簱瀛樺湴鐐逛俊鎭�
+        String lgort = proFeedOrde1TaskBeans.get(0).getLgort();
+        String lgortName = proFeedOrde1TaskBeans.get(0).getLgortName();
+        List<ProOrde2TaskBean> proFeedOrde2TaskBeans1 = LitePal.where("matnr = ? and lgort = ?",
+                barDataBean.getMateriel(), lgort).find(ProOrde2TaskBean.class);
+        if (proFeedOrde2TaskBeans1.size() == 0) {
+            showError("鐩爣宸ュ崟鐗╂枡涓病鏈変笌鏉ユ簮宸ュ崟鐩稿悓鐗╂枡鍜屽簱瀛樺湴鐐�");
+            setNextFocus("barcode");
+            return;
+        }
+
+        for (DynamicFormBean d : dynamicFormBeans) {
+            switch (d.getFieldName()) {
+                case "lgort"://搴撳瓨鍦扮偣
+                    String showValue = lgort + " " + lgortName;
+                    d.setValue(showValue);
+                    break;
+                case "MATNR"://鐗╂枡鍙�
+                    d.setValue(barDataBean.getMateriel());
+                    d.setFocus(false);
+                    break;
+                case "ZXTPC"://鍖呰瀹瑰櫒鍙� --绠卞彿
+                    d.setValue(barDataBean.getPackageNumber());
+                    d.setFocus(false);
+                    break;
+                case "quantity"://鏁伴噺
+                    d.setValue(barDataBean.getQuantity());
+                    d.setFocus(true);
+                    break;
+                case "erfme"://鍗曚綅
+                    d.setValue(proFeedOrde1TaskBeans.get(0).getMeins());
+                    d.setFocus(true);
+                    break;
+                default:
+                    d.setFocus(false);
+                    break;
+            }
+        }
+        dynamicFormAdapter.setList(dynamicFormBeans);
+        dynamicFormAdapter.notifyDataSetChanged();
+
+        //鍒ゆ柇鏄惁寮�鍚� 鎵弿鑷姩鍔犲叆鏄庣粏
+        boolean aBoolean = PreferencesUtil.getBoolean(context, AppConst.SCAN_ADD_DETAIL2, true);
+        if (aBoolean) {
+            new Handler().postDelayed(() -> addDetailCheck(barDataBean), 200);
+        }
+
+
+    }
+
+    /**
+     * 鍔犲叆鏄庣粏鍓嶆牎楠�
+     */
+    private void addDetailCheck(AnalysisBarBean barDataBean) {
+        if (LitePal.count(ProOrde1TaskBean.class) == 0) {
+            showError("璇峰厛鎵弿鏉ユ簮宸ュ崟鍙�");
+            setNextFocus("AUFNR1");
+            return;
+        }
+        if (LitePal.count(ProOrde2TaskBean.class) == 0) {
+            showError("璇峰厛鎵弿鐩爣宸ュ崟鍙�");
+            setNextFocus("AUFNR2");
+            return;
+        }
+        if (barDataBean == null) {
+            showError(getString(R.string.The_bar_code_cannot_be_blank));
+            setNextFocus("barcode");
+            return;
+        }
+        String quantity = barDataBean.getQuantity();
+        if (TextUtils.isEmpty(quantity)) {
+            setNextFocus("quantity");
+            showError(getString(R.string.The_quantity_cannot_be_empty));
+            return;
+        }
+
+        if (!checkNumber(quantity)) {
+            showError(getString(R.string.The_quantity_is_not_correct));
+            setNextFocus("quantity");
+            return;
+        }
+
+        BigDecimal quantityBD = new BigDecimal(quantity);
+        //褰撳墠鍔犲叆鏄庣粏鐨勬暟閲�
+        double currenScanNum = quantityBD.doubleValue();
+        if (currenScanNum <= 0) {
+            showError(getString(R.string.The_number_of_scanned_codes_must_be_greater_than_0));
+            return;
+        }
+        addDetail(barDataBean, currenScanNum);
+
+    }
+
+    /**
+     * 鍔犲叆鏄庣粏鏂规硶
+     */
+    private void addDetail(AnalysisBarBean barDataBean, double currenScanNum) {
+        DynamicFormBean lgortItem = dynamicFormAdapter.getItemByFieldName("lgort");//搴撳瓨鍦扮偣
+        DynamicFormBean ZGWHItem = dynamicFormAdapter.getItemByFieldName("ZGWH");//宸ヤ綅鍙�
+        DynamicFormBean barcodeItem = dynamicFormAdapter.getItemByFieldName("barcode");//鏉＄爜
+        DynamicFormBean MATNRItem = dynamicFormAdapter.getItemByFieldName("MATNR");//鐗╂枡缂栫爜
+        DynamicFormBean ZXTPCItem = dynamicFormAdapter.getItemByFieldName("ZXTPC");//绠卞彿
+        DynamicFormBean erfmeItem = dynamicFormAdapter.getItemByFieldName("erfme");//鍗曚綅
+        DynamicFormBean AUFNR1Item = dynamicFormAdapter.getItemByFieldName("AUFNR1");//鏉ユ簮宸ュ崟鍙�
+        DynamicFormBean AUFNR2Item = dynamicFormAdapter.getItemByFieldName("AUFNR2");//鐩爣宸ュ崟鍙�
+
+        if (TextUtils.isEmpty(AUFNR1Item.getValue())) {
+            showError("璇峰厛鎵弿鏉ユ簮宸ュ崟鍙�");
+            setNextFocus("AUFNR1");
+            return;
+        }
+
+        if (TextUtils.isEmpty(AUFNR1Item.getValue())) {
+            showError("璇峰厛鎵弿鐩爣宸ュ崟鍙�");
+            setNextFocus("AUFNR2");
+            return;
+        }
+
+        String barcode = barDataBean.getBarcode();
+        if (TextUtils.isEmpty(barcode)) {
+            showError(getString(R.string.The_bar_code_cannot_be_blank));
+            setNextFocus("barcode");
+            return;
+        }
+
+        LitePal
+                .where("matnr = ?", MATNRItem.getValue())
+                .findAsync(ProOrde1TaskBean.class)
+                .listen(proFeedOrde1TaskBeans -> {
+                    if (proFeedOrde1TaskBeans.size() == 0) {
+                        //鏈壘鍒扮浉鍚岀淮搴︽暟鎹紝鎶ラ敊
+                        showError("鏉ユ簮宸ュ崟娌℃湁璇ョ墿鏂欎俊鎭�");
+                        return;
+                    }
+                    double scanQuantity = currenScanNum;
+                    String gid = System.currentTimeMillis() + "";
+                    //鍔犲叆鏄庣粏锛屽苟涓斿彲浠ヨ秴閲忥紝姣忔鍙尮閰嶄换鍔′竴琛�
+                    for (ProOrde1TaskBean bean : proFeedOrde1TaskBeans) {
+                        double taskNum = bean.getBdmng();
+                        double completeNum = bean.getCompleteNum();
+                        bean.setCompleteNum(scanQuantity + completeNum);
+                        if (scanQuantity + completeNum >= taskNum) {
+                            bean.setComplete(true);
+                        } else {
+                            bean.setComplete(false);
+                        }
+                        bean.save();
+
+                        MaterialAdjustmentDetailBean detailBean = new MaterialAdjustmentDetailBean();
+                        detailBean.setBarcode(barcode);
+                        detailBean.setTaskRowId(bean.getRowid());
+                        detailBean.setGid(gid);
+                        detailBean.setAufnr1(AUFNR1Item.getValue());
+                        detailBean.setAufnr2(AUFNR2Item.getValue());
+                        detailBean.setErfme(bean.getMeins());
+                        detailBean.setErfmg(scanQuantity);
+                        detailBean.setMatnr(bean.getMatnr());
+                        detailBean.setZgw(ZGWHItem.getValue());
+                        detailBean.setZboxid(ZXTPCItem.getValue());
+                        if (!TextUtils.isEmpty(lgortItem.getValue())) {
+                            if (lgortItem.getValue().contains(" ")) {
+                                String[] split = lgortItem.getValue().split(" ");
+                                detailBean.setLgort(split[0]);
+                                detailBean.setLgortName(split[1]);
+                            } else {
+                                detailBean.setLgort(lgortItem.getValue());
+                            }
+                        }
+                        detailBean.save();
+                        break;
+                    }
+
+                    //灏嗗綋鍓嶆潯鐮佸瓨鍏ュ搴旂殑鏉＄爜鎵弿鏄庣粏涓�
+                    List<String> keyBarcodes = new ArrayList<>();
+                    keyBarcodes.add(barcode);
+                    scanBarcodeListMap.put(gid, keyBarcodes);
+
+                    runOnUiThread(() -> {
+                        SoundUtils.playSound(this, R.raw.ok);
+                        if (KeyboardUtils.isSoftInputVisible(context)) {
+                            KeyboardUtils.hideSoftInput(context);
+                        }
+                        for (int i = 0; i < dynamicFormBeans.size(); i++) {
+                            DynamicFormBean dynamicFormBean = dynamicFormBeans.get(i);
+                            if (dynamicFormBean.getFieldName().equals("AUFNR1") ||
+                                    dynamicFormBean.getFieldName().equals("AUFNR2") ||
+                                    dynamicFormBean.getFieldName().equals("ZGWH")) {
+                                continue;
+                            }
+                            dynamicFormBean.setValue("");
+                        }
+                        showTaskDetailBadgeNum();
+                        setNextFocus("barcode");
+
+                    });
+
+                });
+
+    }
+
+    /**
+     * 鏍规嵁宸ュ崟鑾峰彇宸ュ崟鐗╂枡淇℃伅
+     *
+     * @param id 宸ュ崟鍙�
+     */
+    private void query(String id, String fieldName) {
+        if (fieldName.equals("AUFNR1")) {
+            HttpMethods.getInstance().getOrderInfo(id, true, new BaseObserver<ResponseBody>(context) {
+                @Override
+                protected void onSuccess(ResponseBody body) throws Exception {
+                    String string = body.string();
+                    Type objectType = new TypeToken<BaseResponseBean<List<ProOrder1Bean>>>() {
+                    }.getType();
+                    BaseResponseBean<List<ProOrder1Bean>> baseResponseBean = gson.fromJson(string, objectType);
+                    if (baseResponseBean.getCode() != 200) {
+                        showError(baseResponseBean.getMsg());
+                        setNextFocus("AUFNR1");
+                        return;
+                    }
+                    proOrder1Beans = baseResponseBean.getData();
+                    if (proOrder1Beans == null || proOrder1Beans.size() == 0) {
+                        showError(getString(R.string.No_data_was_obtained));
+                        setNextFocus("AUFNR1");
+                        return;
+                    }
+
+                    ProOrder1Bean proOrder1Bean = proOrder1Beans.get(0);
+                    List<ProOrde1TaskBean> item = proOrder1Bean.getItem();
+                    if (item.size() == 0) {
+                        showError(getString(R.string.No_data_was_obtained));
+                        setNextFocus("AUFNR1");
+                        return;
+                    }
+
+//                    String lgort = proOrder1Bean.getLgort();
+//                    for (int i = 0; i < dynamicFormBeans.size(); i++) {
+//                        DynamicFormBean dynamicFormBean = dynamicFormBeans.get(i);
+//                        if (dynamicFormBean.getFieldName().equals("lgort")) {
+//                            dynamicFormBean.setValue(lgort);
+//                            break;
+//                        }
+//                    }
+//                    dynamicFormAdapter.notifyDataSetChanged();
+
+                    QMUITipDialog qmuiTipDialog = new QMUITipDialog.Builder(context).setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING).create();
+                    qmuiTipDialog.setCancelable(false);
+                    qmuiTipDialog.setCanceledOnTouchOutside(false);
+                    qmuiTipDialog.show();
+                    for (int i = 0; i < item.size(); i++) {
+                        ProOrde1TaskBean taskBean = item.get(i);
+                        taskBean.setRowid(System.currentTimeMillis());
+                        taskBean.save();
+                    }
+                    qmuiTipDialog.dismiss();
+                    setNextFocus("AUFNR2");
+                }
+
+                @Override
+                protected void onFailure(Throwable e) throws Exception {
+                    showTaskDetailBadgeNum();
+                    setNextFocus("AUFNR1");
+                    SoundUtils.playSound(MaterialAdjustmentActivity.this, R.raw.warning);
+                    CustomErrorDialog(e, MaterialAdjustmentActivity.this);
+                }
+            });
+        } else if (fieldName.equals("AUFNR2")) {
+            HttpMethods.getInstance().getOrderInfo(id, true, new BaseObserver<ResponseBody>(context) {
+                @Override
+                protected void onSuccess(ResponseBody body) throws Exception {
+                    String string = body.string();
+                    Type objectType = new TypeToken<BaseResponseBean<List<ProOrder2Bean>>>() {
+                    }.getType();
+                    BaseResponseBean<List<ProOrder2Bean>> baseResponseBean = gson.fromJson(string, objectType);
+                    if (baseResponseBean.getCode() != 200) {
+                        showError(baseResponseBean.getMsg());
+                        setNextFocus("AUFNR2");
+                        return;
+                    }
+                    List<ProOrder2Bean> data = baseResponseBean.getData();
+                    if (data == null || data.size() == 0) {
+                        showError(getString(R.string.No_data_was_obtained));
+                        setNextFocus("AUFNR2");
+                        return;
+                    }
+
+                    ProOrder2Bean proOrder2Bean = data.get(0);
+                    List<ProOrde2TaskBean> item = proOrder2Bean.getItem();
+                    if (item.size() == 0) {
+                        showError(getString(R.string.No_data_was_obtained));
+                        setNextFocus("AUFNR2");
+                        return;
+                    }
+
+                    QMUITipDialog qmuiTipDialog = new QMUITipDialog.Builder(context).setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING).create();
+                    qmuiTipDialog.setCancelable(false);
+                    qmuiTipDialog.setCanceledOnTouchOutside(false);
+                    qmuiTipDialog.show();
+                    for (int i = 0; i < item.size(); i++) {
+                        ProOrde2TaskBean taskBean = item.get(i);
+                        taskBean.setRowid(System.currentTimeMillis());
+                        taskBean.save();
+                    }
+                    qmuiTipDialog.dismiss();
+                    setNextFocus("barcode");
+                }
+
+                @Override
+                protected void onFailure(Throwable e) throws Exception {
+                    showTaskDetailBadgeNum();
+                    setNextFocus("AUFNR2");
+                    SoundUtils.playSound(MaterialAdjustmentActivity.this, R.raw.warning);
+                    CustomErrorDialog(e, MaterialAdjustmentActivity.this);
+                }
+            });
+        }
+
+    }
+
+
+    /**
+     * 鏄剧ず浠诲姟鍜屾槑缁嗚鏍�
+     */
+    private void showTaskDetailBadgeNum() {
+        //int taskCount = LitePal.count(ProOrde1TaskBean.class);
+        int count = LitePal.count(MaterialAdjustmentDetailBean.class);
+        //qTaskBadgeView.setBadgeNumber(taskCount);
+        qDetailBadgeView.setBadgeNumber(count);
+    }
+
+
+    /**
+     * 閲嶆柊鍒锋柊ui
+     */
+    @SuppressLint("SetTextI18n")
+    private void reInitUI() {
+        runOnUiThread(() -> {
+            scanBarcodeListMap = new HashMap<>();
+            clearAllData();
+            clearRvData();
+            showTaskDetailBadgeNum();
+            setNextFocus("AUFNR1");
+        });
+    }
+
+
+    @OnClick({R.id.iv_scan, R.id.btn_detail, R.id.btn_submit, R.id.btn_revoke})
+    public void onViewClicked(View view) {
+        if (AntiShakeUtils.isInvalidClick(view))
+            return;
+        switch (view.getId()) {
+            case R.id.iv_scan:
+                //鎵爜
+                if (!hasPermission(Manifest.permission.CAMERA))
+                    requestPermission(CAMERA_CODE, Manifest.permission.CAMERA);
+                else
+                    startScan(getResources().getString(R.string.scan_title));
+                break;
+            case R.id.btn_detail:
+                LitePal
+                        .findAllAsync(MaterialAdjustmentDetailBean.class)
+                        .listen(materialAdjustmentDetailBeans -> {
+                            if (materialAdjustmentDetailBeans.size() == 0) {
+                                showError(getString(R.string.No_details_are_available));
+                                return;
+                            }
+                            customBottomSheet = new CustomBottomSheet<>(context, getResources().getString(R.string.detail_info), materialAdjustmentDetailBeans, 1);
+                            new XPopup.Builder(context)
+                                    .moveUpToKeyboard(false) //濡傛灉涓嶅姞杩欎釜锛岃瘎璁哄脊绐椾細绉诲姩鍒拌蒋閿洏涓婇潰
+                                    .isRequestFocus(false)
+                                    .autoFocusEditText(false)
+                                    .autoOpenSoftInput(false)
+                                    .asCustom(customBottomSheet)
+                                    .show();
+                        });
+                break;
+//            case R.id.btn_task:
+//                LitePal.findAllAsync(ProReqOrdeTaskBean.class).listen(list -> {
+//                    if (list.size() == 0) {
+//                        showError(getString(R.string.No_task_please_scan_the_ticket_number_first));
+//                        return;
+//                    }
+//                    customBottomSheet = new CustomBottomSheet<>(context, getResources().getString(R.string.task_info), list, 1);
+//                    new XPopup.Builder(context)
+//                            .moveUpToKeyboard(false) //濡傛灉涓嶅姞杩欎釜锛岃瘎璁哄脊绐椾細绉诲姩鍒拌蒋閿洏涓婇潰
+//                            .isRequestFocus(false)
+//                            .autoFocusEditText(false)
+//                            .autoOpenSoftInput(false)
+//                            .asCustom(customBottomSheet)
+//                            .show();
+//                });
+//                break;
+            case R.id.btn_submit:
+                if (isSave) return;
+                saveData();
+                break;
+        }
+    }
+
+    /**
+     * 淇濆瓨鏁版嵁
+     */
+    private void saveData() {
+        LitePal.findAllAsync(MaterialAdjustmentDetailBean.class).listen(items -> {
+            if (items.size() == 0) {
+                ToastUtils.showLong(getString(R.string.No_data_can_be_saved));
+                return;
+            }
+            isSave = true;
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("list", items);
+            HttpMethods.getInstance().saveAdjust(map, new BaseObserver<ResponseBody>(context) {
+                @Override
+                protected void onSuccess(ResponseBody responseBody) throws Exception {
+                    isSave = false;
+                    String string = responseBody.string();
+                    Type objectType = new TypeToken<BaseResponseBean<String>>() {
+                    }.getType();
+                    BaseResponseBean<String> baseResponseBean = gson.fromJson(string, objectType);
+                    if (baseResponseBean.getCode() != 200) {
+                        showError(baseResponseBean.getMsg());
+                        return;
+                    }
+                    new QMUIDialog.MessageDialogBuilder(context).setTitle(getResources().getString(R.string.tips_title))
+                            .setCancelable(false)
+                            .setMessage(getString(R.string.Data_saved_successfully))
+                            .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss())
+                            .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> {
+                                dialog.dismiss();
+                            })
+                            .create(R.style.QMUI_Dialog).show();
+                    reInitUI();
+                }
+
+                @Override
+                protected void onFailure(Throwable e) throws Exception {
+                    isSave = false;
+                    CustomErrorDialog(e, MaterialAdjustmentActivity.this);
+                }
+            });
+
+
+        });
+    }
+
+    /**
+     * 鍒濆鍖朼dapter鏁版嵁
+     */
+    public void clearRvData() {
+        for (int i = 0; i < dynamicFormBeans.size(); i++) {
+            DynamicFormBean dynamicFormBean = dynamicFormBeans.get(i);
+            dynamicFormBean.setValue("");
+            if (dynamicFormBean.getType() == DynamicFormBean.TIME) {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+                //鑾峰彇褰撳墠鏃堕棿
+                Date date = new Date(System.currentTimeMillis());
+                dynamicFormBean.setValue(simpleDateFormat.format(date));
+            }
+        }
+        dynamicFormAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * 鎵爜
+     *
+     * @param title 鎵爜鏍囬
+     */
+    private void startScan(String title) {
+        Intent intent = new Intent(context, CustomCaptureActivity.class);
+        intent.putExtra(KEY_TITLE, title);
+        intent.putExtra(KEY_IS_CONTINUOUS, false);
+        ActivityCompat.startActivityForResult(context, intent, REQUEST_CODE_SCAN_FOR_GROUP, null);
+    }
+
+
+    @Override
+    public void doRequestPermissionsResult(int requestCode, @NonNull int[] grantResults) {
+        // 璇诲彇鎵嬫満淇℃伅鏉冮檺
+        if (requestCode == CAMERA_CODE) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED)
+                // 鏉冮檺璇锋眰鎴愬姛
+                startScan(getResources().getString(R.string.scan_title));
+            else
+                // 鏉冮檺璇锋眰澶辫触
+                Toast.makeText(context, getResources().getString(R.string.scan_no_permission), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_SCAN_FOR_GROUP) {
+            if (resultCode == RESULT_OK && data != null) {
+                String scanResult = data.getStringExtra(Intents.Scan.RESULT);
+                if (StringUtils.isTrimEmpty(scanResult)) {
+                    showError(getString(R.string.The_bar_code_cannot_be_blank));
+                    return;
+                }
+                if (selectDynamicFormBean != null) {
+                    selectDynamicFormBean.setValue(scanResult);
+                    dynamicFormAdapter.setItemByFieldName(selectDynamicFormBean.getFieldName(), selectDynamicFormBean);
+                }
+                switch (selectDynamicFormBean.getFieldName()) {
+                    case "barcode":
+
+                        break;
+                }
+            }
+        }
+    }
+
+
+    private void setNextFocus(String name) {
+        if (KeyboardUtils.isSoftInputVisible(context)) {
+            KeyboardUtils.hideSoftInput(context);
+        }
+        rvUi.postDelayed(() -> {
+            List<DynamicFormBean> data = dynamicFormAdapter.getData();
+            for (DynamicFormBean bean : data) {
+                if (bean.getFieldName().equals(name)) {
+                    bean.setValue("");
+                    bean.setFocus(true);
+                } else {
+                    bean.setFocus(false);
+                }
+            }
+            dynamicFormAdapter.notifyDataSetChanged();
+        }, 100);
+    }
+
+
+    private void showError(String msg) {
+        SoundUtils.playSound(context, R.raw.warning);
+        ToastUtil.showShortToastCenter(context, msg);
+    }
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            finishActivity();
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    private void finishActivity() {
+        int count = LitePal.count(MaterialAdjustmentDetailBean.class);
+        if (count > 0) {
+            new QMUIDialog.MessageDialogBuilder(context)
+                    .setTitle(getResources().getString(R.string.tips_title))
+                    .setMessage(getString(R.string.Are_you_sure_to_exit))
+                    .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss())
+                    .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> {
+                        dialog.dismiss();
+                        LitePal.deleteAllAsync(MaterialAdjustmentDetailBean.class).listen(i -> {
+                            LitePal.deleteAll(ProOrde1TaskBean.class);
+                            LitePal.deleteAll(ProOrde2TaskBean.class);
+                        });
+                    })
+                    .create(R.style.QMUI_Dialog).show();
+        } else {
+            finish();
+        }
+
+    }
+
+    //鏁板瓧楠岃瘉锛堝寘鍚皬鏁扮偣锛�
+    public static boolean checkNumber(String str) {
+        String regex = "-[0-9]+(.[0-9]+)?|[0-9]+(.[0-9]+)?";
+        if (str == null || !str.matches(regex)) {
+            return false;
+        }
+        return true;
+    }
+
+    public void clearAllData() {
+        if (LitePal.count(MaterialAdjustmentDetailBean.class) > 0) {
+            LitePal.deleteAll(MaterialAdjustmentDetailBean.class);
+        }
+        if (LitePal.count(ProOrde1TaskBean.class) > 0) {
+            LitePal.deleteAll(ProOrde1TaskBean.class);
+        }
+        if (LitePal.count(ProOrde2TaskBean.class) > 0) {
+            LitePal.deleteAll(ProOrde2TaskBean.class);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        clearAllData();
+        RxBus.getInstance().unRegister(this);
+        super.onDestroy();
+    }
+}
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 50fbf73..ff60eba 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
@@ -198,10 +198,14 @@ public class ProReqActivity extends CommonFunctionActivity {
         }.getType();
         //鍔ㄦ�佽〃鍗曟暟鎹�
         dynamicFormBeans = gson.fromJson(jsonStr, objectType);
+        boolean isHIDE_CJ = PreferencesUtil.getBoolean(context, AppConst.HIDE_CJ, false);
         boolean isHIDE_GW = PreferencesUtil.getBoolean(context, AppConst.HIDE_GW, false);
         for (int i = 0; i < dynamicFormBeans.size(); i++) {
             DynamicFormBean bean = dynamicFormBeans.get(i);
-            if(bean.getFieldName().equals("ZCJBM") || bean.getFieldName().equals("ZGWH")){
+            if(bean.getFieldName().equals("ZCJBM")){
+                bean.setShow(!isHIDE_CJ);
+            }
+            if(bean.getFieldName().equals("ZGWH")){
                 bean.setShow(!isHIDE_GW);
             }
         }
@@ -670,12 +674,18 @@ public class ProReqActivity extends CommonFunctionActivity {
                 }
                 showTaskDetailBadgeNum();
                 qmuiTipDialog.dismiss();
+                boolean isHIDE_CJ = PreferencesUtil.getBoolean(context, AppConst.HIDE_CJ, false);
                 boolean isHIDE_GW = PreferencesUtil.getBoolean(context, AppConst.HIDE_GW, false);
-                if (!isHIDE_GW) {
-                    setNextFocus("ZCJBM");
-                } else {
+                if (isHIDE_CJ && isHIDE_GW) {
                     setNextFocus("barcode");
+                } else {
+                    if (!isHIDE_CJ) {
+                        setNextFocus("ZCJBM");
+                    } else if (!isHIDE_GW) {
+                        setNextFocus("ZGWH");
+                    }
                 }
+
             }
 
             @Override
@@ -928,10 +938,14 @@ public class ProReqActivity extends CommonFunctionActivity {
             }
         } else if (requestCode == AppConst.REQUEST_CONFIG) {
             if (resultCode == AppConst.RESULT_CONFIG) {
+                boolean isHIDE_CJ = PreferencesUtil.getBoolean(context, AppConst.HIDE_CJ, false);
                 boolean isHIDE_GW = PreferencesUtil.getBoolean(context, AppConst.HIDE_GW, false);
                 for (int i = 0; i < dynamicFormBeans.size(); i++) {
                     DynamicFormBean bean = dynamicFormBeans.get(i);
-                    if(bean.getFieldName().equals("ZCJBM") || bean.getFieldName().equals("ZGWH")){
+                    if(bean.getFieldName().equals("ZCJBM") ){
+                        bean.setShow(!isHIDE_CJ);
+                    }
+                    if(bean.getFieldName().equals("ZGWH")){
                         bean.setShow(!isHIDE_GW);
                     }
                 }
diff --git a/app/src/main/java/com/techscan/wk/ui/reportwork/ConfigSettingActivity.java b/app/src/main/java/com/techscan/wk/ui/reportwork/ConfigSettingActivity.java
index ba42dab..fb65e28 100644
--- a/app/src/main/java/com/techscan/wk/ui/reportwork/ConfigSettingActivity.java
+++ b/app/src/main/java/com/techscan/wk/ui/reportwork/ConfigSettingActivity.java
@@ -37,6 +37,8 @@ public class ConfigSettingActivity extends BaseActivity {
     QMUITopBar topbar;
     @BindView(R.id.swAutoInsertDetail)
     Switch swAutoInsertDetail;
+    @BindView(R.id.swHideCj)
+    Switch swHideCj;
     @BindView(R.id.swHideGw)
     Switch swHideGw;
 
@@ -47,8 +49,10 @@ public class ConfigSettingActivity extends BaseActivity {
         ButterKnife.bind(this);
 
         boolean aBoolean = PreferencesUtil.getBoolean(context, AppConst.SCAN_ADD_DETAIL, true);
+        boolean isHIDE_CJ = PreferencesUtil.getBoolean(context, AppConst.HIDE_CJ, false);
         boolean isHIDE_GW = PreferencesUtil.getBoolean(context, AppConst.HIDE_GW, false);
         swAutoInsertDetail.setChecked(aBoolean);
+        swHideCj.setChecked(isHIDE_CJ);
         swHideGw.setChecked(isHIDE_GW);
 
         initTopBar();
@@ -68,6 +72,9 @@ public class ConfigSettingActivity extends BaseActivity {
         swAutoInsertDetail.setOnCheckedChangeListener((buttonView, isChecked) -> {
             PreferencesUtil.putBoolean(this, AppConst.SCAN_ADD_DETAIL, isChecked);
         });
+        swHideCj.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            PreferencesUtil.putBoolean(this, AppConst.HIDE_CJ, isChecked);
+        });
         swHideGw.setOnCheckedChangeListener((buttonView, isChecked) -> {
             PreferencesUtil.putBoolean(this, AppConst.HIDE_GW, isChecked);
         });
diff --git a/app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java b/app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java
index cc48413..47637f2 100644
--- a/app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java
+++ b/app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java
@@ -29,6 +29,8 @@ import com.techscan.wk.model.BaseOptionsResponseBean;
 import com.techscan.wk.model.DetailItemBean;
 import com.techscan.wk.model.FlowOrderDetailBean;
 import com.techscan.wk.model.FlowReportWorkDetailBean;
+import com.techscan.wk.model.MaterialAdjustmentDetailBean;
+import com.techscan.wk.model.ProOrde1TaskBean;
 import com.techscan.wk.model.ProReqDetailBean;
 import com.techscan.wk.model.ProReqOrdeTaskBean;
 import com.techscan.wk.model.ProductOrderResponseBean;
@@ -39,7 +41,6 @@ import com.techscan.wk.utils.statusbar.SystemBarTintManager;
 
 import org.jetbrains.annotations.NotNull;
 import org.litepal.LitePal;
-import org.litepal.crud.callback.UpdateOrDeleteCallback;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -160,6 +161,15 @@ public class CustomBottomSheet<T> extends BottomPopupView {
                                     getContext().getString(R.string.unit_title) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getErfme() + "\n"
 
 
+                    );
+                } else if (infoBean instanceof MaterialAdjustmentDetailBean) {
+                    holder.setText(R.id.name, ((MaterialAdjustmentDetailBean) infoBean).getMatnr());
+                    holder.setText(R.id.detail,
+                                    getContext().getString(R.string.Case_number) + getContext().getString(R.string.semicolon) + ((MaterialAdjustmentDetailBean) infoBean).getZboxid() + "\n" +
+                                    getContext().getString(R.string.num_title) + getContext().getString(R.string.semicolon) + ((MaterialAdjustmentDetailBean) infoBean).getErfmg() + "\n" +
+                                    getContext().getString(R.string.unit_title) + getContext().getString(R.string.semicolon) + ((MaterialAdjustmentDetailBean) infoBean).getErfme() + "\n"
+
+
                     );
                 } else {                                                            //鍏朵粬鍙渶瑕佸睍绀篶ode鍜宯ame鐨勯�氱敤澶勭悊
                     holder.setText(R.id.name, ((BaseOptionsResponseBean) infoBean).getCode());
@@ -397,6 +407,52 @@ public class CustomBottomSheet<T> extends BottomPopupView {
                             });
                     messageDialogBuilder.show();
                     return;
+                }else if (item instanceof MaterialAdjustmentDetailBean) {
+                    //濡傛灉鏄槑缁嗭紝鍒欐樉绀哄垹闄�
+                    QMUIDialog.MessageDialogBuilder messageDialogBuilder = new QMUIDialog.MessageDialogBuilder(getContext());
+                    messageDialogBuilder.setMessage(getContext().getString(R.string.Are_you_sure_to_delete_it));
+                    messageDialogBuilder.addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss())
+                            .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> {
+                                //鍒犻櫎
+                                List<T> newList = commonAdapter.getData();
+                                String gid = ((MaterialAdjustmentDetailBean) newList.get(position)).getGid();
+                                long taskRowId = ((MaterialAdjustmentDetailBean) newList.get(position)).getTaskRowId();
+                                double quantity = ((MaterialAdjustmentDetailBean) newList.get(position)).getErfmg();
+                                StringBuilder gidStringBuilder = new StringBuilder();
+                                LitePal.deleteAllAsync(MaterialAdjustmentDetailBean.class, "gid = ?", gid).listen(i1 -> {
+                                    ProOrde1TaskBean taskBean = LitePal.where("rowid = ?", String.valueOf(taskRowId)).findFirst(ProOrde1TaskBean.class);
+                                    double newQty = taskBean.getCompleteNum() - quantity;
+                                    ContentValues contentValues = new ContentValues();
+                                    contentValues.put("completeNum", newQty);
+                                    contentValues.put("complete", false);
+                                    LitePal.updateAsync(ProOrde1TaskBean.class, contentValues, taskBean.getId()).listen(rowsAffected -> {
+                                        Iterator<T> iterator = newList.iterator();
+                                        while (iterator.hasNext()) {
+                                            T next = iterator.next();
+                                            if (((MaterialAdjustmentDetailBean) next).getGid().equals(gid)) {
+                                                gidStringBuilder.append(((MaterialAdjustmentDetailBean) next).getGid()).append(",");
+                                                iterator.remove();
+                                            }
+                                        }
+                                        commonAdapter.setData(newList);
+                                        commonAdapter.notifyDataSetChanged();
+                                        if (commonAdapter.getData().size() < 1)
+                                            CustomBottomSheet.this.dismiss();
+                                        topBar.removeAllLeftViews();
+                                        //topBar.addLeftTextButton("鎬绘暟锛�" + newList.size(), R.id.topbar_left_num);
+                                        Event<List<T>> event = new Event<>();
+                                        event.setCode(0);
+                                        event.setMessage("detail is changed");
+                                        event.setRemoveKey(gidStringBuilder.substring(0, gidStringBuilder.length() - 1));
+                                        event.setData(newList);
+                                        RxBus.getInstance().post(event);
+                                        dialog.dismiss();
+                                    });
+                                });
+
+                            });
+                    messageDialogBuilder.show();
+                    return;
                 }
 //                 else if (item instanceof SaleOutTaskInfoBean)     //閲囪喘鍏ュ簱浠诲姟銆佽浆搴撳崟浠诲姟銆侀攢鍞嚭搴撲换鍔°�佸舰鎬佽浆鎹㈠崟浠诲姟
 //                    return;
diff --git a/app/src/main/res/layout/activity_config_setting.xml b/app/src/main/res/layout/activity_config_setting.xml
index 94e1aaf..b83e9ce 100644
--- a/app/src/main/res/layout/activity_config_setting.xml
+++ b/app/src/main/res/layout/activity_config_setting.xml
@@ -57,18 +57,42 @@
                 android:layout_centerVertical="true"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="0.8"
-                android:text="闅愯棌杞﹂棿鍜屽伐浣嶆爮鐩�"
+                android:text="闅愯棌杞﹂棿鏍忕洰"
                 android:textSize="@dimen/sp_15" />
 
             <Switch
-                android:id="@+id/swHideGw"
+                android:id="@+id/swHideCj"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="0.2"
                 android:gravity="right" />
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="48dp"
+            android:orientation="horizontal"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.8"
+                android:text="闅愯棌宸ヤ綅鏍忕洰"
+                android:textSize="@dimen/sp_15" />
 
+            <Switch
+                android:id="@+id/swHideGw"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.2"
+                android:gravity="right" />
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_mater_adjust_setting.xml b/app/src/main/res/layout/activity_mater_adjust_setting.xml
new file mode 100644
index 0000000..d0ce89e
--- /dev/null
+++ b/app/src/main/res/layout/activity_mater_adjust_setting.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.login.SettingActivity">
+
+    <com.qmuiteam.qmui.widget.QMUITopBar
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/qmui_topbar_height" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:background="@color/qmui_config_color_white"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="48dp"
+            android:orientation="horizontal"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.8"
+                android:text="@string/Scanning_code_automatically_adds_details"
+                android:textSize="@dimen/sp_15" />
+
+            <Switch
+                android:id="@+id/swAutoInsertDetail"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.2"
+                android:gravity="right" />
+        </LinearLayout>
+        <LinearLayout
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="48dp"
+            android:orientation="horizontal"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.8"
+                android:text="闅愯棌杞﹂棿鍜屽伐浣嶆爮鐩�"
+                android:textSize="@dimen/sp_15" />
+
+            <Switch
+                android:id="@+id/swHideGw"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0.2"
+                android:gravity="right" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pro_feed.xml b/app/src/main/res/layout/activity_pro_feed.xml
new file mode 100644
index 0000000..e40bc9a
--- /dev/null
+++ b/app/src/main/res/layout/activity_pro_feed.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/qmui_config_color_white"
+    android:orientation="vertical">
+
+    <com.qmuiteam.qmui.widget.QMUITopBar
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/qmui_topbar_height"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:qmui_topbar_title_text_size="@dimen/sp_18" />
+
+    <LinearLayout
+        android:id="@+id/ll_scan"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/topbar"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/topbar">
+
+        <include layout="@layout/layout_edit_scan" />
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_ui"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/ll_bottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/ll_scan" />
+
+    <LinearLayout
+        android:id="@+id/ll_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <include layout="@layout/layout_bottom_btn1" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file