Skip to content

android / dayu

Go to a project
Commit 0937ab6a by mReturn
Options

收货页面添加货物数量及发货备注

parent db26bdf1
Inline Side-by-side
Showing with 64 additions and 4 deletions
orderCenter/src/main/java/com/dayu/order/api/protocol/bean/OrderPardDeatilBean.java
...@@ -45,6 +45,24 @@ public class OrderPardDeatilBean { ...@@ -45,6 +45,24 @@ public class OrderPardDeatilBean {
private String shipperCode; private String shipperCode;
private int status; private int status;
private List<PicsBean> pics; private List<PicsBean> pics;
private int sendNum = 1 ;
private String sendComment;
public int getSendNum() {
return sendNum;
}
public void setSendNum(int sendNum) {
this.sendNum = sendNum;
}
public String getSendComment() {
return sendComment;
}
public void setSendComment(String sendComment) {
this.sendComment = sendComment;
}
public String getComment() { public String getComment() {
return comment; return comment;
......
orderCenter/src/main/java/com/dayu/order/api/protocol/bean/OrderPartListBean.java
...@@ -46,7 +46,7 @@ public class OrderPartListBean implements Serializable { ...@@ -46,7 +46,7 @@ public class OrderPartListBean implements Serializable {
private int sendType; private int sendType;
private Object sparePartId; private Object sparePartId;
private String sparePartName; private String sparePartName;
private Object sendNum; private int sendNum = 1;
private int sendMode; private int sendMode;
private String receiverName; private String receiverName;
private String receiverMobile; private String receiverMobile;
...@@ -73,6 +73,15 @@ public class OrderPartListBean implements Serializable { ...@@ -73,6 +73,15 @@ public class OrderPartListBean implements Serializable {
private Object totalPrice; private Object totalPrice;
private String createTime; private String createTime;
private Object key; private Object key;
private String sendComment;
public String getSendComment() {
return sendComment;
}
public void setSendComment(String sendComment) {
this.sendComment = sendComment;
}
public int getId() { public int getId() {
return id; return id;
...@@ -122,11 +131,11 @@ public class OrderPartListBean implements Serializable { ...@@ -122,11 +131,11 @@ public class OrderPartListBean implements Serializable {
this.sparePartName = sparePartName; this.sparePartName = sparePartName;
} }
public Object getSendNum() { public int getSendNum() {
return sendNum; return sendNum;
} }
public void setSendNum(Object sendNum) { public void setSendNum(int sendNum) {
this.sendNum = sendNum; this.sendNum = sendNum;
} }
......
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java
...@@ -138,6 +138,12 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter, ...@@ -138,6 +138,12 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter,
mBind.tvName.setText(data.getReceiverName()); mBind.tvName.setText(data.getReceiverName());
mBind.tvPhone.setText(data.getReceiverMobile()); mBind.tvPhone.setText(data.getReceiverMobile());
mBind.tvList.setText(data.getSendItems()); mBind.tvList.setText(data.getSendItems());
mBind.tvSendNum.setText(data.getSendNum()+"");
if (TextUtils.isEmpty(data.getSendComment())){
mBind.tvSendComment.setText("暂无备注");
}else {
mBind.tvSendComment.setText(data.getSendComment());
}
} }
@Override @Override
...@@ -149,5 +155,12 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter, ...@@ -149,5 +155,12 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter,
mBind.tvName.setText(data.getReceiverName()); mBind.tvName.setText(data.getReceiverName());
mBind.tvPhone.setText(data.getReceiverMobile()); mBind.tvPhone.setText(data.getReceiverMobile());
mBind.tvList.setText(data.getSparePartName()); mBind.tvList.setText(data.getSparePartName());
mBind.tvSendNum.setText(data.getSendNum()+"");
if (TextUtils.isEmpty(data.getSendComment())){
mBind.tvSendComment.setText("暂无备注");
}else {
mBind.tvSendComment.setText(data.getSendComment());
}
} }
} }
orderCenter/src/main/res/layout/activity_order_part_receive.xml
...@@ -138,17 +138,37 @@ ...@@ -138,17 +138,37 @@
<TextView <TextView
style="@style/tv_course_left" style="@style/tv_course_left"
android:text="货物数量:" />
<TextView
android:id="@+id/tv_send_num"
style="@style/tv_part_content" />
</LinearLayout>
<LinearLayout style="@style/ll_part_content">
<TextView
style="@style/tv_course_left"
android:text="@string/part_goods_list" /> android:text="@string/part_goods_list" />
<TextView <TextView
android:id="@+id/tv_list" android:id="@+id/tv_list"
style="@style/tv_part_content" /> style="@style/tv_part_content" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/ll_part_content">
<TextView
style="@style/tv_course_left"
android:text="发货备注:" />
<TextView
android:id="@+id/tv_send_comment"
style="@style/tv_part_content" />
</LinearLayout>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="43dp" android:layout_height="43dp"
android:layout_marginTop="35dp" android:layout_marginTop="20dp"
android:background="@color/tv_bg" android:background="@color/tv_bg"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="@dimen/dp_15" android:paddingLeft="@dimen/dp_15"
......
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