1.财务-收票新增，显示入库时间

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

@@ -188,6 +188,16 @@ public class TicketAddBean {
             private String carPrice;
             private String carNum;
             private Double  canReceiptInvoiceSum;
+            private String lastEnterStoredTime;
+
+
+            public String getLastEnterStoredTime() {
+                return lastEnterStoredTime;
+            }
+
+            public void setLastEnterStoredTime(String lastEnterStoredTime) {
+                this.lastEnterStoredTime = lastEnterStoredTime;
+            }
 
             public Double getCanReceiptInvoiceSum() {
                 return canReceiptInvoiceSum;

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

@@ -49,6 +49,15 @@ public class TicketDetailBean {
     private String productSpec;
     private String productUnit;
     private double productWeight;
+    private String lastEnterStoredTime;
+
+    public String getLastEnterStoredTime() {
+        return lastEnterStoredTime;
+    }
+
+    public void setLastEnterStoredTime(String lastEnterStoredTime) {
+        this.lastEnterStoredTime = lastEnterStoredTime;
+    }
 
     public int getCreatedBy() {
         return createdBy;

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

 package com.wd.workoffice.ui.activity.bat.work;
 
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -105,7 +104,7 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit
             llCheck.setVisibility(View.VISIBLE);
         }
         dataList = new ArrayList<>();
-        dataAdapter = new WorkFinancialTicketDetailAdapter(R.layout.item_ticket_detail, dataList);
+        dataAdapter = new WorkFinancialTicketDetailAdapter(R.layout.item_ticket_detail, dataList,1);
         dataAdapter.bindToRecyclerView(rvData);
         param = new HashMap<>();
         param.put("id", info.getId());

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

@@ -44,6 +44,12 @@ public class WorkAddTicketOrderAdapter extends BaseQuickAdapter<TicketAddBean.Re
         if (type == 1) {
             helper.setVisible(R.id.iv_cart, false);
         }
+        helper.setText(R.id.tv_price, item.getCarPrice());
+        //收票显示 入库时间全部不显示
+        if (from == 1) {
+            helper.setGone(R.id.rl_time, true);
+            helper.setText(R.id.tv_time, item.getLastEnterStoredTime());
+        }
     }
 
     public int getFrom() {

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

@@ -15,11 +15,17 @@ import java.util.List;
  */
 
 public class WorkFinancialTicketDetailAdapter extends BaseQuickAdapter<TicketDetailBean, BaseViewHolder> {
+    int type; // 0 开票 1 收票
 
     public WorkFinancialTicketDetailAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
 
+    public WorkFinancialTicketDetailAdapter(int layoutResId, List data, int type) {
+        super(layoutResId, data);
+        this.type = type;
+    }
+
     @Override
     protected void convert(BaseViewHolder helper, TicketDetailBean item) {
         helper.setText(R.id.tv_name, item.getProductSimpleCode());
@@ -29,6 +35,12 @@ public class WorkFinancialTicketDetailAdapter extends BaseQuickAdapter<TicketDet
         helper.setText(R.id.tv_weight, String.valueOf(item.getProductWeight()));
         helper.setText(R.id.tv_price, String.valueOf(item.getInvoiceUnitPrice()));
         helper.setText(R.id.tv_num, MathUtils.converData(item.getQuantity(), 3));
+        //改错了，入库时间全部不显示
+        helper.setGone(R.id.rl_time, false);
+        if (type == 1) {
+            helper.setText(R.id.tv_time, item.getLastEnterStoredTime());
+
+        }
     }
 }
 

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

@@ -133,6 +133,33 @@
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="13sp" />
         </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm"
+            android:visibility="gone"
+            android:paddingHorizontal="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10mm"
+                android:text="入库时间"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+        </RelativeLayout>
     </LinearLayout>
 
     <LinearLayout

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

@@ -132,6 +132,33 @@
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="13sp" />
         </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm"
+            android:visibility="gone"
+            android:paddingHorizontal="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10mm"
+                android:text="入库时间"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+        </RelativeLayout>
     </LinearLayout>
 
     <LinearLayout

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

@@ -20,6 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="30mm"
+        android:visibility="gone"
         android:orientation="horizontal"
         android:paddingHorizontal="20mm">