diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java
index 9b0dc86..eaacd9d 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java
@@ -16,12 +16,14 @@ import com.qhclh.ytzh.base.BaseActivity;
 import com.qhclh.ytzh.bean.WriteBean;
 import com.qhclh.ytzh.home.RpcUrl;
 import com.qhclh.ytzh.tasks.ViewOnClickTask;
+import com.qhclh.ytzh.ui.CalendarDialogFragment;
 
 import org.forks.jsonrpc.JsonRpcResult;
 import org.forks.jsonrpc.RpcFacade;
 import org.forks.jsonrpc.RpcObject;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import butterknife.BindView;
@@ -30,7 +32,7 @@ import butterknife.BindView;
  * Created by 青花瓷 on 2017/12/19.
  */
 
-public class WriteDActivity extends BaseActivity {
+public class WriteDActivity extends BaseActivity implements CalendarDialogFragment.CalendarClickListener{
     @BindView(R.id.toolbar)
     Toolbar mToolbar;
     @BindView(R.id.tv_toolbar_title)
@@ -45,6 +47,8 @@ public class WriteDActivity extends BaseActivity {
 
     private List<WriteBean> list;
 
+    public static List<WriteBean> tijiaoList;
+
     @Override
     protected int setLayoutId() {
         return R.layout.act_writed;
@@ -65,6 +69,7 @@ public class WriteDActivity extends BaseActivity {
     @Override
     protected void initData() {
         list = new ArrayList<>();
+        tijiaoList = new ArrayList<>();
     }
 
     @Override
@@ -75,7 +80,7 @@ public class WriteDActivity extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        LoadOrCreateEditingDayProduct();
+
     }
     public static RpcObject rpcObj;
 
@@ -87,10 +92,11 @@ public class WriteDActivity extends BaseActivity {
     private String obs;
     private String water;
     private String weight;
-    private void LoadOrCreateEditingDayProduct() {
+    private void LoadOrCreateEditingDayProduct(final Date time) {
         ViewOnClickTask LoadOrCreateEditingDayProductTask = new ViewOnClickTask(this, "加载中...") {
             @Override
             protected void successUI() {
+                System.out.println("aaa+++++++++++"+rpcObj);
                 detailsList = rpcObj.getManyList("Details");
                 for (int i = 0; i < detailsList.size(); i++) {
                     if (detailsList.get(i).getLong("House_ID")!=null) {
@@ -146,7 +152,7 @@ public class WriteDActivity extends BaseActivity {
 
             @Override
             public Object call() throws Exception {
-                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.LoadOrCreateEditingDayProduct, new Object[]{null});
+                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.LoadOrCreateEditingDayProduct, time);
                 rpcObj = result.getRpcObject(RpcUrl.LoadOrCreateEditingDayProduct_fanhui);
                 return null;
             }
@@ -157,17 +163,15 @@ public class WriteDActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.save, menu);
+        getMenuInflater().inflate(R.menu.chosetime, menu);
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.save_info:
-
-                break;
-            case R.id.commit_info:
+            case R.id.chose_time:
+                new CalendarDialogFragment().show(getSupportFragmentManager(), "start");
                 break;
         }
         return super.onOptionsItemSelected(item);
@@ -195,6 +199,16 @@ public class WriteDActivity extends BaseActivity {
         mTabLayout.setupWithViewPager(mViewPager);
     }
 
+    @Override
+    public void onStartCalendarClick(Date date) {
+        LoadOrCreateEditingDayProduct(date);
+    }
+
+    @Override
+    public void onEndCalendarClick(Date date) {
+
+    }
+
 
     private class TabViewPagerAdapter extends FragmentPagerAdapter {
         public TabViewPagerAdapter(FragmentManager fm) {
diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java
index b00e626..1805822 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java
@@ -63,6 +63,16 @@ public class WriteDFragment extends BaseFragment {
     @Override
     protected void initData() {
         frag_death.setText(list.get(activity.mViewPager.getCurrentItem()).getSiwang());
+        frag_eliminate.setText(list.get(activity.mViewPager.getCurrentItem()).getTaotai());
+        frag_water.setText(list.get(activity.mViewPager.getCurrentItem()).getYinshuiliang());
+        frag_weight.setText(list.get(activity.mViewPager.getCurrentItem()).getTizhong());
+        frag_mint.setText(list.get(activity.mViewPager.getCurrentItem()).getZuidiwendu());
+        frag_maxt.setText(list.get(activity.mViewPager.getCurrentItem()).getZuigaowendu());
+        frag_minh.setText(list.get(activity.mViewPager.getCurrentItem()).getZuidishidu());
+        frag_maxh.setText(list.get(activity.mViewPager.getCurrentItem()).getZuigaoshidu());
+        frag_minw.setText(list.get(activity.mViewPager.getCurrentItem()).getZuixiaotongfeng());
+        frag_maxw.setText(list.get(activity.mViewPager.getCurrentItem()).getZuidatongfeng());
+        frag_pressure.setText(list.get(activity.mViewPager.getCurrentItem()).getFuya());
     }
 
     @Override
@@ -99,12 +109,26 @@ public class WriteDFragment extends BaseFragment {
 
                 System.out.println("aaa++++++-------------------");
                 System.out.println("aaa13++++++"+list.get(activity.mViewPager.getCurrentItem()).getHousename());
-
-
-
+                WriteBean writeBean = new WriteBean();
+                writeBean.setHouseid(list.get(activity.mViewPager.getCurrentItem()).getHouseid());
+                writeBean.setSiwang(siwang);
+                writeBean.setTaotai(taotai);
+                writeBean.setYinshuiliang(yinshuiliang);
+                writeBean.setTizhong(tizhong);
+                writeBean.setZuidiwendu(zuidiwendu);
+                writeBean.setZuigaowendu(zuigaowendu);
+                writeBean.setZuidishidu(zuidishidu);
+                writeBean.setZuigaoshidu(zuigaoshidu);
+                writeBean.setZuixiaotongfeng(zuixiaotongfeng);
+                writeBean.setZuidatongfeng(zuigaotongfeng);
+                writeBean.setFuya(fuya);
+                WriteDActivity.tijiaoList.add(writeBean);
 
                 if (activity.mViewPager.getCurrentItem()<(activity.mViewPager.getAdapter().getCount()-1)) {
                     activity.mViewPager.setCurrentItem(activity.mViewPager.getCurrentItem() + 1);
+
+                }else if (activity.mViewPager.getCurrentItem()== (activity.mViewPager.getAdapter().getCount()-1)){
+
                 }
 
             }
diff --git a/app/src/main/res/layout/frag_daily.xml b/app/src/main/res/layout/frag_daily.xml
index 8f77d1d..773c884 100644
--- a/app/src/main/res/layout/frag_daily.xml
+++ b/app/src/main/res/layout/frag_daily.xml
@@ -372,6 +372,7 @@
             <Button
                 android:id="@+id/frag_tijiao"
                 android:text="保存"
+                android:layout_margin="@dimen/dp_10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
         </LinearLayout>