From 087c7518b48eceba075e48d9856ceed0ed972cbc Mon Sep 17 00:00:00 2001 From: ml <1522572907@qq.com> Date: Fri, 13 Dec 2024 10:11:46 +0800 Subject: [PATCH] 1.0.16 --- .idea/deploymentTargetDropDown.xml | 8 ++-- app/build.gradle | 2 +- app/release/output.json | 2 +- app/src/main/assets/FinshWareHouseUI.json | 18 +++++++ .../wk/model/ReportWorkErrorInfoBean.java | 9 ++++ .../FinshWarehouseActivity.java | 48 ++++++++++++++++++- .../ReportWorkErrorListActivity.java | 14 ++++-- .../reportwork/ReportWorkOffsetActivity.java | 7 +-- 8 files changed, 90 insertions(+), 18 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 32218ea..48330ab 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,9 +1,9 @@ - + - + @@ -11,7 +11,7 @@ - - + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 86f13a0..3966841 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { //noinspection ExpiredTargetSdkVersion targetSdkVersion 29 versionCode 1 - versionName "1.0.15" + versionName "1.0.16" 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 65185b8..81e2a65 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.15","enabled":true,"outputFile":"维科上料报工系统_v1.0.15.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.15.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.16","enabled":true,"outputFile":"维科上料报工系统_v1.0.16.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.16.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/assets/FinshWareHouseUI.json b/app/src/main/assets/FinshWareHouseUI.json index 2dd3ca1..2e61684 100644 --- a/app/src/main/assets/FinshWareHouseUI.json +++ b/app/src/main/assets/FinshWareHouseUI.json @@ -16,5 +16,23 @@ "en": "Work order number", "th": "喔浮喔侧涪喙喔ム競喔笝喙夃覆" } + }, + { + "id": 2, + "type": 2, + "fieldName": "barcode", + "name": "绠卞彿", + "value": "", + "editExp": 0, + "values": [], + "mast": false, + "canChange": true, + "isShow": true, + "isFocus": false, + "language": { + "zh": "绠卞彿", + "en": "Case number", + "th": "喔浮喔侧涪喙喔ム競喔佮弗喙堗腑喔" + } } ] \ No newline at end of file diff --git a/app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java b/app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java index ee515f2..58d66b6 100644 --- a/app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java +++ b/app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java @@ -7,6 +7,7 @@ public class ReportWorkErrorInfoBean{ private String aufnr; private String matnr; private String createTime; + private String flowReport; private int createUser; private int dr; private String gmein; @@ -27,6 +28,14 @@ public class ReportWorkErrorInfoBean{ private String zpc; private String zzt; + public String getFlowReport() { + return flowReport; + } + + public void setFlowReport(String flowReport) { + this.flowReport = flowReport; + } + public String getMatnr() { return matnr; } 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 95a7b80..4b9e353 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 @@ -58,6 +58,7 @@ 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.reportwork.ReportWorkErrorListActivity; import com.techscan.wk.ui.scan.CustomCaptureActivity; import com.techscan.wk.utils.AntiShakeUtils; import com.techscan.wk.utils.FindUtils; @@ -235,6 +236,16 @@ public class FinshWarehouseActivity extends CommonFunctionActivity { } private void setTableRowClickListener() { + smartTable.getConfig().setContentCellBackgroundFormat(new BaseCellBackgroundFormat() { + @Override + public int getBackGroundColor(CellInfo cellInfo) { + ReportWorkBean reportWorkBean = list.get(cellInfo.row); + if (reportWorkBean.isSelect()) { + return ContextCompat.getColor(FinshWarehouseActivity.this, R.color.bar_divider); + } + return TableConfig.INVALID_COLOR; + } + }); smartTable.getTableData().setOnRowClickListener((column, reportWorkOffsetBean, coIndex, row) -> { if (column.getFieldName().equals("select")) { List beanList = smartTable.getTableData().getT(); @@ -254,6 +265,7 @@ public class FinshWarehouseActivity extends CommonFunctionActivity { } else { select.setColumnName(getString(R.string.select_all)); } + smartTable.refreshDrawableState(); smartTable.invalidate(); @@ -358,7 +370,7 @@ public class FinshWarehouseActivity extends CommonFunctionActivity { } private void setTableData() { - mTableData = new TableData<>("", list, select, AUFNR, GMNGA,zxtpc,createTime,zpc); + mTableData = new TableData<>("", list, select, AUFNR, GMNGA, zxtpc, createTime, zpc); smartTable.setTableData(mTableData); smartTable.invalidate(); @@ -444,6 +456,40 @@ public class FinshWarehouseActivity extends CommonFunctionActivity { } query(); break; + case "barcode": + if (TextUtils.isEmpty(value)) { + showError("绠卞彿涓嶅彲涓虹┖"); + dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); + return; + } + if (KeyboardUtils.isSoftInputVisible(context)) { + KeyboardUtils.hideSoftInput(context); + } + if (list.size() == 0) { + showError(getString(R.string.No_data_was_queried)); + return; + } + int selectNum = 0; + for (int i = 0; i < list.size(); i++) { + ReportWorkBean reportWorkBean = list.get(i); + if (reportWorkBean.getZxtpc().equalsIgnoreCase(value)) { + reportWorkBean.setSelect(true); + selectNum++; + } else { + reportWorkBean.setSelect(false); + } + } + select.setColumnName(getString(R.string.select_all)); + if (list.size() == selectNum) { + select.setColumnName(getString(R.string.cancel_info)); + } + setTableData(); + setTableRowClickListener(); + + if (selectNum == 0) { + showError(getString(R.string.No_data_was_queried)); + } + break; default: break; } diff --git a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java index 2eedf6f..8b05aeb 100644 --- a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java +++ b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java @@ -11,6 +11,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.Rect; import android.os.Bundle; import android.text.TextUtils; import android.util.DisplayMetrics; @@ -29,8 +32,10 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.bin.david.form.core.TableConfig; +import com.bin.david.form.data.CellInfo; import com.bin.david.form.data.column.Column; import com.bin.david.form.data.format.bg.BaseBackgroundFormat; +import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat; import com.bin.david.form.data.format.bg.IBackgroundFormat; import com.bin.david.form.data.format.draw.ImageResDrawFormat; import com.bin.david.form.data.style.FontStyle; @@ -60,16 +65,12 @@ 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.rxretrofit.exception.ApiException; -import com.techscan.wk.rxretrofit.exception.CustomException; import com.techscan.wk.ui.scan.CustomCaptureActivity; import com.techscan.wk.utils.AntiShakeUtils; import com.techscan.wk.utils.DateUtils; -import com.techscan.wk.utils.DialogUtil; import com.techscan.wk.utils.FindUtils; import com.techscan.wk.utils.SoundUtils; import com.techscan.wk.utils.ToastUtil; -import com.techscan.wk.utils.statusbar.StatusBarUtil; import com.techscan.wk.widgets.DetailBottomSheet; import com.techscan.wk.widgets.MySmartTable; @@ -159,6 +160,7 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { config.setVerticalPadding(12); IBackgroundFormat backgroundFormat = new BaseBackgroundFormat(getResources().getColor(R.color.white_grey_3)); config.setColumnTitleBackground(backgroundFormat); + config.setShowXSequence(false); config.setShowYSequence(false); config.setShowTableTitle(false); @@ -212,7 +214,6 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { } } }); - setTableData(); setTableRowClickListener(); } @@ -238,6 +239,7 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { } else { select.setColumnName(getString(R.string.select_all)); } + smartTable.refreshDrawableState(); smartTable.invalidate(); @@ -267,6 +269,8 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { }); + + } private void setTableData() { diff --git a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java index 98dac7f..8037aab 100644 --- a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java +++ b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java @@ -51,22 +51,17 @@ import com.techscan.wk.adapter.DynamicFormAdapter; import com.techscan.wk.base.CommonFunctionActivity; import com.techscan.wk.model.DetailShowBean; import com.techscan.wk.model.DynamicFormBean; -import com.techscan.wk.model.ReportWorkErrorInfoBean; import com.techscan.wk.model.ReportWorkOffsetBean; 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.rxretrofit.exception.ApiException; -import com.techscan.wk.rxretrofit.exception.CustomException; import com.techscan.wk.ui.scan.CustomCaptureActivity; import com.techscan.wk.utils.AntiShakeUtils; -import com.techscan.wk.utils.DialogUtil; import com.techscan.wk.utils.FindUtils; import com.techscan.wk.utils.SoundUtils; import com.techscan.wk.utils.ToastUtil; -import com.techscan.wk.utils.statusbar.StatusBarUtil; import com.techscan.wk.widgets.DetailBottomSheet; import com.techscan.wk.widgets.MySmartTable; @@ -324,7 +319,7 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { .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());