diff --git a/.idea/misc.xml b/.idea/misc.xml
index f29a031..b44cbfa 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -28,6 +28,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index c5d4d7c..c2e4577 100644
--- a/app/build.gradle
+++ b/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'
diff --git a/app/release/output.json b/app/release/output.json
index 4d6bdd4..cebe078 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.12","enabled":true,"outputFile":"维科上料报工系统_v1.0.12.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.12.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.13","enabled":true,"outputFile":"维科上料报工系统_v1.0.13.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.13.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/assets/ProReqBodyUI.json b/app/src/main/assets/ProReqBodyUI.json
index 6f5f987..d7075f6 100644
--- a/app/src/main/assets/ProReqBodyUI.json
+++ b/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": "搴撳瓨鍦扮偣",
diff --git a/app/src/main/java/com/techscan/wk/ui/finishedWarehous/FinshWarehouseActivity.java b/app/src/main/java/com/techscan/wk/ui/finishedWarehous/FinshWarehouseActivity.java
index 2758921..95a7b80 100644
--- a/app/src/main/java/com/techscan/wk/ui/finishedWarehous/FinshWarehouseActivity.java
+++ b/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
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 c156a37..4b337b7 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
@@ -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 鐢熶骇鍗婃垚鍝佷笂鏂"};
diff --git a/app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java b/app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java
index bb085c3..9b64d6b 100644
--- a/app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java
+++ b/app/src/main/java/com/techscan/wk/ui/reportwork/FlowReportWorkActivity.java
@@ -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