1.退货详情

app/src/main/java/com/wd/workoffice/bean/ReturnApplyBean.java

@@ -146,6 +146,15 @@ public class ReturnApplyBean {
         private Object boxCode;
         private String backStockName;
         private String lot;
+        private String action;
+
+        public String getAction() {
+            return action;
+        }
+
+        public void setAction(String action) {
+            this.action = action;
+        }
 
         public String getLot() {
             return lot;

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnDetailActivity.java

@@ -20,6 +20,7 @@ import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -37,7 +38,7 @@ import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 退件详情
+ * 退货详情
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -131,6 +132,14 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
     View viewLine6;
     @BindView(R.id.tv_dep6)
     TextView tvDep6;
+    @BindView(R.id.tv_title_desc)
+    TextView tvTitleDesc;
+    @BindView(R.id.tv_return_num_desc)
+    TextView tvReturnNumDesc;
+    @BindView(R.id.ll_stock)
+    RelativeLayout llStock;
+    @BindView(R.id.tv_return_type_desc)
+    TextView tvReturnTypeDesc;
     private ReturnApplyBean.RecordsBean info;
     private String orderType;
 
@@ -155,17 +164,23 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
         tvName.setText(info.getProductSimpleCode());
         tvProName.setText(info.getProductName());
         tvProCode.setText(info.getProductSoleCode());
-        tvReturnNum.setText(String.valueOf(info.getProductAmount()));
+        tvReturnNum.setText(MathUtils.converData(info.getProductAmount(), 3));
         tvReturnType.setText(info.getReturnTypeName());
         tvStock.setText(info.getBackStockName());
-        tvPerson.setText(String.valueOf(info.getCreatedByName()));
+        tvPerson.setText(info.getCreatedByName());
         tvTime.setText(info.getCreatedTime());
         tvLot.setText(info.getLot());
-        tvRemark.setText(String.valueOf(info.getApplyRemark()));
+        tvRemark.setText(info.getApplyRemark());
         tvStatus.setText(WorkUtils.getReturnStatus(Integer.valueOf(info.getStatus())));
         changeProcess(info.getStatus());
         changeCheckView(info.getStatus());
         changePermission(info.getStatus());
+        if (TextUtils.equals(info.getAction(), "2")) {
+            tvTitleDesc.setText("报废详情");
+            tvReturnNumDesc.setText("报废数量");
+            tvReturnTypeDesc.setText("报废类型");
+            setTitle("报废详情");
+        }
     }
 
     /**
@@ -175,7 +190,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
      */
     private void changeCheckView(String status) {
         if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
-            if (status.startsWith("1") && (!status.endsWith("4")&&!status.endsWith("5"))) {
+            if (status.startsWith("1") && (!status.endsWith("4") && !status.endsWith("5"))) {
                 llBottom.setVisibility(View.VISIBLE);
                 llCheck.setVisibility(View.VISIBLE);
             } else {
@@ -183,7 +198,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 llCheck.setVisibility(View.GONE);
             }
         } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-            if (status.startsWith("1") && (!status.endsWith("4")&&!status.endsWith("5"))) {
+            if (status.startsWith("1") && (!status.endsWith("4") && !status.endsWith("5"))) {
                 llBottom.setVisibility(View.VISIBLE);
                 llCheck.setVisibility(View.VISIBLE);
             } else {
@@ -294,7 +309,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 tvTop3.setText("通过");
                 tvTop4.setText("通过");
                 tvTop5.setText("驳回");
-            }else if (status.endsWith("5")) {
+            } else if (status.endsWith("5")) {
                 changeProcessView(viewNode2, viewLine2, 0);
                 changeProcessView(viewNode3, viewLine3, 0);
                 changeProcessView(viewNode4, viewLine4, 0);

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

@@ -270,6 +270,7 @@
                     android:background="@color/red_btn_bg" />
 
                 <TextView
+                    android:id="@+id/tv_title_desc"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10mm"
@@ -287,6 +288,7 @@
                 android:paddingVertical="15mm">
 
                 <TextView
+                    android:id="@+id/tv_return_num_desc"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="退货数量" />
@@ -329,6 +331,7 @@
                 android:paddingVertical="15mm">
 
                 <TextView
+                    android:id="@+id/tv_return_type_desc"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="退货类型" />
@@ -342,6 +345,7 @@
             </RelativeLayout>
 
             <RelativeLayout
+                android:id="@+id/ll_stock"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"