From d9869265be588462721affd3fbd532138b98223d Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Mon, 2 Sep 2024 09:40:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E4=B8=BB=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cargo/request/bean/AddressInputBean.java      |  9 +++++++++
 .../cargo/ui/home/ChoiceAddressActivity.java      |  2 ++
 .../com/oneclouds/cargo/ui/home/HomeFragment.java | 15 +++++++++++----
 .../cargo/ui/home/OrderDetailsActivity.java       |  5 ++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/oneclouds/cargo/request/bean/AddressInputBean.java b/app/src/main/java/com/oneclouds/cargo/request/bean/AddressInputBean.java
index 6111bcc..b947562 100644
--- a/app/src/main/java/com/oneclouds/cargo/request/bean/AddressInputBean.java
+++ b/app/src/main/java/com/oneclouds/cargo/request/bean/AddressInputBean.java
@@ -10,6 +10,7 @@ public class AddressInputBean{
 
     private String addressDetail;
     private String businessCode;
+    private String businessName;
     private int addressType;
     private int area;
     private String areaS;
@@ -31,6 +32,14 @@ public class AddressInputBean{
     private int userId;
     private int userType;
 
+    public String getBusinessName() {
+        return businessName;
+    }
+
+    public void setBusinessName(String businessName) {
+        this.businessName = businessName;
+    }
+
     public String getAreaS() {
         return areaS;
     }
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java
index 2bb808b..a25112a 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java
+++ b/app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java
@@ -309,6 +309,8 @@ public class ChoiceAddressActivity extends BaseActivity implements View.OnClickL
             aib.setAddressType(type);
             aib.setCompanyCode(tvNum2);
             aib.setCompanyName(comName2);
+            aib.setBusinessCode(tvNum2);
+            aib.setBusinessName(comName2);
             ar.addressSave(aib);
         } else {
             Toast.makeText(con, "手机号格式不正确", Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java b/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java
index 2bafe3c..fb4e44a 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java
@@ -607,6 +607,13 @@ public class HomeFragment extends BaseFragment {
 //                            }
 //                        }
 //                    }
+
+                    //货主名称改为 businessName
+                    for (OrderInputBean.SendTableDataDTO sendTableDatum : oib.getSendTableData()) {
+                        sendTableDatum.setBusinessCode(StringUtil.isNull(sendTableDatum.getCompanyCode(), ""));
+                        sendTableDatum.setBusinessName(StringUtil.isNull(sendTableDatum.getCompanyName(), ""));
+                    }
+
                     if (null != oib.getSendTableData().get(0).getGoods()
                             && null != oib.getPutTableData().get(0).getGoods()
                             && 0 != oib.getFormData().getVehicleType()
@@ -851,11 +858,11 @@ public class HomeFragment extends BaseFragment {
         }
     }
 
-    private void clearData(){
+    private void clearData() {
         OrderInputBean.PutTableDataDTO op = new OrderInputBean.PutTableDataDTO();
         OrderInputBean.SendTableDataDTO os = new OrderInputBean.SendTableDataDTO();
-        oib.getPutTableData().set(0,op);
-        oib.getSendTableData().set(0,os);
+        oib.getPutTableData().set(0, op);
+        oib.getSendTableData().set(0, os);
         brv_loading.createV(con, oib.getSendTableData(), R.layout.huoyuan_centent_loading_info).
                 setOnItemViewListener((position, o, v1) -> {
                     OrderInputBean.SendTableDataDTO oss = (OrderInputBean.SendTableDataDTO) o;
@@ -874,6 +881,6 @@ public class HomeFragment extends BaseFragment {
         vehicle_length.setText("");
         tvHwdlJt.setText("");
         requirement.setText("");
-        money_view.setText("￥ 0" );
+        money_view.setText("￥ 0");
     }
 }
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/OrderDetailsActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/home/OrderDetailsActivity.java
index 64e508a..2959d2d 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/home/OrderDetailsActivity.java
+++ b/app/src/main/java/com/oneclouds/cargo/ui/home/OrderDetailsActivity.java
@@ -200,7 +200,10 @@ public class OrderDetailsActivity extends BaseActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        addressRequest.getCarLoca(sob.getData().getCarNumber());
+        String waybillStatus = sob.getData().getWaybillStatus();
+        if (waybillStatus.equals("已装货")||waybillStatus.equals("待调度")){
+            addressRequest.getCarLoca(sob.getData().getCarNumber());
+        }
 //        addressRequest.getCarLoca("冀AAH822");
         //up_traffic();
         brv.setNestedScrollingEnabled(false);