1.添加申请发货，税率，展示有问题

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

@@ -145,6 +145,15 @@ public class SendApplyBean {
         private Object customerName;
         private Object stockName;
         private String receiveDeptName;
+        private String tax;
+
+        public String getTax() {
+            return tax;
+        }
+
+        public void setTax(String tax) {
+            this.tax = tax;
+        }
 
         public Object getCreatedBy() {
             return createdBy;

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

 package com.wd.workoffice.ui.activity.bat.order;
 
 import android.content.Intent;
-import android.text.Editable;
+import android.os.Bundle;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -77,6 +77,16 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
     EditText etRemark;
     @BindView(R.id.tv_input1)
     TextView tvInput1;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.ll_logistics_price)
+    LinearLayout llLogisticsPrice;
+    @BindView(R.id.et_tax)
+    EditText etTax;
+    @BindView(R.id.ll_tax)
+    LinearLayout llTax;
+    @BindView(R.id.ll_logistics_code)
+    LinearLayout llLogisticsCode;
     private List<OrderDetail.OrderItemsBean> dataList;
     private WorkSendApplyAddAdapter dataAdapter;
     private Map<String, Object> param;
@@ -89,6 +99,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
         ButterKnife.bind(this);
         rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         WorkUtils.addNumListener(etRemark, tvInput1);
+        WorkUtils.addDecimalsListener(etTax);
     }
 
     @Override
@@ -198,6 +209,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
         String price = etLogisticsPrice.getText().toString();
         String code = etLogisticsCode.getText().toString();
         String remark = etRemark.getText().toString();
+        String tax = etTax.getText().toString();
         String time = tvTime.getText().toString();
 //        if (TextUtils.isEmpty(time)) {
 //            toast("请选择发货时间");
@@ -207,6 +219,10 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
             toast("请输入运费");
             return;
         }
+        if (TextUtils.isEmpty(tax)) {
+            toast("请输入税率");
+            return;
+        }
         if (clientId == 0) {
             toast("请选择物流公司");
             return;
@@ -214,6 +230,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
         param.put("trackingNumber", code);
         param.put("fareMoney", price);
         param.put("applyRemark", remark);
+        param.put("tax", tax);
         param.put("logisticsId", clientId);
         Observable<BaseBean> observable;
         if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {

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

 package com.wd.workoffice.ui.activity.bat.order;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -11,7 +13,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.google.gson.JsonObject;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
@@ -78,6 +79,16 @@ public class SendApplyAddCrucibleActivity extends WorkToolBarActivity {
     EditText etRemark;
     @BindView(R.id.tv_input1)
     TextView tvInput1;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.ll_logistics_price)
+    LinearLayout llLogisticsPrice;
+    @BindView(R.id.et_tax)
+    EditText etTax;
+    @BindView(R.id.ll_tax)
+    LinearLayout llTax;
+    @BindView(R.id.ll_logistics_code)
+    LinearLayout llLogisticsCode;
     private List<OrderDetail.OrderItemsBean> dataList;
     private SendApplyAddCrucibleAdapter dataAdapter;
     private Map<String, Object> param;
@@ -112,7 +123,7 @@ public class SendApplyAddCrucibleActivity extends WorkToolBarActivity {
                 startActivityForResult(SendApplyCrucibleChooseActivity.class,
                         10002, "position", i + ""
                         , "deptId", getIntent().getStringExtra("deptId"),
-                        "num", MathUtils.converData(dataList.get(i).getCanOutStoreProductSum(),3) ,
+                        "num", MathUtils.converData(dataList.get(i).getCanOutStoreProductSum(), 3),
                         "productId", dataList.get(i).getProductId() + "");
             }
         });
@@ -222,6 +233,7 @@ public class SendApplyAddCrucibleActivity extends WorkToolBarActivity {
         String price = etLogisticsPrice.getText().toString();
         String code = etLogisticsCode.getText().toString();
         String remark = etRemark.getText().toString();
+        String tax = etTax.getText().toString();
 //        String time = tvTime.getText().toString();
 //        if (TextUtils.isEmpty(time)) {
 //            toast("请选择发货时间");
@@ -231,8 +243,12 @@ public class SendApplyAddCrucibleActivity extends WorkToolBarActivity {
             toast("请输入运费");
             return;
         }
-        if (TextUtils.isEmpty(code)) {
-            toast("请输入快递单号");
+//        if (TextUtils.isEmpty(code)) {
+//            toast("请输入快递单号");
+//            return;
+//        }
+        if (TextUtils.isEmpty(tax)) {
+            toast("请输入税率");
             return;
         }
         if (clientId == 0) {
@@ -243,6 +259,7 @@ public class SendApplyAddCrucibleActivity extends WorkToolBarActivity {
         param.put("fareMoney", price);
         param.put("applyRemark", remark);
         param.put("logisticsId", clientId);
+        param.put("tax", tax);
         Observable<BaseBean> observable;
         if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
             observable = RtfUtils.getRtf().sendForwardApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));

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

 package com.wd.workoffice.ui.activity.bat.order;
 
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -74,6 +75,8 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
     TextView tvCheckRemark;
     @BindView(R.id.ll_check)
     LinearLayout llCheck;
+    @BindView(R.id.tv_tax)
+    TextView tvTax;
     private List<SendApplyDetailBean> dataList;
     private SendApplyDetailAdapter dataAdapter;
     private Map<String, Object> param;
@@ -92,9 +95,9 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
         if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
             hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
         } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-            hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getPermission());
