diff --git a/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java b/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java index f804618..3618241 100644 --- a/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java +++ b/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java @@ -91,7 +91,7 @@ public final class DateTimeUtil { return str; } public static String getYMD4(Date string) { - SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd HH:mm"); String str = formatter.format(string); return str; } diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java b/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java index 5615366..bea0cf0 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java @@ -82,6 +82,7 @@ public class FumudaiScanResultActivity extends BaseActivity { } private RpcObject rpcObj; + private long id; private void getactive() { ViewOnClickTask getactiveTask = new ViewOnClickTask(this,"加载中...") { @@ -162,6 +163,43 @@ public class FumudaiScanResultActivity extends BaseActivity { } private void ArriveBreedFactory() { + ViewOnClickTask arriveTask = new ViewOnClickTask(this,"加载中...") { + @Override + protected void successUI() { + System.out.println("aaa++++arrive++++"+rpcObj); + ScanBean scanBean = new ScanBean(); + scanBean.setId(rpcObj.getLong("ID")); + scanBean.setInfos_carname(rpcObj.getString("Car_Name")); + scanBean.setInfos_driver(rpcObj.getString("Employee_Name")); + scanBean.setInfos_fuhuachang(rpcObj.getString("Hatchery_Name")); + scanBean.setInfos_yangzhichang(rpcObj.getString("BreedFactory_Name")); + scanBean.setInfos_leavetime(DateTimeUtil.getYMD4(rpcObj.getDate("LeaveHatcheryTime"))); + if (rpcObj.getDate("ArriveBreedFactoryTime")!=null) { + scanBean.setInfos_daodashijian(DateTimeUtil.getYMD4(rpcObj.getDate("ArriveBreedFactoryTime"))); + }else { + scanBean.setInfos_daodashijian(""); + } + + if (rpcObj.getString("Employee_HandPhone")!=null) { + scanBean.setInfos_phone(rpcObj.getString("Employee_HandPhone")); + }else { + scanBean.setInfos_phone(""); + } + scanBeanList.clear(); + scanBeanList.add(scanBean); + + scanAdapter = new ScanAdapter(FumudaiScanResultActivity.this,scanBeanList); + fumudai_lv_infos.setAdapter(scanAdapter); + } + + @Override + public Object call() throws Exception { + JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.ChickTransportLogRpc_ArriveBreedFactory,rpcObj.getLong("ID"),scanStr); + rpcObj = result.getRpcObject(RpcUrl.ChickTransportLogRpc_fanhui); + return null; + } + }; + arriveTask.execute(); } private void LeaveHatchery() { @@ -178,8 +216,16 @@ public class FumudaiScanResultActivity extends BaseActivity { scanBean.setInfos_leavetime(DateTimeUtil.getYMD4(rpcObj.getDate("LeaveHatcheryTime"))); if (rpcObj.getDate("ArriveBreedFactoryTime")!=null) { scanBean.setInfos_daodashijian(DateTimeUtil.getYMD4(rpcObj.getDate("ArriveBreedFactoryTime"))); + }else { + scanBean.setInfos_daodashijian(""); + } + + if (rpcObj.getString("Employee_HandPhone")!=null) { + scanBean.setInfos_phone(rpcObj.getString("Employee_HandPhone")); + }else { + scanBean.setInfos_phone(""); } - scanBean.setInfos_phone(rpcObj.getString("Employee_HandPhone")); + scanBeanList.clear(); scanBeanList.add(scanBean); scanAdapter = new ScanAdapter(FumudaiScanResultActivity.this,scanBeanList);