1.退货添加报废逻辑

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

@@ -983,6 +983,42 @@ public class OrderDetail {
         String count;// backList的数量
         String lot;// 产品批号
         private String provideMethod;
+        private String canScrapInProductSum;
+        private String canScrapOutProductSum;
+        private String canScrapUseProductSum;
+        private String canScrapReturnProductSum;
+
+        public String getCanScrapInProductSum() {
+            return canScrapInProductSum;
+        }
+
+        public void setCanScrapInProductSum(String canScrapInProductSum) {
+            this.canScrapInProductSum = canScrapInProductSum;
+        }
+
+        public String getCanScrapOutProductSum() {
+            return canScrapOutProductSum;
+        }
+
+        public void setCanScrapOutProductSum(String canScrapOutProductSum) {
+            this.canScrapOutProductSum = canScrapOutProductSum;
+        }
+
+        public String getCanScrapUseProductSum() {
+            return canScrapUseProductSum;
+        }
+
+        public void setCanScrapUseProductSum(String canScrapUseProductSum) {
+            this.canScrapUseProductSum = canScrapUseProductSum;
+        }
+
+        public String getCanScrapReturnProductSum() {
+            return canScrapReturnProductSum;
+        }
+
+        public void setCanScrapReturnProductSum(String canScrapReturnProductSum) {
+            this.canScrapReturnProductSum = canScrapReturnProductSum;
+        }
 
         public String getProvideMethod() {
             return provideMethod;

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

@@ -218,6 +218,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
                         "orderItemId", getIntent().getStringExtra("orderItemId"),
                         "enterStockType", getIntent().getStringExtra("enterStockType"),
                         "deptId", getIntent().getStringExtra("deptId"),
+                        "isCrucible", getIntent().getStringExtra("isCrucible"),
                         "id", getIntent().getStringExtra("orderId"));
                 break;
         }

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

@@ -358,6 +358,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
                                 "orderId", getIntent().getStringExtra("id"),
                                 "orderItemId", proList.get(position).getId(),
                                 "productId", proList.get(position).getProductId() + "",
+                                "isCrucible", dataBean.getIsCrucible(),
                                 _TITLE,"退货/报废申请列表");
                         break;
                     case R.id.tv_flow:

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

@@ -29,7 +29,37 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
+                <LinearLayout
+                    android:id="@+id/ll_action"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingHorizontal="20mm"
+                    android:paddingVertical="9mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="动作"
+                        android:textSize="14sp" />
 
+                    <TextView
+                        android:id="@+id/tv_action"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10mm"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:gravity="right"
+                        android:padding="3mm"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -116,6 +146,7 @@
                     android:paddingVertical="9mm">
 
                     <TextView
+                        android:id="@+id/tv_return_type_desc"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="退货类别"
@@ -149,6 +180,7 @@
                     android:paddingVertical="9mm">
 
                     <TextView
+                        android:id="@+id/tv_stock_desc"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="退货到仓库"
@@ -204,6 +236,7 @@
                 </LinearLayout>
 
                 <TextView
+                    android:id="@+id/tv_remark_desc"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="20mm"