+            hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getPermission());
         } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
-            hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getPermission());
+            hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getPermission());
         }
         if (!hasPermission) {
             llBottom.setVisibility(View.GONE);
@@ -107,11 +110,12 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
         info = JSON.parseObject(getIntent().getStringExtra("info"), SendApplyBean.RecordsBean.class);
         getData(info.getId() + "");
         tvTime.setText(info.getCreatedTime());
-        tvWeight.setText(MathUtils.converData(info.getTotalWeight(),3));
-        tvLogisticsPrice.setText(MathUtils.converData(info.getFareMoney(),3));
+        tvWeight.setText(MathUtils.converData(info.getTotalWeight(), 3));
+        tvLogisticsPrice.setText(MathUtils.converData(info.getFareMoney(), 3));
         tvLogisticsCode.setText(info.getTrackingNumber());
         tvLogisticsCompany.setText(info.getTransitPartName());
         tvRemark.setText(info.getApplyRemark());
+        tvTax.setText(MathUtils.converData(info.getTax(), 3));
         if (TextUtils.equals(info.getStatus(), "0")) {
             llBottom.setVisibility(View.VISIBLE);
             llCheck.setVisibility(View.GONE);
@@ -194,7 +198,7 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }
@@ -250,4 +254,5 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
             }
         });
     }
+
 }

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

 package com.wd.workoffice.ui.activity.bat.order;
 
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,7 +20,6 @@ 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.ui.adapter.SendApplyDetailAdapter;
 import com.wd.workoffice.ui.adapter.SendApplyDetailCrucibleAdapter;
 import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -76,6 +76,8 @@ public class SendApplyDetailCrucibleActivity extends WorkToolBarActivity {
     TextView tvCheckRemark;
     @BindView(R.id.ll_check)
     LinearLayout llCheck;
+    @BindView(R.id.tv_tax)
+    TextView tvTax;
     private List<SendApplyDetailBean> dataList;
     private SendApplyDetailCrucibleAdapter dataAdapter;
     private Map<String, Object> param;
@@ -114,6 +116,7 @@ public class SendApplyDetailCrucibleActivity extends WorkToolBarActivity {
         tvLogisticsCode.setText(info.getTrackingNumber());
         tvLogisticsCompany.setText(info.getTransitPartName());
         tvRemark.setText(info.getApplyRemark());
+        tvTax.setText(MathUtils.converData(info.getTax(), 3));
         if (TextUtils.equals(info.getStatus(), "0")) {
             llBottom.setVisibility(View.VISIBLE);
             llCheck.setVisibility(View.GONE);
@@ -258,4 +261,5 @@ public class SendApplyDetailCrucibleActivity extends WorkToolBarActivity {
             }
         });
     }
+
 }

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

@@ -172,7 +172,36 @@
                         android:textColor="@color/flexible_text_gray"
                         android:textSize="14sp" />
                 </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/ll_tax"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="20mm"
+                    android:paddingVertical="9mm">
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_centerVertical="true"
+                        android:text="税率"
+                        android:textSize="14sp" />
+
+                    <EditText
+                        android:id="@+id/et_tax"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginLeft="10mm"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:gravity="right"
+                        android:hint="如果为5%，这里应该填写0.05"
+                        android:inputType="numberDecimal"
+                        android:padding="3mm"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+                </LinearLayout>
                 <LinearLayout
                     android:id="@+id/ll_logistics_code"
                     android:layout_width="match_parent"

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

@@ -175,7 +175,31 @@
             </RelativeLayout>
 
             <View style="@style/dividerX" />
+            <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="税率"
+                    android:textSize="15sp" />
 
+                <TextView
+                    android:id="@+id/tv_tax"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="15sp" />
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"