1.0.6

app/build.gradle

@@ -9,7 +9,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.5"
+        versionName "1.0.6"
         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.5","enabled":true,"outputFile":"维科上料报工系统_v1.0.5.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.5.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.6","enabled":true,"outputFile":"维科上料报工系统_v1.0.6.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.6.apk","properties":{}}]

app/src/main/assets/ProReqBodyUI.json

@@ -1,21 +1,4 @@
 [
-  {
-    "id": 1,
-    "type": 5,
-    "fieldName": "ZLYSJ",
-    "name": "领用时间",
-    "value": "",
-    "editExp": 0,
-    "values": [],
-    "mast": false,
-    "canChange": true,
-    "isShow": true,
-    "language": {
-      "zh": "领用时间",
-      "en": "Claim time",
-      "th": "ใช้เวลา"
-    }
-  },
   {
     "id": 2,
     "type": 2,

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

@@ -479,7 +479,7 @@ public class ProReqActivity extends CommonFunctionActivity {
      * 加入明细方法
      */
     private void addDetail() {
-        DynamicFormBean ZLYSJItem = dynamicFormAdapter.getItemByFieldName("ZLYSJ");//领用时间
+        //DynamicFormBean ZLYSJItem = dynamicFormAdapter.getItemByFieldName("ZLYSJ");//领用时间
         DynamicFormBean ZCJBMItem = dynamicFormAdapter.getItemByFieldName("ZCJBM");//车间编码
         DynamicFormBean ZGWHItem = dynamicFormAdapter.getItemByFieldName("ZGWH");//工位号
         DynamicFormBean lgortItem = dynamicFormAdapter.getItemByFieldName("lgort");//库存地点
@@ -556,7 +556,7 @@ public class ProReqActivity extends CommonFunctionActivity {
                         detailBean.setZcjbm(ZCJBMItem.getValue());
                         detailBean.setZgwh(ZGWHItem.getValue());
                         detailBean.setZitemo(bean.getRspos());
-                        detailBean.setZlysj(ZLYSJItem.getValue());
+                        detailBean.setZlysj("");
                         detailBean.setZboxid(ZXTPCItem.getValue());
                         detailBean.setZpc(ZPCItem.getValue());
                         detailBean.setZreqlineid("");

app/src/main/java/com/techscan/wk/utils/update/UpdateUtil.java

@@ -33,18 +33,19 @@ public class UpdateUtil {
 //                .setIcon(R.mipmap.ic_launcher)
                 .setTitle(R.string.checked_new_version)
                 .setMessage(sFinalAge)
+                .setCancelable(false)
                 .setPositiveButton(R.string.update_version_true, (dialogInterface, i) -> {
                     //下载APK
                     toDownload(activity, url);
                     alertDialog.dismiss();
                 })
-                .setNegativeButton(R.string.update_version_false, (dialogInterface, i) -> {
-                    ToastUtil.showShortToast(activity, activity.getString(R.string.update_cancel_update));
-                    if (callBack!=null){
-                        callBack.onCancelUpdate();
-                    }
-                    alertDialog.dismiss();
-                })
+//                .setNegativeButton(R.string.update_version_false, (dialogInterface, i) -> {
+//                    ToastUtil.showShortToast(activity, activity.getString(R.string.update_cancel_update));
+//                    if (callBack!=null){
+//                        callBack.onCancelUpdate();
+//                    }
+//                    alertDialog.dismiss();
+//                })
                 .create();
         alertDialog.show();
     }

app/src/main/java/com/techscan/wk/widgets/CustomBottomSheet.java

@@ -153,7 +153,6 @@ public class CustomBottomSheet<T> extends BottomPopupView {
                 } else if (infoBean instanceof ProReqDetailBean) {
                     holder.setText(R.id.name, ((ProReqDetailBean) infoBean).getMatnr());
                     holder.setText(R.id.detail,
-                            getContext().getString(R.string.Claim_time) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getZlysj() + "\n" +
                                     getContext().getString(R.string.Stock_location) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getLgortName() + "\n" +
                                     getContext().getString(R.string.Case_number) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getZboxid() + "\n" +
                                     getContext().getString(R.string.batch) + getContext().getString(R.string.semicolon) + ((ProReqDetailBean) infoBean).getZpc() + "\n" +