From 18977a9a1b1ce2018edd422f9f29154c5e421901 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Wed, 20 Dec 2017 15:05:41 +0800
Subject: [PATCH] no message

---
 .../qhclh/ytzh/bean/ProductionDailyBean.java    | 17 +++++++++++++++++
 .../ProductiondailyActivity.java                |  3 ++-
 .../productiondaily/ProductiondailyAdapter.java |  7 +++++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyBean.java b/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyBean.java
index c57bd84..9b28b05 100644
--- a/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyBean.java
+++ b/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyBean.java
@@ -9,6 +9,23 @@ public class ProductionDailyBean {
     private String productionbatch;
     private String productionaddrs;
     private String ptime;
+    private String shenghezhuangtai;
+
+    public String getShenghezhuangtai() {
+        return shenghezhuangtai;
+    }
+
+    public void setShenghezhuangtai(String shenghezhuangtai) {
+        this.shenghezhuangtai = shenghezhuangtai;
+    }
+
+    public ProductionDailyBean(long id, String productionbatch, String productionaddrs, String ptime, String shenghezhuangtai) {
+        this.id = id;
+        this.productionbatch = productionbatch;
+        this.productionaddrs = productionaddrs;
+        this.ptime = ptime;
+        this.shenghezhuangtai = shenghezhuangtai;
+    }
 
     public ProductionDailyBean(long id, String productionbatch, String productionaddrs, String ptime) {
         this.id = id;
diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyActivity.java
index f0b7a60..d41a405 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyActivity.java
@@ -101,7 +101,7 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia
                 for (int i=0;i<size;i++){
                     productionDailyBeanList.add(new ProductionDailyBean(rpcobj.get(i).getLong("ID")
                             ,rpcobj.get(i).getString("Batch_Name"),rpcobj.get(i).getString("BreedFactory_Name")
-                            ,DateTimeUtil.getYMD2(rpcobj.get(i).getDate("Date"))));
+                            ,DateTimeUtil.getYMD2(rpcobj.get(i).getDate("Date")),rpcobj.get(i).getNamedValue("BillState").getName()));
                 }
                 productiondailyAdapter = new ProductiondailyAdapter(ProductiondailyActivity.this,productionDailyBeanList);
                 lv_productiondaily.setAdapter(productiondailyAdapter);
@@ -121,6 +121,7 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia
                 select.add("BreedFactory_ID");
                 select.add("BreedFactory_Name");
                 select.add("Date");
+                select.add("BillState");
 //                select.add("Remark");
 //                select.add("AccountingUnit_ID");
 //                select.add("AccountingUnit_Name");
diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyAdapter.java b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyAdapter.java
index 8c664d3..4387fde 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyAdapter.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyAdapter.java
@@ -61,8 +61,11 @@ public class ProductiondailyAdapter extends BaseAdapter {
         }
 
         viewHolder.productiondaily_batch.setText("批次:"+message.getProductionbatch());
-        viewHolder.productiondaily_addrs.setText("养殖场:"+message.getProductionaddrs());
-        viewHolder.productiondaily_time.setText(""+message.getPtime());
+        ///< 养殖场位置改成日期，日期位置改成单据状态
+//        viewHolder.productiondaily_addrs.setText("养殖场:"+message.getProductionaddrs());
+        viewHolder.productiondaily_addrs.setText("日期:"+message.getPtime());
+//        viewHolder.productiondaily_time.setText(""+message.getPtime());
+        viewHolder.productiondaily_time.setText(""+message.getShenghezhuangtai());
 
         return view;
     }