Commit 995ec248 by mReturn

工单收发货显示具体时间

parent 398a05f3
...@@ -167,8 +167,12 @@ public class Api { ...@@ -167,8 +167,12 @@ public class Api {
} }
} else { } else {
if (!e.isDisposed()) { if (!e.isDisposed()) {
if (response.getSubCode() == null){
e.onError(new ServerException("", response.getMsg()));
}else if (response.getSubCode() instanceof String){
e.onError(new ServerException(response.getSubCode(), response.getMsg())); e.onError(new ServerException(response.getSubCode(), response.getMsg()));
} }
}
return; return;
} }
if (!e.isDisposed()) { if (!e.isDisposed()) {
......
...@@ -65,6 +65,25 @@ public class Order implements Serializable{ ...@@ -65,6 +65,25 @@ public class Order implements Serializable{
private int createProviderId; private int createProviderId;
private int alerted; //2开启预警 1或者空为未开启预警 private int alerted; //2开启预警 1或者空为未开启预警
private double latitude;
private double longitude;
public double getLatitude() {
return latitude;
}
public void setLatitude(double latitude) {
this.latitude = latitude;
}
public double getLongitude() {
return longitude;
}
public void setLongitude(double longitude) {
this.longitude = longitude;
}
public int getAlerted() { public int getAlerted() {
return alerted; return alerted;
} }
......
...@@ -28,7 +28,8 @@ public class OrderPartListAdapter extends CoreAdapter<OrderPartListBean,ItemOrde ...@@ -28,7 +28,8 @@ public class OrderPartListAdapter extends CoreAdapter<OrderPartListBean,ItemOrde
if (item.getStatus()>1){ if (item.getStatus()>1){
holder.tvCode.setText(item.getSendCourierNumber()); holder.tvCode.setText(item.getSendCourierNumber());
holder.tvCompany.setText(item.getSendCourierCompany()); holder.tvCompany.setText(item.getSendCourierCompany());
holder.tvDate.setText(CommonUtils.getYearData(item.getSendTime())); // holder.tvDate.setText(CommonUtils.getYearData(item.getSendTime()));
holder.tvDate.setText(item.getSendTime());
holder.btnStatus.setVisibility(View.VISIBLE); holder.btnStatus.setVisibility(View.VISIBLE);
holder.ivToBeSend.setVisibility(View.GONE); holder.ivToBeSend.setVisibility(View.GONE);
holder.btnStatus.setText(item.getStatus() == 2?R.string.to_be_received_goods:R.string.already_received_goods); holder.btnStatus.setText(item.getStatus() == 2?R.string.to_be_received_goods:R.string.already_received_goods);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment