From d379bd539e8f94f32e24dd5e7e63d7f0a89ec807 Mon Sep 17 00:00:00 2001 From: ml <1522572907@qq.com> Date: Wed, 25 Sep 2024 11:57:20 +0800 Subject: [PATCH] 1.0.5 --- app/build.gradle | 2 +- app/release/output.json | 2 +- app/src/main/AndroidManifest.xml | 12 +- app/src/main/assets/FlowReportWorkUI.json | 2 +- .../techscan/wk/model/AnalysisBarBean.java | 3 + .../wk/model/ReportWorkErrorInfoBean.java | 9 + .../wk/model/ReportWorkOffsetBean.java | 9 + .../techscan/wk/ui/proreq/ProReqActivity.java | 215 +++++------- .../wk/ui/query/FlowOrderQueryActivity.java | 26 +- .../ui/reportwork/FlowReportWorkActivity.java | 328 +++++++++--------- .../wk/ui/reportwork/ReportWorkActivity.java | 12 +- .../ReportWorkErrorListActivity.java | 6 +- .../reportwork/ReportWorkOffsetActivity.java | 83 +++-- .../techscan/wk/utils/BarAnalysisUtils.java | 5 + app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values-th-rTH/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 17 files changed, 378 insertions(+), 339 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dd91b86..d445782 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { //noinspection ExpiredTargetSdkVersion targetSdkVersion 29 versionCode 1 - versionName "1.0.3" + versionName "1.0.5" 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 c51baa7..a6097d7 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.3","enabled":true,"outputFile":"维科上料报工系统_v1.0.3.apk","fullName":"release","baseName":"release"},"path":"维科上料报工系统_v1.0.3.apk","properties":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4ae14d8..1e64979 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,24 +34,25 @@ tools:ignore="AllowBackup,GoogleAppIndexingWarning" tools:replace="android:icon" tools:targetApi="n"> + - - - 0) { - new QMUIDialog.MessageDialogBuilder(context) - .setTitle(getResources().getString(R.string.tips_title)) - .setMessage(getString(R.string.Do_you_want_to_rescan_the_work_order)) - .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss()) - .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> { - dialog.dismiss(); - LitePal.deleteAllAsync(ProReqOrdeTaskBean.class).listen(i -> { - LitePal.deleteAll(ProReqDetailBean.class); - for (int j = 0; j < dynamicFormBeans.size(); j++) { - DynamicFormBean bean = dynamicFormBeans.get(j); - if (bean.getFieldName().equals("lgort") || - bean.getFieldName().equals("AUFNR") || - bean.getFieldName().equals("ZGWH") || - bean.getFieldName().equals("ZCJBM") || - bean.getFieldName().equals("ZLYSJ")) { - continue; - } else { - bean.setValue(""); - } - } - dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); - scanBarcodeListMap = new HashMap<>(); - query(value); - }); - }) - .create(R.style.QMUI_Dialog).show(); + if (LitePal.count(ProReqOrdeTaskBean.class) == 0) { + query(value); return; } - query(value); + new QMUIDialog.MessageDialogBuilder(context) + .setTitle(getResources().getString(R.string.tips_title)) + .setMessage(getString(R.string.Do_you_want_to_rescan_the_work_order)) + .addAction(getResources().getString(R.string.cancel_info), (dialog, index) -> dialog.dismiss()) + .addAction(getResources().getString(R.string.confirm_info), (dialog, index) -> { + dialog.dismiss(); + LitePal.deleteAllAsync(ProReqOrdeTaskBean.class).listen(i -> { + LitePal.deleteAll(ProReqDetailBean.class); + for (int j = 0; j < dynamicFormBeans.size(); j++) { + DynamicFormBean bean = dynamicFormBeans.get(j); + if (bean.getFieldName().equals("lgort") || + bean.getFieldName().equals("AUFNR") || + bean.getFieldName().equals("ZGWH") || + bean.getFieldName().equals("ZCJBM") || + bean.getFieldName().equals("ZLYSJ")) { + continue; + } else { + bean.setValue(""); + } + } + dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); + scanBarcodeListMap = new HashMap<>(); + query(value); + }); + }) + .create(R.style.QMUI_Dialog).show(); break; case "ZCJBM": setNextFocus("ZGWH"); @@ -329,14 +325,12 @@ public class ProReqActivity extends CommonFunctionActivity { showError(getString(R.string.There_is_no_aterial_information_in_the_barcode_please_confirm)); return; } - // //鍒ゆ柇鏉＄爜鏄惁宸茬粡琚壂鎻 // if (isInBarcodeList(scanBarcodeListMap, value)) { // showError(getString(R.string.Do_not_scan_the_barcode_again)); // dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); // return; // } - getBarcodeInfo(value); break; case "quantity": @@ -348,7 +342,11 @@ public class ProReqActivity extends CommonFunctionActivity { }); } - + /** + * 瑙ｆ瀽鏉＄爜淇℃伅锛屽苟姣斿宸ュ崟浜у搧淇℃伅 + * + * @param value 鏉＄爜鍐呭 + */ private void getBarcodeInfo(String value) { AnalysisBarBean bean = BarAnalysisUtils.analysisBarcode(value); LitePal @@ -399,6 +397,7 @@ public class ProReqActivity extends CommonFunctionActivity { dynamicFormAdapter.setList(dynamicFormBeans); dynamicFormAdapter.notifyDataSetChanged(); + //鍒ゆ柇鏄惁寮鍚 鎵弿鑷姩鍔犲叆鏄庣粏 boolean aBoolean = PreferencesUtil.getBoolean(context, AppConst.SCAN_ADD_DETAIL, true); if (aBoolean) { new Handler().postDelayed(new Runnable() { @@ -413,6 +412,11 @@ public class ProReqActivity extends CommonFunctionActivity { } + /** + * 鏍规嵁宸ュ崟鑾峰彇宸ュ崟鐗╂枡淇℃伅 + * + * @param id 宸ュ崟鍙 + */ private void query(String id) { HttpMethods.getInstance().getOrderInfo(id, new BaseObserver(context) { @Override @@ -421,41 +425,49 @@ public class ProReqActivity extends CommonFunctionActivity { Type objectType = new TypeToken>>() { }.getType(); BaseResponseBean> baseResponseBean = gson.fromJson(string, objectType); - if (baseResponseBean.getCode() == 200) { - List data = baseResponseBean.getData(); - if (data.size() > 0) { - proReqOrderBean = data.get(0); - List item = proReqOrderBean.getItem(); - if (item.size() > 0) { - QMUITipDialog qmuiTipDialog = new QMUITipDialog.Builder(context).setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING).create(); - qmuiTipDialog.setCancelable(false); - qmuiTipDialog.setCanceledOnTouchOutside(false); - qmuiTipDialog.show(); - setNextFocus("ZCJBM"); - for (int i = 0; i < item.size(); i++) { - ProReqOrdeTaskBean taskBean = item.get(i); - taskBean.setRowid(System.currentTimeMillis()); - taskBean.save(); - } - qmuiTipDialog.dismiss(); - } else { - showError(getString(R.string.No_data_was_obtained)); - setNextFocus("AUFNR"); - } - } else { - showError(getString(R.string.No_data_was_obtained)); - setNextFocus("AUFNR"); - - } - } else { + if (baseResponseBean.getCode() != 200) { showError(baseResponseBean.getMsg()); setNextFocus("AUFNR"); + showTaskDetailBadgeNum(); + return; + } + + List data = baseResponseBean.getData(); + if (data.size() == 0) { + showError(getString(R.string.No_data_was_obtained)); + setNextFocus("AUFNR"); + showTaskDetailBadgeNum(); + return; + } + + proReqOrderBean = data.get(0); + List item = proReqOrderBean.getItem(); + if (item.size() == 0) { + showError(getString(R.string.No_data_was_obtained)); + setNextFocus("AUFNR"); + showTaskDetailBadgeNum(); + return; + } + + QMUITipDialog qmuiTipDialog = new QMUITipDialog.Builder(context).setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING).create(); + qmuiTipDialog.setCancelable(false); + qmuiTipDialog.setCanceledOnTouchOutside(false); + qmuiTipDialog.show(); + for (int i = 0; i < item.size(); i++) { + ProReqOrdeTaskBean taskBean = item.get(i); + taskBean.setRowid(System.currentTimeMillis()); + taskBean.save(); } showTaskDetailBadgeNum(); + qmuiTipDialog.dismiss(); + + setNextFocus("ZCJBM"); + } @Override protected void onFailure(Throwable e) throws Exception { + showTaskDetailBadgeNum(); setNextFocus("AUFNR"); SoundUtils.playSound(ProReqActivity.this, R.raw.warning); CustomErrorDialog(e, ProReqActivity.this); @@ -463,6 +475,9 @@ public class ProReqActivity extends CommonFunctionActivity { }); } + /** + * 鍔犲叆鏄庣粏鏂规硶 + */ private void addDetail() { DynamicFormBean ZLYSJItem = dynamicFormAdapter.getItemByFieldName("ZLYSJ");//棰嗙敤鏃堕棿 DynamicFormBean ZCJBMItem = dynamicFormAdapter.getItemByFieldName("ZCJBM");//杞﹂棿缂栫爜 @@ -584,48 +599,6 @@ public class ProReqActivity extends CommonFunctionActivity { }); -// List detailBeanList = new ArrayList<>(); -// for (ProReqOrdeTaskBean bean : proReqOrdeTaskBeans) { -// double taskNum = bean.getBdmng(); -// double completeNum = bean.getCompleteNum(); -// if (completeNum == taskNum) continue; -// double needNum = taskNum - completeNum; -// -// ProReqDetailBean detailBean = new ProReqDetailBean(); -// -// if (scanQuantity < needNum) { -// bean.setCompleteNum(scanQuantity+completeNum); -// bean.setComplete(false); -// detailBean.setBdmng(scanQuantity); -// detailBeanList.add(detailBean); -// break; -// } else if (scanQuantity == needNum) { -// bean.setCompleteNum(scanQuantity+completeNum); -// bean.setComplete(true); -// -// detailBean.setBdmng(scanQuantity); -// detailBeanList.add(detailBean); -// break; -// } else if (scanQuantity > needNum) { -// double v = scanQuantity - needNum; -// scanQuantity = v; -// bean.setCompleteNum(needNum + completeNum); -// bean.setComplete(false); -// bean.save(); -// -// detailBean.setBdmng(needNum); -// detailBeanList.add(detailBean); -// } -// } -// -// LitePal.saveAllAsync(detailBeanList).listen(new SaveCallback() { -// @Override -// public void onFinish(boolean b) { -// ToastUtils.showLong("鎴愬姛"); -// } -// }); - - }); } @@ -709,7 +682,9 @@ public class ProReqActivity extends CommonFunctionActivity { } } - + /** + * 淇濆瓨鏁版嵁 + */ private void saveData() { LitePal.findAllAsync(ProReqDetailBean.class).listen(items -> { if (items.size() == 0) { @@ -718,7 +693,7 @@ public class ProReqActivity extends CommonFunctionActivity { } isSave = true; HashMap map = new HashMap<>(); - map.put("imports", items);//鍞竴鍊 + map.put("imports", items); HttpMethods.getInstance().savePick(map, new BaseObserver(context) { @Override protected void onSuccess(ResponseBody responseBody) throws Exception { @@ -727,19 +702,19 @@ public class ProReqActivity extends CommonFunctionActivity { Type objectType = new TypeToken>() { }.getType(); BaseResponseBean baseResponseBean = gson.fromJson(string, objectType); - if (baseResponseBean.getCode() == 200) { - new QMUIDialog.MessageDialogBuilder(context).setTitle(getResources().getString(R.string.tips_title)) - .setCancelable(false) - .setMessage(getString(R.string.Data_saved_successfully)) - .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(); - reInitUI(); - } else { + if (baseResponseBean.getCode() != 200) { showError(baseResponseBean.getMsg()); + return; } + new QMUIDialog.MessageDialogBuilder(context).setTitle(getResources().getString(R.string.tips_title)) + .setCancelable(false) + .setMessage(getString(R.string.Data_saved_successfully)) + .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(); + reInitUI(); } @Override diff --git a/app/src/main/java/com/techscan/wk/ui/query/FlowOrderQueryActivity.java b/app/src/main/java/com/techscan/wk/ui/query/FlowOrderQueryActivity.java index 65a4dab..e17593a 100644 --- a/app/src/main/java/com/techscan/wk/ui/query/FlowOrderQueryActivity.java +++ b/app/src/main/java/com/techscan/wk/ui/query/FlowOrderQueryActivity.java @@ -243,6 +243,11 @@ public class FlowOrderQueryActivity extends CommonFunctionActivity { }); } + /** + * 鏍规嵁娴佽浆鍗曡皟鐢ㄦ煡璇㈡帴鍙 + * + * @param value 娴佽浆鍗曞彿 + */ private void query(String value) { HttpMethods.getInstance().getFlowReport(value, new BaseObserver(context) { @Override @@ -251,19 +256,21 @@ public class FlowOrderQueryActivity extends CommonFunctionActivity { Type objectType = new TypeToken>>() { }.getType(); BaseResponseBean> baseResponseBean = gson.fromJson(string, objectType); - if (baseResponseBean.getCode() == 200) { + if (baseResponseBean.getCode() != 200) { list.clear(); - if (baseResponseBean.getData().size() > 0) { - list.addAll(baseResponseBean.getData()); - } else { - ToastUtils.showLong(getString(R.string.No_data_was_obtained)); - } setTableData(); - } else { + showError(baseResponseBean.getMsg()); + return; + } + if (baseResponseBean.getData() == null || baseResponseBean.getData().size() == 0) { + ToastUtils.showLong(getString(R.string.No_data_was_obtained)); list.clear(); setTableData(); - showError(baseResponseBean.getMsg()); + return; } + list.clear(); + list.addAll(baseResponseBean.getData()); + setTableData(); } @Override @@ -309,8 +316,7 @@ public class FlowOrderQueryActivity extends CommonFunctionActivity { dynamicFormAdapter.setItemByFieldName(selectDynamicFormBean.getFieldName(), selectDynamicFormBean); } switch (selectDynamicFormBean.getFieldName()) { - case "invcode": - + case "barcode": break; } } 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 6b520c2..4ea341f 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 @@ -75,9 +75,10 @@ import butterknife.OnClick; import io.reactivex.disposables.Disposable; import okhttp3.ResponseBody; import q.rorbin.badgeview.QBadgeView; - /** - * 娴佽浆鍗曟姤宸 + * Description:娴佽浆鍗曟姤宸 + * @author MULEI + * @date 2024/9/11 */ public class FlowReportWorkActivity extends CommonFunctionActivity { @@ -122,7 +123,6 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { if (savedInstanceState == null) { clearAllData(); } - StatusBarUtil.setStatusBarColor(this, ContextCompat.getColor(this, R.color.app_color_blue)); ButterKnife.bind(this); setBody(true); scanBarcodeListMap = new HashMap<>(); @@ -286,48 +286,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { menuDialogBuilder.addItems(items, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - if (finalSelectIndex != -1 && which != finalSelectIndex) { - dialog.dismiss(); - int count = LitePal.count(FlowOrderDetailBean.class); - int detailCount = LitePal.count(FlowReportWorkDetailBean.class); - if (rvUiHaveData() || count > 0 || detailCount > 0) { - new QMUIDialog.MessageDialogBuilder(context).setTitle(getResources().getString(R.string.tips_title)) - .setCancelable(false) - .setMessage(getString(R.string.Do_you_want_to_change_scan_rules_Switching_will_clear_the_interface_and_all_scan_details)) - .addAction(getResources().getString(R.string.cancel_info), (dialog1, index) -> dialog1.dismiss()) - .addAction(getResources().getString(R.string.confirm_info), (dialog1, index) -> { - dialog1.dismiss(); - initRvData(); - scanBarcodeListMap = new HashMap<>(); - LitePal.deleteAll(FlowOrderDetailBean.class); - LitePal.deleteAll(FlowReportWorkDetailBean.class); - showDetailBadgeNum(); - showOrderDetailBadgeNum(); - String item = items[which]; - dynamicFormBean.setValue(item); - dynamicFormAdapter.setItemByFieldName(dynamicFormBean.getFieldName(), dynamicFormBean); - dynamicFormAdapter.notifyDataSetChanged(); - if (item.equals(items[1])) { - llflowOrderDetail.setVisibility(View.VISIBLE); - } else { - llflowOrderDetail.setVisibility(View.GONE); - } - }) - .create(R.style.QMUI_Dialog).show(); - } else { - - String item = items[which]; - dynamicFormBean.setValue(item); - dynamicFormAdapter.setItemByFieldName(dynamicFormBean.getFieldName(), dynamicFormBean); - dynamicFormAdapter.notifyDataSetChanged(); - if (item.equals(items[1])) { - llflowOrderDetail.setVisibility(View.VISIBLE); - } else { - llflowOrderDetail.setVisibility(View.GONE); - } - } - - } else { + int count = LitePal.count(FlowOrderDetailBean.class); + int detailCount = LitePal.count(FlowReportWorkDetailBean.class); + if(which == finalSelectIndex || (!rvUiHaveData() && count == 0 && detailCount == 0)){ dialog.dismiss(); String item = items[which]; dynamicFormBean.setValue(item); @@ -338,7 +299,35 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { } else { llflowOrderDetail.setVisibility(View.GONE); } + return; } + + dialog.dismiss(); + new QMUIDialog.MessageDialogBuilder(context).setTitle(getResources().getString(R.string.tips_title)) + .setCancelable(false) + .setMessage(getString(R.string.Do_you_want_to_change_scan_rules_Switching_will_clear_the_interface_and_all_scan_details)) + .addAction(getResources().getString(R.string.cancel_info), (dialog1, index) -> dialog1.dismiss()) + .addAction(getResources().getString(R.string.confirm_info), (dialog1, index) -> { + initRvData(); + scanBarcodeListMap = new HashMap<>(); + LitePal.deleteAll(FlowOrderDetailBean.class); + LitePal.deleteAll(FlowReportWorkDetailBean.class); + showDetailBadgeNum(); + showOrderDetailBadgeNum(); + String item = items[which]; + dynamicFormBean.setValue(item); + dynamicFormAdapter.setItemByFieldName(dynamicFormBean.getFieldName(), dynamicFormBean); + dynamicFormAdapter.notifyDataSetChanged(); + if (item.equals(items[1])) { + llflowOrderDetail.setVisibility(View.VISIBLE); + } else { + llflowOrderDetail.setVisibility(View.GONE); + } + dialog1.dismiss(); + }) + .create(R.style.QMUI_Dialog).show(); + + } }); menuDialogBuilder.setCheckedIndex(selectIndex); @@ -348,29 +337,10 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { dynamicFormAdapter.setOnFormItemViewActionListener((dynamicFormBean, position) -> { String value = dynamicFormBean.getValue(); switch (dynamicFormBean.getFieldName()) { - case "AUFNR": -// DynamicFormBean scanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule"); -//// String value1 = scanRuleItem.getValue(); -//// if (TextUtils.isEmpty(value1)) { -//// dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); -//// showError(getString(R.string.Select_a_scan_rule_first)); -//// return; -//// } -// if (TextUtils.isEmpty(value)) { -// showError(getString(R.string.The_work_order_number_cannot_be_empty)); -// return; -// } -// dynamicFormBean.setCanChange(false); -// dynamicFormAdapter.notifyDataSetChanged(); -// setNextFocus("FlowOrder"); - break; case "FlowOrder": + //宸ュ崟鏍忕洰 DynamicFormBean AUFNRItem = dynamicFormAdapter.getItemByFieldName("AUFNR"); -// if (TextUtils.isEmpty(AUFNRItem.getValue())) { -// showError(getString(R.string.The_work_order_number_cannot_be_empty)); -// return; -// } - + //鎵弿瑙勫垯鏍忕洰 DynamicFormBean scanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule"); if (TextUtils.isEmpty(scanRuleItem.getValue())) { dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); @@ -389,57 +359,61 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { return; } - if (value.startsWith("T") && value.length() > 9) { - int t = value.indexOf("T"); - String workOrder = value.substring(t + 1, 9); - String aufnrItemValue = AUFNRItem.getValue(); - if (TextUtils.isEmpty(aufnrItemValue)) { - AUFNRItem.setValue(workOrder); - AUFNRItem.setCanChange(false); - LitePal.deleteAll(FlowReportWorkProOrderBean.class); - query(workOrder, value, scanRuleItem, dynamicFormBean); - dynamicFormAdapter.setItemByFieldName(AUFNRItem.getFieldName(), AUFNRItem); - dynamicFormAdapter.notifyDataSetChanged(); - } else { - if (!workOrder.equals(aufnrItemValue)) { - ToastUtils.showLong(R.string.order_number_in_the_flow_order_is_inconsistent); - dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); - return; - } else { - if (scanRuleItem.getValue().equals(items[1])) { - LitePal - .where("flowOrder = ?", value) - .findAsync(FlowOrderDetailBean.class) - .listen(reportWorkDetailBean -> { - if (reportWorkDetailBean.size() > 0) { - dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); - showError(getString(R.string.The_current_flow_order_number_has_been_scanned)); - return; - } - String gid = System.currentTimeMillis() + ""; - FlowOrderDetailBean bean = new FlowOrderDetailBean(); - bean.setGid(gid); - bean.setFlowOrder(value); - bean.save(); - showOrderDetailBadgeNum(); - SoundUtils.playSound(this, R.raw.ok); - dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); - }); - } else { - dynamicFormBean.setCanChange(false); - dynamicFormAdapter.notifyDataSetChanged(); - setNextFocus("PacketBarcode"); - } - } - } - - } else { - + if (!value.startsWith("T")) { + ToastUtils.showLong(R.string.The_flow_order_number_format_is_incorrect); + dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); + return; + } + if (value.length() < 9) { ToastUtils.showLong(R.string.The_flow_order_number_format_is_incorrect); dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); return; + } + //鎴彇娴佺▼鍗曞彿涓殑宸ュ崟鍙 + int t = value.indexOf("T"); + String workOrder = value.substring(t + 1, 9); + String aufnrItemValue = AUFNRItem.getValue(); + //濡傛灉宸ュ崟鍙蜂负绌猴紝鐩存帴璧嬪煎埌宸ュ崟鍙 + if (TextUtils.isEmpty(aufnrItemValue)) { + LitePal.deleteAll(FlowReportWorkProOrderBean.class); + query(workOrder, value, scanRuleItem, AUFNRItem, dynamicFormBean); + return; + } + //濡傛灉宸ュ崟鍙蜂笉涓虹┖锛屽垽鏂壂鎻忕殑宸ュ崟鍙锋槸鍚︿笌涓婁竴娆″伐鍗曞彿涓鑷淬 + //涓嶄竴鑷存彁閱掞紝涓嶈缁х画鎿嶄綔 + if (!workOrder.equals(aufnrItemValue)) { + ToastUtils.showLong(R.string.order_number_in_the_flow_order_is_inconsistent); + dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); + return; + } + //濡傛灉鏄涓祦杞崟涓涓鐮 + if (scanRuleItem.getValue().equals(items[1])) { + LitePal + .where("flowOrder = ?", value) + .findAsync(FlowOrderDetailBean.class) + .listen(reportWorkDetailBean -> { + if (reportWorkDetailBean.size() > 0) { + dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); + showError(getString(R.string.The_current_flow_order_number_has_been_scanned)); + return; + } + String gid = System.currentTimeMillis() + ""; + FlowOrderDetailBean bean = new FlowOrderDetailBean(); + bean.setGid(gid); + bean.setFlowOrder(value); + bean.save(); + showOrderDetailBadgeNum(); + SoundUtils.playSound(this, R.raw.ok); + dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); + }); + } else { + //鍚﹀垯鏄竴涓祦杞崟澶氫釜绠辩爜 + dynamicFormBean.setCanChange(false); + dynamicFormAdapter.notifyDataSetChanged(); + setNextFocus("PacketBarcode"); } + break; case "PacketBarcode": if (TextUtils.isEmpty(value)) { @@ -448,6 +422,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { return; } scanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule"); + //濡傛灉鏄涓祦杞崟涓涓鐮 if (scanRuleItem.getValue().equals(items[1])) { int count = LitePal.count(FlowOrderDetailBean.class); if (count == 0) { @@ -457,6 +432,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { return; } } else { + //鍚﹀垯鏄竴涓祦杞崟澶氫釜绠辩爜 DynamicFormBean FlowOrderItem = dynamicFormAdapter.getItemByFieldName("FlowOrder"); if (TextUtils.isEmpty(FlowOrderItem.getValue())) { dynamicFormBean.setValue(""); @@ -490,10 +466,11 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { }); } - + /** + * 鍔犲叆鏄庣粏鍒楄〃 + */ private void addDetail() { DynamicFormBean ScanRuleItem = dynamicFormAdapter.getItemByFieldName("ScanRule");//鎵弿瑙勫垯 - String gid = System.currentTimeMillis() + ""; DynamicFormBean aufnrItem = dynamicFormAdapter.getItemByFieldName("AUFNR");//宸ュ崟 DynamicFormBean flowOrderItem = dynamicFormAdapter.getItemByFieldName("FlowOrder");//娴佽浆鍗 DynamicFormBean PacketBarcodeItem = dynamicFormAdapter.getItemByFieldName("PacketBarcode");//鍖呮潯鐮 @@ -501,6 +478,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { DynamicFormBean MATNRItem = dynamicFormAdapter.getItemByFieldName("MATNR");//鐗╂枡鍙 DynamicFormBean ZXTPCItem = dynamicFormAdapter.getItemByFieldName("ZXTPC");//绠卞彿 DynamicFormBean ZPCItem = dynamicFormAdapter.getItemByFieldName("ZPC");//鎵规 + String gid = System.currentTimeMillis() + ""; String barcode = PacketBarcodeItem.getValue(); if (TextUtils.isEmpty(aufnrItem.getValue())) { setNextFocus("AUFNR"); @@ -550,6 +528,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { FlowReportWorkDetailBean bean = new FlowReportWorkDetailBean(); bean.setGid(gid); bean.setAufnr(aufnrItem.getValue()); + bean.setMatnr(MATNRItem.getValue()); bean.setVornr(""); bean.setZxtpc(ZXTPCItem.getValue()); bean.setZpc(ZPCItem.getValue()); @@ -576,6 +555,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { }); } else { + //濡傛灉瑙勫垯鏄竴涓祦杞崟澶氫釜绠辩爜 if (TextUtils.isEmpty(flowOrderItem.getValue())) { setNextFocus("FlowOrder"); showError(getString(R.string.Please_scan_the_transfer_slip_first)); @@ -585,6 +565,7 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { FlowReportWorkDetailBean bean = new FlowReportWorkDetailBean(); bean.setGid(gid); bean.setAufnr(aufnrItem.getValue()); + bean.setMatnr(MATNRItem.getValue()); bean.setVornr(""); bean.setZxtpc(ZXTPCItem.getValue()); bean.setZpc(ZPCItem.getValue()); @@ -609,8 +590,15 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { } - - private void query(String workOrder, String flowOrder, DynamicFormBean scanRuleItem, DynamicFormBean dynamicFormBean) { + /** + * 鏍规嵁宸ュ崟鑾峰彇浜у搧淇℃伅 + * @param workOrder 宸ュ崟鍙 + * @param flowOrder 娴佽浆鍗曞彿 + * @param scanRuleItem 鎵弿瑙勫垯鏍忕洰 + * @param AUFNRItem 宸ュ崟鍙锋爮鐩 + * @param dynamicFormBean 褰撳墠鏍忕洰锛屼篃灏辨槸娴佽浆鍗曞彿鏍忕洰 + */ + private void query(String workOrder, String flowOrder, DynamicFormBean scanRuleItem, DynamicFormBean AUFNRItem, DynamicFormBean dynamicFormBean) { HttpMethods.getInstance().getOrderInfo(workOrder, new BaseObserver(context) { @Override protected void onSuccess(ResponseBody body) throws Exception { @@ -618,64 +606,82 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { Type objectType = new TypeToken>>() { }.getType(); BaseResponseBean> baseResponseBean = gson.fromJson(string, objectType); - if (baseResponseBean.getCode() == 200) { - List data = baseResponseBean.getData(); - if (data.size() > 0) { - FlowReportWorkProOrderBean flowReportWorkProOrderBean = data.get(0); - flowReportWorkProOrderBean.save(); - if (scanRuleItem.getValue().equals(items[1])) { - LitePal - .where("flowOrder = ?", flowOrder) - .findAsync(FlowOrderDetailBean.class) - .listen(reportWorkDetailBean -> { - if (reportWorkDetailBean.size() > 0) { - dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); - showError(getString(R.string.The_current_flow_order_number_has_been_scanned)); - return; - } - String gid = System.currentTimeMillis() + ""; - FlowOrderDetailBean bean = new FlowOrderDetailBean(); - bean.setGid(gid); - bean.setFlowOrder(flowOrder); - bean.save(); - showOrderDetailBadgeNum(); - SoundUtils.playSound(FlowReportWorkActivity.this, R.raw.ok); - dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); - }); - } else { - dynamicFormBean.setCanChange(false); - dynamicFormAdapter.notifyDataSetChanged(); - setNextFocus("PacketBarcode"); - } - } else { - showError(getString(R.string.No_material_information_was_obtained_for_the_workorder)); - setNextFocus("FlowOrder"); - - } - } else { + if (baseResponseBean.getCode() != 200) { showError(baseResponseBean.getMsg()); + AUFNRItem.setValue(""); + dynamicFormAdapter.setItemByFieldName(AUFNRItem.getFieldName(), AUFNRItem); + setNextFocus("FlowOrder"); + return; + } + + List data = baseResponseBean.getData(); + if (data.size() == 0) { + showError(getString(R.string.No_material_information_was_obtained_for_the_workorder)); + AUFNRItem.setValue(""); + dynamicFormAdapter.setItemByFieldName(AUFNRItem.getFieldName(), AUFNRItem); setNextFocus("FlowOrder"); + return; + } + + AUFNRItem.setValue(workOrder); + dynamicFormAdapter.setItemByFieldName(AUFNRItem.getFieldName(), AUFNRItem); + dynamicFormAdapter.notifyDataSetChanged(); + + FlowReportWorkProOrderBean flowReportWorkProOrderBean = data.get(0); + flowReportWorkProOrderBean.save(); + if (scanRuleItem.getValue().equals(items[1])) { + LitePal + .where("flowOrder = ?", flowOrder) + .findAsync(FlowOrderDetailBean.class) + .listen(reportWorkDetailBean -> { + if (reportWorkDetailBean.size() > 0) { + dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); + showError(getString(R.string.The_current_flow_order_number_has_been_scanned)); + return; + } + String gid = System.currentTimeMillis() + ""; + FlowOrderDetailBean bean = new FlowOrderDetailBean(); + bean.setGid(gid); + bean.setFlowOrder(flowOrder); + bean.save(); + showOrderDetailBadgeNum(); + SoundUtils.playSound(FlowReportWorkActivity.this, R.raw.ok); + dynamicFormAdapter.setFocusAndClearValueById(dynamicFormBean.getId()); + }); + } else { + dynamicFormBean.setCanChange(false); + dynamicFormAdapter.notifyDataSetChanged(); + setNextFocus("PacketBarcode"); } } @Override protected void onFailure(Throwable e) throws Exception { - setNextFocus("FlowOrder"); SoundUtils.playSound(FlowReportWorkActivity.this, R.raw.warning); CustomErrorDialog(e, FlowReportWorkActivity.this); + AUFNRItem.setValue(""); + dynamicFormAdapter.setItemByFieldName(AUFNRItem.getFieldName(), AUFNRItem); + setNextFocus("FlowOrder"); + } }); } + /** + * 瑙ｆ瀽鏉＄爜淇℃伅锛屽苟姣斿宸ュ崟浜у搧淇℃伅 + * @param value 鏉＄爜鍐呭 + * @param dynamicFormBean 褰撳墠鏉＄爜鏍忕洰 + */ private void getBarcodeInfo(String value, DynamicFormBean dynamicFormBean) { AnalysisBarBean bean = BarAnalysisUtils.analysisBarcode(value); + //鍏堟牴鎹潯鐮佺墿鏂欎俊鎭瘮瀵瑰伐鍗曚骇鍝佷俊鎭 LitePal .where("matnr = ?", bean.getMateriel()) .findAsync(FlowReportWorkProOrderBean.class) .listen(orderBeans -> { if (orderBeans.size() == 0) { //鏈壘鍒扮浉鍚岀淮搴︽暟鎹紝鎶ラ敊 - showError("宸ュ崟鐗╂枡涓庢壂鐮佺墿鏂欎笉涓鑷达紝璇风‘璁"); + showError(getString(R.string.The_material_of_the_work_order_is_inconsistent_with_that_of_the_scanning_code)); dynamicFormAdapter.setFocusById(dynamicFormBean.getId()); return; } @@ -717,6 +723,10 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { } + /** + * 璁剧疆鍏夋爣璺宠浆 + * @param name + */ private void setNextFocus(String name) { if (KeyboardUtils.isSoftInputVisible(context)) { KeyboardUtils.hideSoftInput(context); @@ -795,7 +805,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { } } - + /** + * 淇濆瓨鏁版嵁 + */ private void saveData() { LitePal.findAllAsync(FlowReportWorkDetailBean.class).listen(items -> { if (items.size() == 0) { @@ -923,6 +935,9 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { ToastUtil.showShortToastCenter(context, msg); } + /** + * 娓呯┖鎵鏈夋槑缁嗗拰璁㈠崟鏁版嵁 + */ private void clearAllData() { if (LitePal.count(FlowReportWorkDetailBean.class) > 0) { LitePal.deleteAll(FlowReportWorkDetailBean.class); @@ -944,7 +959,10 @@ public class FlowReportWorkActivity extends CommonFunctionActivity { return super.onKeyDown(keyCode, event); } - + /** + * 鍒ゆ柇鐣岄潰鏄惁濉啓鏁版嵁 + * @return + */ private boolean rvUiHaveData() { boolean isExist = false; for (DynamicFormBean bean : dynamicFormBeans) { diff --git a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkActivity.java b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkActivity.java index 8afe7d7..1a6d591 100644 --- a/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkActivity.java +++ b/app/src/main/java/com/techscan/wk/ui/reportwork/ReportWorkActivity.java @@ -111,7 +111,6 @@ public class ReportWorkActivity extends CommonFunctionActivity { if (savedInstanceState == null) { clearAllData(); } - StatusBarUtil.setStatusBarColor(this, ContextCompat.getColor(this, R.color.app_color_blue)); ButterKnife.bind(this); setBody(true); scanBarcodeListMap = new HashMap<>(); @@ -310,6 +309,7 @@ public class ReportWorkActivity extends CommonFunctionActivity { } /** + * 鍔犲叆鏄庣粏鏂规硶 * @param isReportWork ==true 鏄姤宸ワ紝鍚﹀垯鏄姤搴 */ private void addDetail(boolean isReportWork) { @@ -403,7 +403,10 @@ public class ReportWorkActivity extends CommonFunctionActivity { } - + /** + * 瑙ｆ瀽鏉＄爜淇℃伅锛屽苟鏄剧ず + * @param value + */ private void getBarcodeInfo(String value) { AnalysisBarBean bean = BarAnalysisUtils.analysisBarcode(value); for (DynamicFormBean d : dynamicFormBeans) { @@ -431,7 +434,10 @@ public class ReportWorkActivity extends CommonFunctionActivity { } - + /** + * 璁剧疆鍏夋爣璺宠浆 + * @param name + */ private void setNextFocus(String name) { if (KeyboardUtils.isSoftInputVisible(context)) { KeyboardUtils.hideSoftInput(context); 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 12febda..2b0bdf2 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 @@ -127,7 +127,6 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_report_work_errlist); - StatusBarUtil.setStatusBarColor(this, ContextCompat.getColor(this, R.color.app_color_blue)); ButterKnife.bind(this); setBody(true); Disposable register = RxBus.getInstance().register(Event.class, eventMsg -> { @@ -243,10 +242,11 @@ public class ReportWorkErrorListActivity extends CommonFunctionActivity { list.add(new DetailShowBean(getString(R.string.Creation_time), reportWorkErrorInfoBean.getCreateTime())); list.add(new DetailShowBean(getString(R.string.Factory), reportWorkErrorInfoBean.getWerks())); list.add(new DetailShowBean(getString(R.string.Case_number), reportWorkErrorInfoBean.getZxtpc())); - list.add(new DetailShowBean(getString(R.string.Basic_number_of_reports), reportWorkErrorInfoBean.getLmnga() + "")); - list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_basic_quantity_reported), reportWorkErrorInfoBean.getGmein())); + list.add(new DetailShowBean(getString(R.string.batch), reportWorkErrorInfoBean.getZpc())); list.add(new DetailShowBean(getString(R.string.Quantity_reported), reportWorkErrorInfoBean.getGmnga() + "")); list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_reported_quantity), reportWorkErrorInfoBean.getMeinh() + "")); + list.add(new DetailShowBean(getString(R.string.Basic_number_of_reports), reportWorkErrorInfoBean.getLmnga() + "")); + list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_basic_quantity_reported), reportWorkErrorInfoBean.getGmein())); DetailBottomSheet detailBottomSheet = new DetailBottomSheet<>(context, getResources().getString(R.string.detail_info), list); new XPopup.Builder(context) 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 a28284c..e89822f 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 @@ -97,6 +97,8 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { private Column select; private Column AUFNR; private Column GMNGA; + private Column zxtpc; + private Column zpc; QBadgeView qTaskBadgeView, qDetailBadgeView; @@ -112,7 +114,6 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_report_work_offse); - StatusBarUtil.setStatusBarColor(this, ContextCompat.getColor(this, R.color.app_color_blue)); ButterKnife.bind(this); setBody(true); Disposable register = RxBus.getInstance().register(Event.class, eventMsg -> { @@ -128,7 +129,6 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { initListeners(); initRvData(); initTableData(); - reInitUI(); rvUi.postDelayed(() -> { setNextFocus("AUFNR"); }, 200); @@ -155,14 +155,15 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { AUFNR = new Column<>(getString(R.string.Work_order_number), "aufnr"); GMNGA = new Column<>(getString(R.string.Quantity_reported), "gmnga"); - - + zxtpc = new Column<>(getString(R.string.Case_number), "zxtpc"); + zpc = new Column<>(getString(R.string.batch), "zpc"); select.setFixed(true); select.setFast(true); select.setMinWidth(110); AUFNR.setFast(true); GMNGA.setFast(true); - + zxtpc.setFast(true); + zpc.setFast(true); //璁剧疆鍗曚釜鏍煎瓙鑳屾櫙棰滆壊 smartTable.getConfig().setContentCellBackgroundFormat(new BaseCellBackgroundFormat() { @@ -185,12 +186,15 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { } }); - setTableData(); - } + /** + * 淇濆瓨鏁版嵁 + * @param reportWorkOffsetBean 闇瑕佹彁浜ょ殑宸ュ崟鏁版嵁 + * @param row 褰撳墠鍒楄〃琛岋紝鐢ㄤ簬鍒犻櫎row鏁版嵁 + */ private void saveData(ReportWorkOffsetBean reportWorkOffsetBean, int row) { reportWorkOffsetBean.setRueck(reportWorkOffsetBean.getResultRueck()); reportWorkOffsetBean.setRmzhl(reportWorkOffsetBean.getResultRmzhl()); @@ -229,7 +233,7 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { for (int i = 0; i < list.size(); i++) { list.get(i).setSelect(getString(R.string.write_off)); } - mTableData = new TableData<>("", list, select, AUFNR, GMNGA); + mTableData = new TableData<>("", list, select, AUFNR, GMNGA,zxtpc,zpc); smartTable.setTableData(mTableData); smartTable.invalidate(); smartTable.getTableData().setOnRowClickListener((column, reportWorkOffsetBean, i, row) -> { @@ -254,10 +258,11 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { list.add(new DetailShowBean(getString(R.string.counter), reportWorkOffsetBean.getResultRmzhl())); list.add(new DetailShowBean(getString(R.string.Factory), reportWorkOffsetBean.getWerks())); list.add(new DetailShowBean(getString(R.string.Case_number), reportWorkOffsetBean.getZxtpc())); - list.add(new DetailShowBean(getString(R.string.Basic_number_of_reports), reportWorkOffsetBean.getLmnga() + "")); - list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_basic_quantity_reported), reportWorkOffsetBean.getGmein())); + list.add(new DetailShowBean(getString(R.string.batch), reportWorkOffsetBean.getZpc())); list.add(new DetailShowBean(getString(R.string.Quantity_reported), reportWorkOffsetBean.getGmnga() + "")); list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_reported_quantity), reportWorkOffsetBean.getMeinh() + "")); + list.add(new DetailShowBean(getString(R.string.Basic_number_of_reports), reportWorkOffsetBean.getLmnga() + "")); + list.add(new DetailShowBean(getString(R.string.A_unit_of_measurement_of_basic_quantity_reported), reportWorkOffsetBean.getGmein())); DetailBottomSheet detailBottomSheet = new DetailBottomSheet<>(context, getResources().getString(R.string.detail_info), list); new XPopup.Builder(context) .moveUpToKeyboard(false) //濡傛灉涓嶅姞杩欎釜锛岃瘎璁哄脊绐椾細绉诲姩鍒拌蒋閿洏涓婇潰 @@ -357,38 +362,40 @@ public class ReportWorkOffsetActivity extends CommonFunctionActivity { }); } + /** + * 鏍规嵁宸ュ崟璋冪敤鏌ヨ鎺ュ彛鏂规硶 + */ private void query() { DynamicFormBean aufnrItem = dynamicFormAdapter.getItemByFieldName("AUFNR");//宸ュ崟 - HttpMethods.getInstance().getReport(aufnrItem.getValue(), - "", new BaseObserver(context) { - @Override - protected void onSuccess(ResponseBody body) throws Exception { - String string = body.string(); - Type objectType = new TypeToken>>() { - }.getType(); - BaseResponseBean> baseResponseBean = gson.fromJson(string, objectType); - if (baseResponseBean.getCode() == 200) { - list.clear(); - if (baseResponseBean.getData().size() > 0) { - list.addAll(baseResponseBean.getData()); - } else { - ToastUtils.showLong(getString(R.string.No_data_was_obtained)); - } - setTableData(); - } else { - list.clear(); - setTableData(); - showError(baseResponseBean.getMsg()); - } + HttpMethods.getInstance().getReport(aufnrItem.getValue(), "", new BaseObserver(context) { + @Override + protected void onSuccess(ResponseBody body) throws Exception { + String string = body.string(); + Type objectType = new TypeToken>>() { + }.getType(); + BaseResponseBean> baseResponseBean = gson.fromJson(string, objectType); + if (baseResponseBean.getCode() == 200) { + list.clear(); + if (baseResponseBean.getData().size() > 0) { + list.addAll(baseResponseBean.getData()); + } else { + ToastUtils.showLong(getString(R.string.No_data_was_obtained)); } + setTableData(); + } else { + list.clear(); + setTableData(); + showError(baseResponseBean.getMsg()); + } + } - @Override - protected void onFailure(Throwable e) throws Exception { - list.clear(); - setTableData(); - CustomErrorDialog(e, ReportWorkOffsetActivity.this); - } - }); + @Override + protected void onFailure(Throwable e) throws Exception { + list.clear(); + setTableData(); + CustomErrorDialog(e, ReportWorkOffsetActivity.this); + } + }); } diff --git a/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java b/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java index f426c45..75d9092 100644 --- a/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java +++ b/app/src/main/java/com/techscan/wk/utils/BarAnalysisUtils.java @@ -20,6 +20,11 @@ public class BarAnalysisUtils { return true; } + /** + * 鎸夎鍒欒В鏋愭潯鐮 [)>@06@QRPART@10V101010@1P31102260@3SX001@1T20240724001@Q100@14D20240724@@ + * @param barcode + * @return + */ public static AnalysisBarBean analysisBarcode(String barcode) { barcode = barcode.replaceFirst("\\[\\)>@06@QRPART", ""); System.out.println(barcode); diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index a607124..76f2b0b 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -171,4 +171,5 @@ No material information was obtained for the work order Do you want to change scan rules? (Switching will clear the interface and all scan details) The flow order number format is incorrect + The material of the work order is inconsistent with that of the scanning code \ No newline at end of file diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml index ef4e2f1..239a263 100644 --- a/app/src/main/res/values-th-rTH/strings.xml +++ b/app/src/main/res/values-th-rTH/strings.xml @@ -171,4 +171,5 @@ 喙勦浮喙堗浮喔掂竵喔侧福喔｀副喔氞競喙夃腑喔∴腹喔ム抚喔编釜喔斷父喙冟笖 喙 喔堗赴喔弗喔编笟喔佮笌喔佮覆喔｀釜喙佮竵喔 喔福喔粪腑喙勦浮喙?(喔弗喔编笟喔佮覆喔｀弗喙夃覆喔囙腑喔脆笝喙喔椸腑喔｀箤喙喔熰笅 喙佮弗喔班福喔侧涪喔ム赴喙喔傅喔⑧笖喔佮覆喔｀釜喙佮竵喔權笚喔编箟喔囙斧喔∴笖) 喔浮喔侧涪喙喔ム競喙傕福喙喔曕腑喔｀箤喙勦浮喙堗笘喔灌竵喔曕箟喔竾 + 喔о副喔笖喔膏福喔侧涪喔佮覆喔｀箑喔娻复喔囙笧喔侧笓喔脆笂喔⑧箤喙勦浮喙堗釜喔笖喔勦弗喙夃腑喔囙竵喔编笟喔佮覆喔｀竸喙夃笝喔覆喔｀斧喔编釜喙傕笡喔｀笖喔⑧阜喔權涪喔编笝 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ed96bc6..d2bf213 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -182,5 +182,6 @@ 璇ュ伐鍗曟病鏈夎幏鍙栧埌鐗╂枡淇℃伅 鏄惁鍒囨崲鎵弿瑙勫垯锛燂紙鍒囨崲灏嗘竻绌虹晫闈㈠拰鎵鏈夋壂鎻忔槑缁嗗唴瀹癸級 娴佽浆鍗曞彿鏍煎紡涓嶆纭 + 宸ュ崟鐗╂枡涓庢壂鐮佺墿鏂欎笉涓鑷达紝璇风‘璁