1.订单不良率

app/src/main/java/com/wd/workoffice/ui/adapter/ReportBadListAdapter.java

@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.mesBean.OrderBadBean;
 import com.wd.workoffice.ui.activity.mes.report.MesReportDetailActivity;
+import com.wd.workoffice.util.MathUtils;
 
 import java.util.List;
 
@@ -45,6 +46,10 @@ public class ReportBadListAdapter extends BaseQuickAdapter<OrderBadBean.ScrapSta
                 startActivity(intent);
             }
         });
+        helper.setText(R.id.tv_order_no, String.format("指令单号:%s",item.getOrderNumber()));
+        helper.setText(R.id.tv_order_price, String.format("订单报废合计(元):%s",
+                MathUtils.converData(item.getScrappedCountPrice(),3)));
+
     }
 }
 

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

@@ -262,7 +262,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:text="订单单号"
+                        android:text="制令单号"
                         android:textSize="14sp" />
 
                     <TextView
@@ -282,10 +282,9 @@
                         android:textSize="14sp" />
 
                     <ImageView
-                        android:layout_width="4mm"
-                        android:layout_height="10mm"
-                        android:layout_marginLeft="5mm"
-                        android:src="@mipmap/arrow_right"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/arrow_right_gray"
                         android:visibility="invisible" />
                 </LinearLayout>
 
@@ -301,7 +300,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:orientation="vertical"
-                        android:padding="17mm">
+                       >
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/rv_bad"

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

@@ -32,9 +32,7 @@
         android:textSize="14sp" />
 
     <ImageView
-        android:layout_width="4mm"
-        android:layout_height="10mm"
-        android:layout_marginLeft="5mm"
-        android:scaleType="fitXY"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:src="@mipmap/arrow_right_gray" />
 </LinearLayout>

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

@@ -2,9 +2,30 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    >
-<androidx.recyclerview.widget.RecyclerView
+    android:background="@color/flexible_background"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_data"
         android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
+        android:padding="17mm"
+        android:background="@color/white"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/tv_order_no"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginTop="10mm"
+        android:layout_marginEnd="10mm" />
+
+    <TextView
+        android:id="@+id/tv_order_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:paddingBottom="10mm"
+        android:layout_marginTop="10mm"
+        android:layout_marginEnd="10mm" />
 </LinearLayout>