1.0.13

.idea/misc.xml

@@ -28,6 +28,7 @@
         <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_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/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" />

app/build.gradle

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

app/release/output.json

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

app/src/main/assets/ProReqBodyUI.json

@@ -70,14 +70,14 @@
   },
   {
     "id": 6,
-    "type": 1,
+    "type": 2,
     "fieldName": "lgort",
     "name": "库存地点",
     "value": "",
     "editExp": 0,
     "values": [],
     "mast": false,
-    "canChange": true,
+    "canChange": false,
     "isShow": true,
     "language": {
       "zh": "库存地点",

app/src/main/java/com/techscan/wk/ui/finishedWarehous/FinshWarehouseActivity.java

@@ -335,16 +335,18 @@ public class FinshWarehouseActivity extends CommonFunctionActivity {
                     QMUIDialog.MessageDialogBuilder messageDialogBuilder = new QMUIDialog.MessageDialogBuilder(context);
                     messageDialogBuilder.setTitle(getResources().getString(R.string.tips_title))
                             .setCancelable(false)
-                            .setMessage(getString(R.string.Data_saved_successfully))
+                            .setMessage(baseResponseBean.getData())
                             .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();
+                            .create(R.style.QMUI_Dialog);
                     messageDialogBuilder.show().setOnDismissListener(dialogInterface -> query());
                 } else {
                     showError(baseResponseBean.getMsg());
                 }
+
+
             }
 
             @Override

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

@@ -231,13 +231,15 @@ public class ProReqActivity extends CommonFunctionActivity {
             }
             if (dynamicFormBean.getFieldName().equals("ZLYSJ")) {
                 chooseDate(dynamicFormBean);
-            } else if (dynamicFormBean.getFieldName().equals("lgort")) {
-                Router.newIntent(context)
-                        .to(LgortListActivity.class)
-                        .putString("title", dynamicFormAdapter.getCurrentLanguage(dynamicFormBean))
-                        .requestCode(0x201)
-                        .launch();
-            } else if (dynamicFormBean.getFieldName().equals("ZYWLX")) {
+            }
+//            else if (dynamicFormBean.getFieldName().equals("lgort")) {
+//                Router.newIntent(context)
+//                        .to(LgortListActivity.class)
+//                        .putString("title", dynamicFormAdapter.getCurrentLanguage(dynamicFormBean))
+//                        .requestCode(0x201)
+//                        .launch();
+//            }
+            else if (dynamicFormBean.getFieldName().equals("ZYWLX")) {
                 String value = dynamicFormBean.getValue();
                 int selectIndex = -1;
                 final String[] items = new String[]{"L01 生产主投领料", "L02 生产半成品上料"};

app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java

@@ -85,7 +85,7 @@ import q.rorbin.badgeview.QBadgeView;
 /**
  * Description:流转单报工
  * 按规则解析条码 [)>@06@QRPART@10V101010@1P33602100@3SX1000043500001@1T20240724001@Q10@14D20240724@@
- * 流转单号： T10000435000001
+ * 流转单号： T10000453000001
  *
  * @author MULEI
  * @date 2024/9/11