1.修改时间比较bug

2.TODO 供应订单三个功能测试，

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

@@ -286,7 +286,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 (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanPickReturnProductSum())) == 1) {
+                    if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(Double.valueOf(orderItem.getCanPickReturnProductSum()))) == 1) {
                         toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanPickReturnProductSum(), 3)));
                         return;
                     }

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

@@ -125,7 +125,7 @@ public class PickApplyDetailActivity extends WorkToolBarActivity {
             tvCheckRemark.setText(info.getAuditRemark());
         }
         dataList = new ArrayList<>();
-        dataAdapter = new SendApplyDetailAdapter(R.layout.item_send_apply_detail, dataList);
+        dataAdapter = new SendApplyDetailAdapter(R.layout.item_send_apply_detail, dataList,1);
         dataAdapter.bindToRecyclerView(rvData);
         param = new HashMap<>();
         param.put("id", info.getId());

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

@@ -299,14 +299,14 @@ public class ReturnAddActivity extends WorkToolBarActivity {
                         } 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(Double.valueOf(returnNum))) == 1) {
+                                toast(String.format("可申请退货数量最大为%s", MathUtils.converData(Double.valueOf(returnNum), 3)));
                                 return;
                             }
 
                         }
                     } else {
-                        if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanReturnProductSum())) == 1) {
+                        if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(Double.valueOf(orderItem.getCanReturnProductSum()))) == 1) {
                             toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanReturnProductSum(), 3)));
                             return;
                         }

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

@@ -155,7 +155,7 @@ public class SendApplyCrucibleChooseActivity extends WorkToolBarActivity {
 
         if (chooseList.size() != 0) {
             if (new BigDecimal(Double.valueOf(tvPrice.getText().toString().split(": ")[1])).
-                    compareTo(new BigDecimal(getIntent().getStringExtra("num"))) == 1) {
+                    compareTo(new BigDecimal(Double.valueOf(getIntent().getStringExtra("num")))) == 1) {
                 toast(String.format("可申请数量最大为%s", MathUtils.converData(getIntent().getStringExtra("num"), 3)));
                 return;
             }

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

@@ -17,18 +17,25 @@ import androidx.annotation.Nullable;
  */
 
 public class SendApplyDetailAdapter extends BaseQuickAdapter<SendApplyDetailBean, BaseViewHolder> {
+    int type;//0 申请发货 1申请领料
 
     public SendApplyDetailAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
 
+    public SendApplyDetailAdapter(int layoutResId, List data, int type) {
+        super(layoutResId, data);
+    }
 
     @Override
     protected void convert(BaseViewHolder helper, SendApplyDetailBean item) {
         helper.setText(R.id.tv_name, item.getSimpleCode());
         helper.setText(R.id.tv_card, item.getSoleCode());
         helper.setText(R.id.tv_card_name, item.getProductName());
-        helper.setText(R.id.tv_all_num, MathUtils.converData(item.getProductAmount(),3));
+        helper.setText(R.id.tv_all_num, MathUtils.converData(item.getProductAmount(), 3));
+        if (type == 1) {
+            helper.setText(R.id.tv_desc, "使用数量");
+        }
     }
 }
 

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

@@ -78,6 +78,7 @@
         android:layout_marginTop="30mm">
 
         <TextView
+            android:id="@+id/tv_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="发货数量:  "