liamsun
/
VicoFeedReport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.0.16

master
ml 6 months ago
parent
2d4cafabcc
commit
087c7518b4
8 changed files with 90 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      .idea/deploymentTargetDropDown.xml
  2. 2
      app/build.gradle
  3. 2
      app/release/output.json
  4. 18
      app/src/main/assets/FinshWareHouseUI.json
  5. 9
      app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java
  6. 48
      app/src/main/java/com/techscan/wk/ui/finishedWarehous/FinshWarehouseActivity.java
  7. 14
      app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java
  8. 7
      app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java

8
.idea/deploymentTargetDropDown.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<targetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
@ -11,7 +11,7 @@
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-11-26T02:31:07.996443500Z" />
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-11-26T05:22:40.085094700Z" />
</component>
</project>

2
app/build.gradle
View File

@ -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'

2
app/release/output.json
View File

@ -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":{}}]
[{"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":{}}]

18
app/src/main/assets/FinshWareHouseUI.json
View File

@ -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": "หมายเลขกล่อง"
}
}
]

9
app/src/main/java/com/techscan/wk/model/ReportWorkErrorInfoBean.java
View File

@ -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;
}

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

@ -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<CellInfo>() {
@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<ReportWorkBean> 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;
}

14
app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkErrorListActivity.java
View File

@ -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() {

7
app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkOffsetActivity.java
View File

@ -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());

Write Preview
Loading…
Cancel
Save