修改 巡检

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

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;

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_bf, "维修&报废", BFActivity.class));
-        list.add(new HomeIcon(R.mipmap.home_in, "废品入库", FpInActivity.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();

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="维修和报废" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -170,13 +170,29 @@
             </FrameLayout>
 
         </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:orientation="horizontal">
         <Button
             style="@style/button_style"
             android:layout_width="match_parent"
-            android:layout_height="55dp"
+            android:layout_height="match_parent"
-            android:layout_marginTop="10dp"
+            android:onClick="bf_submit4"
+            android:backgroundTint="@color/yellow"
+            android:layout_weight="1"
+            android:text="标记维修" />
+        <Button
+            style="@style/button_style"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:onClick="bf_submit"
+            android:layout_weight="1"
             android:text="标记报废" />
+    </LinearLayout>
 
     </LinearLayout>
 </layout>

app/src/main/res/layout/activity_fp_in.xml

@@ -21,7 +21,7 @@
             style="@style/title_text"
             android:layout_width="match_parent"
             android:layout_height="45dp"
-            android:text="废品入库" />
+            android:text="异常轮挡回库" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -138,7 +138,7 @@
                 android:layout_width="110dp"
                 android:layout_height="45dp"
                 android:layout_gravity="center"
-                android:text="报废时间:" />
+                android:text="上报时间:" />
 
             <TextView
                 style="@style/info_text1"
@@ -178,6 +178,6 @@
             android:layout_height="55dp"
             android:layout_margin="20dp"
             android:onClick="fpin_submit"
-            android:text="废品入库" />
+            android:text="回库" />
     </LinearLayout>
 </layout>