diff --git a/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyDetailBean.java b/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyDetailBean.java index 3065a75..93b7da8 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyDetailBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/ProductionDailyDetailBean.java @@ -1,5 +1,7 @@ package com.qhclh.ytzh.bean; +import java.math.BigDecimal; + /** * Created by 青花瓷 on 2017/12/5. */ @@ -8,11 +10,11 @@ public class ProductionDailyDetailBean { private long House_ID; private String House_Name; private int Days; - private double cunhuolv; + private BigDecimal cunhuolv; private int DieNumber; private int Obsolete; - private double WaterIntake; - private double Weight; + private BigDecimal WaterIntake; + private BigDecimal Weight; // public ProductionDailyDetailBean(long house_ID, String house_Name, int days, double cunhuolv, int dieNumber, int obsolete, double waterIntake, double weight) { @@ -50,11 +52,11 @@ public class ProductionDailyDetailBean { Days = days; } - public double getCunhuolv() { + public BigDecimal getCunhuolv() { return cunhuolv; } - public void setCunhuolv(double cunhuolv) { + public void setCunhuolv(BigDecimal cunhuolv) { this.cunhuolv = cunhuolv; } @@ -74,19 +76,19 @@ public class ProductionDailyDetailBean { Obsolete = obsolete; } - public double getWaterIntake() { + public BigDecimal getWaterIntake() { return WaterIntake; } - public void setWaterIntake(double waterIntake) { + public void setWaterIntake(BigDecimal waterIntake) { WaterIntake = waterIntake; } - public double getWeight() { + public BigDecimal getWeight() { return Weight; } - public void setWeight(double weight) { + public void setWeight(BigDecimal weight) { Weight = weight; } 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 2d45281..7837f6a 100644 --- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java +++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java @@ -15,6 +15,8 @@ public class RpcUrl { public static String DayProductRpc_New = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/New"; public static String DayProductRpc_Insert = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Insert"; + public static String DayProductRpc_Insert_canshufanhui = "/MainSystem/B3PoultryBreed/BO/DayProduct"; + public static String DayProductRpc_Insert_detail = "/MainSystem/B3PoultryBreed/BO/DayProduct_Detail"; public static String DayProductRpc_Load = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Load"; public static String DayProductRpc_Update = "/MainSystem/B3_ZhongHui/Rpcs/DayProductRpc/Update"; 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 c38a045..596d849 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 @@ -82,31 +82,11 @@ public class ProductiondailyActivity extends BaseActivity implements CalendarDia @Override protected void onResume() { super.onResume(); -// DayProductRpcNew(); + page =0; DayProductRpcQuery(); } - private void DayProductRpcNew() { - ViewOnClickTask DayProductRpcNewTask = new ViewOnClickTask(this,"加载中...") { - RpcObject rpcobj; - - @Override - protected void successUI() { - - } - - @Override - public Object call() throws Exception { - - JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.DayProductRpc_New); - rpcobj = result.getRpcObject(RpcUrl.DayProductRpc_Query_fanhui); - return null; - } - }; - DayProductRpcNewTask.execute(); - } - private void DayProductRpcQuery() { ViewOnClickTask DayProductRpcQueryTask = new ViewOnClickTask(this,"加载中...") { List rpcobj; diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyInfoActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyInfoActivity.java index 035e158..6469bb4 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyInfoActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ProductiondailyInfoActivity.java @@ -16,6 +16,7 @@ import org.forks.jsonrpc.JsonRpcResult; import org.forks.jsonrpc.RpcFacade; import org.forks.jsonrpc.RpcObject; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -103,7 +104,7 @@ public class ProductiondailyInfoActivity extends BaseActivity { }else { productionDailyDetailBean.setDays(-1000); } - productionDailyDetailBean.setCunhuolv(0); + productionDailyDetailBean.setCunhuolv(new BigDecimal("0")); if (rpcObjectList.get(i).getInt("DieNumber")!=null){ productionDailyDetailBean.setDieNumber(rpcObjectList.get(i).getInt("DieNumber")); }else { @@ -115,14 +116,14 @@ public class ProductiondailyInfoActivity extends BaseActivity { productionDailyDetailBean.setObsolete(-1000); } if (rpcObjectList.get(i).getDecimal("WaterIntake")!=null){ - productionDailyDetailBean.setWaterIntake(rpcObjectList.get(i).getDecimal("WaterIntake").doubleValue()); + productionDailyDetailBean.setWaterIntake(rpcObjectList.get(i).getDecimal("WaterIntake")); }else { - productionDailyDetailBean.setWaterIntake(-1000); + productionDailyDetailBean.setWaterIntake(new BigDecimal(-1000)); } if (rpcObjectList.get(i).getDecimal("Weight")!=null){ - productionDailyDetailBean.setWeight(rpcObjectList.get(i).getDecimal("Weight").doubleValue()); + productionDailyDetailBean.setWeight(rpcObjectList.get(i).getDecimal("Weight")); }else { - productionDailyDetailBean.setWeight(-1000); + productionDailyDetailBean.setWeight(new BigDecimal(-1000)); } productionDailyDetailBeanList.add(productionDailyDetailBean); } diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/ProductiondailywActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/ProductiondailywActivity.java index 43a31a8..e88ef0e 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/ProductiondailywActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/ProductiondailywActivity.java @@ -12,9 +12,16 @@ import android.view.View; import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; +import com.qhclh.ytzh.bean.ProductionDailyDetailBean; +import com.qhclh.ytzh.home.RpcUrl; +import com.qhclh.ytzh.tasks.ViewOnClickTask; import com.qhclh.ytzh.ui.CalendarDialogFragment; import com.qhclh.ytzh.utils.DateTimeUtil; +import org.forks.jsonrpc.JsonRpcResult; +import org.forks.jsonrpc.RpcFacade; +import org.forks.jsonrpc.RpcObject; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -139,6 +146,8 @@ public class ProductiondailywActivity extends BaseActivity implements CalendarDi this.weight = weight; } + private List productionList; + @Override protected int setLayoutId() { return R.layout.act_productiondailyw; @@ -158,7 +167,7 @@ public class ProductiondailywActivity extends BaseActivity implements CalendarDi @Override protected void initData() { - + productionList = new ArrayList<>(); } @Override @@ -222,10 +231,16 @@ public class ProductiondailywActivity extends BaseActivity implements CalendarDi } } + @Override + protected void onResume() { + super.onResume(); + DayProductRpcNew(); + } + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.save, menu); - menu.findItem(R.id.save_info).setVisible(true); +// menu.findItem(R.id.save_info).setVisible(true); return true; } @@ -233,19 +248,94 @@ public class ProductiondailywActivity extends BaseActivity implements CalendarDi public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.save_info: - System.out.println("aaa1--"+getFarmId()); - System.out.println("aaa2---"+getBatchId()); - System.out.println("aaa3---"+getAccountId()); - System.out.println("aaa4---"+getTime()); - System.out.println("aaa5---"+getHouseid()); - System.out.println("aaa6---"+getDays()); - System.out.println("aaa7---"+getCunhuolv()); - System.out.println("aaa8---"+getDienum()); - System.out.println("aaa9---"+getTaotai()); - System.out.println("aaa10---"+getWater()); - System.out.println("aaa11---"+getWeight()); +// System.out.println("aaa1--"+getFarmId()); +// System.out.println("aaa2---"+getBatchId()); +// System.out.println("aaa3---"+getAccountId()); +// System.out.println("aaa4---"+getTime()); +// System.out.println("aaa5---"+getHouseid()); +// System.out.println("aaa6---"+getDays()); +// System.out.println("aaa7---"+getCunhuolv()); +// System.out.println("aaa8---"+getDienum()); +// System.out.println("aaa9---"+getTaotai()); +// System.out.println("aaa10---"+getWater()); +// System.out.println("aaa11---"+getWeight()); + + ProductionDailyDetailBean productionBean = new ProductionDailyDetailBean(); + productionBean.setHouse_ID(getHouseid()); + productionBean.setDays(getDays()); + productionBean.setCunhuolv(getCunhuolv()); + productionBean.setDieNumber(getDienum()); + productionBean.setObsolete(getTaotai()); + productionBean.setWaterIntake(getWater()); + productionBean.setWeight(getWeight()); + productionList.add(productionBean); + showToast("保存一条明细成功"); + break; + case R.id.commit_info: + DayProductRpcInsert(); break; } return super.onOptionsItemSelected(item); } + + + + RpcObject bill; + + private void DayProductRpcNew() { + ViewOnClickTask DayProductRpcNewTask = new ViewOnClickTask(this,"加载中...") { + @Override + protected void successUI() { + } + + @Override + public Object call() throws Exception { + + JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.DayProductRpc_New); + bill = result.getRpcObject(RpcUrl.DayProductRpc_Query_fanhui); + return null; + } + }; + DayProductRpcNewTask.execute(); + } + + private void DayProductRpcInsert() { + ViewOnClickTask DayProductRpcInsertTask = new ViewOnClickTask(this,"加载中...") { + RpcObject rpcobj; + + @Override + protected void successUI() { + showToast("提交成功"); + finish(); + } + + @Override + public Object call() throws Exception { + ///< 带多样参数的集合 + RpcObject parmObject = bill; + parmObject.setLong("BreedFactory_ID",getFarmId()); + parmObject.setLong("Batch_ID",getBatchId()); + parmObject.setLong("AccountingUnit_ID",getAccountId()); + parmObject.setDate("Date",getTime()); + + for (int i=0;i + app:showAsAction="never" /> + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 30b153e..34526b0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -68,6 +68,7 @@ 基本属性 单据明细 保存 + 提交 会计单位: 存活率: 淘汰: