1.修改bug

2.TODO 三个功能测试，下单新增唛头

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

@@ -218,14 +218,7 @@ public class BackAddActivity extends WorkToolBarActivity {
                 List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
                 for (OrderDetail.OrderItemsBean orderItem : orderItems) {
                     if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
-                        if (TextUtils.isEmpty(enterStockType)) {
-                            tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
-                        } else {
-                            String returnNum = TextUtils.equals(enterStockType, "1") ?
-                                    orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
-                            tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(returnNum, 3)));
-                        }
-
+                        tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanPickReturnProductSum(), 3)));
                     }
                 }
             }
@@ -321,7 +314,7 @@ public class BackAddActivity extends WorkToolBarActivity {
             observable = RtfUtils.getRtf().returnPoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             observable = RtfUtils.getRtf().pickReturnFoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
-        }else {
+        } else {
             observable = RtfUtils.getRtf().pickReturnFoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
         }
         observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {

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

@@ -211,12 +211,16 @@ public class ReturnAddActivity extends WorkToolBarActivity {
                 List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
                 for (OrderDetail.OrderItemsBean orderItem : orderItems) {
                     if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
-                        if (TextUtils.isEmpty(enterStockType)) {
-                            tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
+                        if (!TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {// 0805新增 额外判断供应订单 不修改旧逻辑
+                            if (TextUtils.isEmpty(enterStockType)) {
+                                tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
+                            } else {
+                                String returnNum = TextUtils.equals(enterStockType, "1") ?
+                                        orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
+                                tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(returnNum, 3)));
+                            }
                         } else {
-                            String returnNum = TextUtils.equals(enterStockType, "1") ?
-                                    orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
-                            tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(returnNum, 3)));
+                            tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanReturnProductSum(), 3)));
                         }
 
                     }
@@ -286,19 +290,26 @@ public class ReturnAddActivity extends WorkToolBarActivity {
             List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
             for (OrderDetail.OrderItemsBean orderItem : orderItems) {
                 if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
-                    if (TextUtils.isEmpty(enterStockType)) {
-                        if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) == 1) {
-                            toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
-                            return;
+                    if (!TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {// 0805新增 额外判断供应订单 不修改旧逻辑
+                        if (TextUtils.isEmpty(enterStockType)) {
+                            if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) == 1) {
+                                toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
+                                return;
+                            }
+                        } else {
+                            String returnNum = TextUtils.equals(enterStockType, "1") ?
+                                    orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
+                            if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(returnNum)) == 1) {
+                                toast(String.format("可申请退货数量最大为%s", MathUtils.converData(returnNum, 3)));
+                                return;
+                            }
+
                         }
                     } else {
-                        String returnNum = TextUtils.equals(enterStockType, "1") ?
-                                orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
-                        if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(returnNum)) == 1) {
-                            toast(String.format("可申请退货数量最大为%s", MathUtils.converData(returnNum, 3)));
+                        if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanReturnProductSum())) == 1) {
+                            toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanReturnProductSum(), 3)));
                             return;
                         }
-
                     }
 
                 }
@@ -324,8 +335,8 @@ public class ReturnAddActivity extends WorkToolBarActivity {
         } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
             observable = RtfUtils.getRtf().returnPoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
-            observable = RtfUtils.getRtf().returnPoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
-        }else {
+            observable = RtfUtils.getRtf().returnFoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
+        } else {
             observable = RtfUtils.getRtf().returnSoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
         }
         observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {

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

@@ -336,7 +336,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                                 "deptId", dataBean.getLaunchDeptId() + "",
                                 "returnNum", proList.get(position).getCanReturnProductSum(),
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
-                                "num", proList.get(position).getCanUseProductSum() + "",
+                                "num", proList.get(position).getCanReturnProductSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
                                 "orderId", getIntent().getStringExtra("id"),
@@ -351,7 +351,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                                 "deptId", dataBean.getLaunchDeptId() + "",
                                 "returnNum", proList.get(position).getCanPickReturnProductSum(),
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
-                                "num", proList.get(position).getCanUseProductSum() + "",
+                                "num", proList.get(position).getCanPickReturnProductSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
                                 "orderId", getIntent().getStringExtra("id"),

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

@@ -392,28 +392,6 @@
                     android:textColor="@color/flexible_text_gray" />
             </RelativeLayout>
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@color/white"
-                android:gravity="center"
-                android:paddingHorizontal="20mm"
-                android:paddingVertical="15mm">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="部门名称" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:text="销售二公司"
-                    android:textColor="@color/flexible_text_gray" />
-            </RelativeLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"