1.修改bug

2.物流开票修改接口字段

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

@@ -111,7 +111,7 @@ public class LogisticDetailBean {
              */
 
             private Object createdBy;
-            private Object createdByName;
+            private String createdByName;
             private String createdTime;
             private Object updatedBy;
             private Object updatedByName;
@@ -133,6 +133,15 @@ public class LogisticDetailBean {
             private double weight;
             private double fareMoney;
             private Object idList;
+            private double money;
+
+            public double getMoney() {
+                return money;
+            }
+
+            public void setMoney(double money) {
+                this.money = money;
+            }
 
             public Object getCreatedBy() {
                 return createdBy;
@@ -142,11 +151,11 @@ public class LogisticDetailBean {
                 this.createdBy = createdBy;
             }
 
-            public Object getCreatedByName() {
+            public String getCreatedByName() {
                 return createdByName;
             }
 
-            public void setCreatedByName(Object createdByName) {
+            public void setCreatedByName(String createdByName) {
                 this.createdByName = createdByName;
             }
 

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -1101,14 +1101,22 @@ public interface ApiService {
     @GET("/finance-dept-ar-ap-part/flow/page/list")
     Observable<BaseBean> contactsMoneyFlow(@QueryMap Map<String, Object> param);
 
+//    /**
+//     * 部门应收应付账款流水
+//     *
+//     * @return
+//     */
+//    @GET("/finance-logistics-log/page/list")
+//    Observable<BaseBean> contactsLogistic(@QueryMap Map<String, Object> param);
     /**
      * 部门应收应付账款流水
      *
      * @return
      */
-    @GET("/finance-logistics-log/page/list")
+    @GET("/finance-fare/dept/fare/page/list")
     Observable<BaseBean> contactsLogistic(@QueryMap Map<String, Object> param);
 
+
     /**
      * 部门应收应付账款流水
      *

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

@@ -100,6 +100,10 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
         rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         WorkUtils.addNumListener(etRemark, tvInput1);
         WorkUtils.addDecimalsListener(etTax);
+        llLogisticsCode.setVisibility(View.GONE);
+        llLogisticsPrice.setVisibility(View.GONE);
+        llTax.setVisibility(View.GONE);
+        rlSet.setVisibility(View.GONE);
     }
 
     @Override
@@ -184,7 +188,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
             if (entry.getValue()) {
                 OrderDetail.OrderItemsBean recordsBean = dataList.get(entry.getKey());
                 JSONObject returnData = new JSONObject();
-                if (TextUtils.isEmpty(recordsBean.getChooseNum()) || Double.valueOf(recordsBean.getChooseNum()) == 0d) {
+                if (TextUtils.isEmpty(recordsBean.getChooseNum()) || Double.parseDouble(recordsBean.getChooseNum()) == 0d) {
                     toast("请选择发货数量");
                     return false;
                 }
@@ -215,23 +219,23 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
 //            toast("请选择发货时间");
 //            return;
 //        }
-        if (TextUtils.isEmpty(price)) {
-            toast("请输入运费");
-            return;
-        }
-        if (TextUtils.isEmpty(tax)) {
-            toast("请输入税率");
-            return;
-        }
-        if (clientId == 0) {
-            toast("请选择物流公司");
-            return;
-        }
-        param.put("trackingNumber", code);
-        param.put("fareMoney", price);
+//        if (TextUtils.isEmpty(price)) {
+//            toast("请输入运费");
+//            return;
+//        }
+//        if (TextUtils.isEmpty(tax)) {
+//            toast("请输入税率");
+//            return;
+//        }
+//        if (clientId == 0) {
+//            toast("请选择物流公司");
+//            return;
+//        }
+//        param.put("trackingNumber", code);
+//        param.put("fareMoney", price);
         param.put("applyRemark", remark);
-        param.put("tax", tax);
-        param.put("logisticsId", clientId);
+//        param.put("tax", tax);
+//        param.put("logisticsId", clientId);
         Observable<BaseBean> observable;
         if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
             observable = RtfUtils.getRtf().sendApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/FareAddActivity.java

@@ -239,7 +239,7 @@ public class FareAddActivity extends WorkToolBarActivity {
                     proList.addAll(getList);
                     proAdapter.notifyDataSetChanged();
                 }
-                if (proList.size() == 0) {
+                if (getList.size() == 0) {
                     proAdapter.loadMoreEnd();
                 } else {
                     page++;

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

@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.LogisticDetailBean;
 import com.wd.workoffice.bean.TicketAddBean;
+import com.wd.workoffice.util.MathUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -38,9 +39,9 @@ public class WorkAddLogisticProAdapter extends BaseQuickAdapter<LogisticDetailBe
         helper.setText(R.id.tv_company, item.getLaunchDeptName());
         helper.setText(R.id.tv_client, item.getCustomerName());
         helper.setText(R.id.tv_name, "快递单号："+item.getTrackingNumber());
-        helper.setText(R.id.tv_weight, String.valueOf(item.getWeight()));
-        helper.setText(R.id.tv_tax, String.valueOf(item.getFareMoney()));
-        helper.setText(R.id.tv_person, item.getCreatedUser());
+        helper.setText(R.id.tv_weight, MathUtils.converData(item.getWeight(),3));
+        helper.setText(R.id.tv_tax, MathUtils.converData(item.getMoney(),3));
+        helper.setText(R.id.tv_person, item.getCreatedByName());
         CheckBox cbChoose = helper.getView(R.id.cb_check);
         cbChoose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override