From 3979c248b2518132c04303562fed34564572293f Mon Sep 17 00:00:00 2001 From: wanghao Date: Fri, 8 Nov 2024 15:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/beijing_daxing/BFActivity.java | 10 ++++++++- .../example/beijing_daxing/FpInActivity.java | 5 ++++- .../beijing_daxing/HomePageActivity.java | 4 ++-- .../main/res/layout/activity_bfactivity.xml | 22 ++++++++++++++++--- app/src/main/res/layout/activity_fp_in.xml | 6 ++--- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/example/beijing_daxing/BFActivity.java b/app/src/main/java/com/example/beijing_daxing/BFActivity.java index 7a0bb5c..21567ec 100644 --- a/app/src/main/java/com/example/beijing_daxing/BFActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/BFActivity.java @@ -97,7 +97,14 @@ public class BFActivity extends BaseActivity implements TakePictureDialog.dialog takeDialog.show(); } + public void bf_submit4(View view) { + bf_submit(4); + } public void bf_submit(View view) { + bf_submit(2); + } + private void bf_submit(int type) { + String state = wm.getState(); if (state==null ) return; if ( state.equals("正常")) { @@ -108,6 +115,7 @@ public class BFActivity extends BaseActivity implements TakePictureDialog.dialog .params("epc", wm.getEpc()) .params("reason", reason) .params("remark", remark) + .params("type", type) .params("user", SharedPreferencesUtils.getstring("user", "")) .addFileParams("files",files) .execute(new MyRecultCall(dialog, this) { @@ -126,7 +134,7 @@ public class BFActivity extends BaseActivity implements TakePictureDialog.dialog }); } else { - Toast.makeText(this, "轮挡已报废，无需操作", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, "异常轮挡，无需操作", Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/java/com/example/beijing_daxing/FpInActivity.java b/app/src/main/java/com/example/beijing_daxing/FpInActivity.java index f0af979..e1eda8a 100644 --- a/app/src/main/java/com/example/beijing_daxing/FpInActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/FpInActivity.java @@ -80,10 +80,13 @@ public class FpInActivity extends BaseActivity { public void fpin_submit(View view){ // Log.e("TAG", "onSuccess:" +vm.toString() ); var state = vm.getState(); - if (!state.equals("报废")){ + boolean b = state.equals("报废") || state.equals("维修"); + if (!b){ Toast.makeText(this, "轮挡状态："+state+",不能使用废品入库功能", Toast.LENGTH_SHORT).show(); return; } + + if (vm.getLocation().equals("仓库")){ Toast.makeText(this, "轮挡状态已在仓库", Toast.LENGTH_SHORT).show(); return; diff --git a/app/src/main/java/com/example/beijing_daxing/HomePageActivity.java b/app/src/main/java/com/example/beijing_daxing/HomePageActivity.java index 79add9f..2baf990 100644 --- a/app/src/main/java/com/example/beijing_daxing/HomePageActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/HomePageActivity.java @@ -77,8 +77,8 @@ public class HomePageActivity extends AppCompatActivity { list.add(new HomeIcon(R.mipmap.home_out1, "轮挡领用出库", OutActivity.class)); // list.add(new HomeIcon(R.mipmap.home_store_check, "仓库盘点", StoreCheckActivity.class)); list.add(new HomeIcon(R.mipmap.home_check, "轮挡巡检", CheckListActivity.class)); - list.add(new HomeIcon(R.mipmap.home_bf, "轮挡报废", BFActivity.class)); - list.add(new HomeIcon(R.mipmap.home_in, "废品入库", FpInActivity.class)); + list.add(new HomeIcon(R.mipmap.home_bf, "维修&报废", BFActivity.class)); + list.add(new HomeIcon(R.mipmap.home_in, "异常轮挡回库", FpInActivity.class)); // list.add(new HomeIcon(R.mipmap.home_out, "废品出库", FpOutActivity.class)); list.add(new HomeIcon(R.mipmap.home_out, "功率设置", SetingPowerActivity.class)); var intent = getIntent(); diff --git a/app/src/main/res/layout/activity_bfactivity.xml b/app/src/main/res/layout/activity_bfactivity.xml index 0d57107..3013355 100644 --- a/app/src/main/res/layout/activity_bfactivity.xml +++ b/app/src/main/res/layout/activity_bfactivity.xml @@ -22,7 +22,7 @@ style="@style/title_text" android:layout_width="match_parent" android:layout_height="45dp" - android:text="轮挡报废" /> + android:text="维修和报废" /> +