diff --git a/app/src/main/java/com/qhclh/ytzh/bean/DailyDetailsBean.java b/app/src/main/java/com/qhclh/ytzh/bean/DailyDetailsBean.java index e82f81d..7e99029 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/DailyDetailsBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/DailyDetailsBean.java @@ -1,30 +1,20 @@ package com.qhclh.ytzh.bean; -import java.math.BigDecimal; - /** * Created by 青花瓷 on 2017/12/7. */ public class DailyDetailsBean { - private long House_ID; + private String House_ID; private String House_Name; - private int Days; - private int DieNumber; - private int Obsolete; - private BigDecimal WaterIntake; - private BigDecimal Weight; + private String Days; + private String DieNumber; + private String Obsolete; + private String WaterIntake; + private String Weight; private String mingxi; - public String getMingxi() { - return mingxi; - } - - public void setMingxi(String mingxi) { - this.mingxi = mingxi; - } - - public DailyDetailsBean(long house_ID, String house_Name, int days, int dieNumber, int obsolete, BigDecimal waterIntake, BigDecimal weight, String mingxi) { + public DailyDetailsBean(String house_ID, String house_Name, String days, String dieNumber, String obsolete, String waterIntake, String weight, String mingxi) { House_ID = house_ID; House_Name = house_Name; Days = days; @@ -35,21 +25,11 @@ public class DailyDetailsBean { this.mingxi = mingxi; } - public DailyDetailsBean(long house_ID, String house_Name, int days, int dieNumber, int obsolete, BigDecimal waterIntake, BigDecimal weight) { - House_ID = house_ID; - House_Name = house_Name; - Days = days; - DieNumber = dieNumber; - Obsolete = obsolete; - WaterIntake = waterIntake; - Weight = weight; - } - - public long getHouse_ID() { + public String getHouse_ID() { return House_ID; } - public void setHouse_ID(long house_ID) { + public void setHouse_ID(String house_ID) { House_ID = house_ID; } @@ -61,56 +41,64 @@ public class DailyDetailsBean { House_Name = house_Name; } - public int getDays() { + public String getDays() { return Days; } - public void setDays(int days) { + public void setDays(String days) { Days = days; } - public int getDieNumber() { + public String getDieNumber() { return DieNumber; } - public void setDieNumber(int dieNumber) { + public void setDieNumber(String dieNumber) { DieNumber = dieNumber; } - public int getObsolete() { + public String getObsolete() { return Obsolete; } - public void setObsolete(int obsolete) { + public void setObsolete(String obsolete) { Obsolete = obsolete; } - public BigDecimal getWaterIntake() { + public String getWaterIntake() { return WaterIntake; } - public void setWaterIntake(BigDecimal waterIntake) { + public void setWaterIntake(String waterIntake) { WaterIntake = waterIntake; } - public BigDecimal getWeight() { + public String getWeight() { return Weight; } - public void setWeight(BigDecimal weight) { + public void setWeight(String weight) { Weight = weight; } + public String getMingxi() { + return mingxi; + } + + public void setMingxi(String mingxi) { + this.mingxi = mingxi; + } + @Override public String toString() { return "DailyDetailsBean{" + - "House_ID=" + House_ID + + "House_ID='" + House_ID + '\'' + ", House_Name='" + House_Name + '\'' + - ", Days=" + Days + - ", DieNumber=" + DieNumber + - ", Obsolete=" + Obsolete + - ", WaterIntake=" + WaterIntake + - ", Weight=" + Weight + + ", Days='" + Days + '\'' + + ", DieNumber='" + DieNumber + '\'' + + ", Obsolete='" + Obsolete + '\'' + + ", WaterIntake='" + WaterIntake + '\'' + + ", Weight='" + Weight + '\'' + ", mingxi='" + mingxi + '\'' + '}'; } diff --git a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java index 7837f6a..e330491 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java +++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java @@ -20,6 +20,7 @@ public class RpcUrl { public static String DayProductRpc_Load = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Load"; public static String DayProductRpc_Update = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Update"; + public static String DayProductRpc_Update_canshu_fanhui = "/MainSystem/B3PoultryBreed/BO/DayProduct"; ///< 通用数据源接口 public static String GetChoiceBoxWords = "/MainSystem/System/UIRpcs/GetChoiceBoxWords"; @@ -34,4 +35,7 @@ public class RpcUrl { // 其中 // Item1:主键值 // Item2:显示名称 + + public static String LoadOrCreateEditingDayProduct = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/LoadOrCreateEditingDayProduct"; + public static String LoadOrCreateEditingDayProduct_fanhui = "/MainSystem/B3PoultryBreed/BO/DayProduct"; } diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/DailyDetailsAdapter.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/DailyDetailsAdapter.java index 3d302de..6f24e41 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/DailyDetailsAdapter.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/DailyDetailsAdapter.java @@ -44,7 +44,7 @@ public class DailyDetailsAdapter extends BaseAdapter { @Override public long getItemId(int i) { - return list.get(i).getHouse_ID(); + return Long.parseLong(list.get(i).getHouse_ID()); } @Override @@ -90,7 +90,7 @@ public class DailyDetailsAdapter extends BaseAdapter { public void afterTextChanged(Editable editable) { int temPosition = (int) finalViewHolder.dailyd_dayage.getTag(); try { - list.get(temPosition).setDays(Integer.parseInt(editable.toString())); + list.get(temPosition).setDays(editable.toString()); } catch (NumberFormatException e) { e.printStackTrace(); } @@ -118,7 +118,7 @@ public class DailyDetailsAdapter extends BaseAdapter { public void afterTextChanged(Editable editable) { int temPosition = (int) finalViewHolder.dailyd_death.getTag(); try { - list.get(temPosition).setDieNumber(Integer.parseInt(editable.toString())); + list.get(temPosition).setDieNumber(editable.toString()); } catch (NumberFormatException e) { e.printStackTrace(); } @@ -145,7 +145,7 @@ public class DailyDetailsAdapter extends BaseAdapter { public void afterTextChanged(Editable editable) { int temPosition = (int) finalViewHolder.dailyd_eliminate.getTag(); try { - list.get(temPosition).setObsolete(Integer.parseInt(editable.toString())); + list.get(temPosition).setObsolete(editable.toString()); } catch (NumberFormatException e) { e.printStackTrace(); } @@ -172,7 +172,7 @@ public class DailyDetailsAdapter extends BaseAdapter { public void afterTextChanged(Editable editable) { int temPosition = (int) finalViewHolder.dailyd_water.getTag(); try { - list.get(temPosition).setWaterIntake(new BigDecimal(editable.toString())); + list.get(temPosition).setWaterIntake(editable.toString()); } catch (NumberFormatException e) { e.printStackTrace(); } @@ -199,7 +199,7 @@ public class DailyDetailsAdapter extends BaseAdapter { public void afterTextChanged(Editable editable) { int temPosition = (int) finalViewHolder.dailyd_weight.getTag(); try { - list.get(temPosition).setWeight(new BigDecimal(editable.toString())); + list.get(temPosition).setWeight(editable.toString()); } catch (NumberFormatException e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WdailyActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WdailyActivity.java index 7686abf..e5c7ca9 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WdailyActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WdailyActivity.java @@ -4,10 +4,7 @@ import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; import android.widget.ListView; -import android.widget.Spinner; import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; @@ -55,12 +52,7 @@ public class WdailyActivity extends BaseActivity { @Override protected void initData() { - list=new ArrayList<>(); - for (int i=0;i<5;i++){ - list.add(new DailyDetailsBean(i,"aaa1"+i,i+1,i+2,i+3,new BigDecimal(i+4),new BigDecimal(i+5),"单据明细"+i)); - } - adapter = new DailyDetailsAdapter(this,list); - wdaily_lv.setAdapter(adapter); + list = new ArrayList<>(); } @Override @@ -71,6 +63,85 @@ public class WdailyActivity extends BaseActivity { @Override protected void onResume() { super.onResume(); + LoadOrCreateEditingDayProduct(); + } + + private RpcObject rpcObj; + + String houseid; + String housename; + String days; + String dienumber; + String obs; + String water; + String weight; + private void LoadOrCreateEditingDayProduct() { + ViewOnClickTask LoadOrCreateEditingDayProductTask = new ViewOnClickTask(this, "加载中...") { + @Override + protected void successUI() { + System.out.println("aaa++++++" + rpcObj); + List detailsList = rpcObj.getManyList("Details"); + for (int i = 0; i < detailsList.size(); i++) { + if (detailsList.get(i).getLong("House_ID")!=null) { + houseid = detailsList.get(i).getLong("House_ID")+""; + }else { + houseid = ""; + } + + if (detailsList.get(i).getString("House_Name")!=null) { + housename = detailsList.get(i).getString("House_Name"); + }else { + housename = ""; + } + + if (detailsList.get(i).getInt("Days")!=null) { + days = detailsList.get(i).getInt("Days")+""; + }else { + days = ""; + } + + if (detailsList.get(i).getInt("DieNumber")!=null) { + dienumber = detailsList.get(i).getInt("DieNumber")+""; + }else { + dienumber = ""; + } + + if (detailsList.get(i).getInt("Obsolete")!=null) { + obs = detailsList.get(i).getInt("Obsolete")+""; + }else { + obs = ""; + } + + if (detailsList.get(i).getDecimal("WaterIntake")!=null) { + water = detailsList.get(i).getDecimal("WaterIntake")+""; + }else { + water =""; + } + + if (detailsList.get(i).getDecimal("Weight")!=null) { + weight = detailsList.get(i).getDecimal("Weight")+""; + }else { + weight = ""; + } + list.add(new DailyDetailsBean(houseid, housename + , days, dienumber + , obs, water + , weight, "单据明细" + i+1)); + } + adapter = new DailyDetailsAdapter(WdailyActivity.this, list); + wdaily_lv.setAdapter(adapter); + + } + + @Override + public Object call() throws Exception { + JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.LoadOrCreateEditingDayProduct, new Object[]{null}); + rpcObj = result.getRpcObject(RpcUrl.LoadOrCreateEditingDayProduct_fanhui); + return null; + } + }; + LoadOrCreateEditingDayProductTask.execute(); + } @Override @@ -84,8 +155,13 @@ public class WdailyActivity extends BaseActivity { switch (item.getItemId()) { case R.id.commit_dailys: // System.out.println("aaa++++"+list.toString()); + commit(); break; } return super.onOptionsItemSelected(item); } + + private void commit() { + + } }