Skip to content

W
workoffice
提交 c583000d authored 作者: lgd's avatar lgd
浏览文件
操作

1.发货申请详情参数 

2.//TODO erp用户激活测试，忘记/重置密码测试，领用申请列表参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，消息，刷新token
上级 9743c0b6
隐藏空白字符变更
内嵌 并排
正在显示 包含 135 行增加 和 22 行删除
app/src/main/java/com/wd/workoffice/bean/SendApplyBean.java
浏览文件 @ c583000d
......@@ -119,9 +119,9 @@ public class SendApplyBean {
private Object createdBy;
private Object createdByName;
private String createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private String updatedBy;
private String updatedByName;
private String updatedTime;
private Object commenceFromId;
private Object createdType;
private int id;
......@@ -129,7 +129,7 @@ public class SendApplyBean {
private String orderType;
private String status;
private String applyRemark;
private Object auditRemark;
private String auditRemark;
private String serialNumber;
private Object deptIdList;
private Object ownId;
......@@ -140,7 +140,7 @@ public class SendApplyBean {
private String payer;
private Object sendOutStoreApplyItemList;
private String createdUser;
private Object updatedUser;
private String updatedUser;
private String transitPartName;
private Object customerName;
private Object stockName;
......@@ -174,23 +174,23 @@ public class SendApplyBean {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
public void setUpdatedBy(String updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
public String getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
public void setUpdatedByName(String updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
public String getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
......@@ -250,11 +250,11 @@ public class SendApplyBean {
this.applyRemark = applyRemark;
}
public Object getAuditRemark() {
public String getAuditRemark() {
return auditRemark;
}
public void setAuditRemark(Object auditRemark) {
public void setAuditRemark(String auditRemark) {
this.auditRemark = auditRemark;
}
......@@ -338,11 +338,11 @@ public class SendApplyBean {
this.createdUser = createdUser;
}
public Object getUpdatedUser() {
public String getUpdatedUser() {
return updatedUser;
}
public void setUpdatedUser(Object updatedUser) {
public void setUpdatedUser(String updatedUser) {
this.updatedUser = updatedUser;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyDetailActivity.java
浏览文件 @ c583000d
......@@ -16,14 +16,10 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.SendApplyBean;
import com.wd.workoffice.bean.SendApplyDetailBean;
import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.bean.TicketDetailBean;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.SendApplyDetailAdapter;
import com.wd.workoffice.ui.adapter.WorkFinancialTicketDetailAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -40,7 +36,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
......@@ -70,6 +65,14 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
TextView tvLogisticsCompany;
@BindView(R.id.tv_remark)
TextView tvRemark;
@BindView(R.id.tv_check_person)
TextView tvCheckPerson;
@BindView(R.id.tv_check_time)
TextView tvCheckTime;
@BindView(R.id.tv_check_remark)
TextView tvCheckRemark;
@BindView(R.id.ll_check)
LinearLayout llCheck;
private List<SendApplyDetailBean> dataList;
private SendApplyDetailAdapter dataAdapter;
private Map<String, Object> param;
......@@ -93,8 +96,13 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
tvRemark.setText(info.getApplyRemark());
if (TextUtils.equals(info.getStatus(), "0")) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE);
} else {
llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.VISIBLE);
tvCheckPerson.setText(info.getUpdatedUser());
tvCheckTime.setText(info.getUpdatedTime());
tvCheckRemark.setText(info.getAuditRemark());
}
dataList = new ArrayList<>();
dataAdapter = new SendApplyDetailAdapter(R.layout.item_send_apply_detail, dataList);
......@@ -204,7 +212,7 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
private void check(int status, String remark) {
param.put("status", status);
param.put("auditRemark", remark);
param.put("id",info.getId());
param.put("id", info.getId());
RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
......@@ -229,5 +237,4 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
}
});
}
}
app/src/main/res/layout/activity_send_apply_detail.xml
浏览文件 @ c583000d
......@@ -50,6 +50,7 @@
android:paddingBottom="20mm">
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -147,6 +148,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -170,7 +172,9 @@
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -193,7 +197,10 @@
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout> <View style="@style/dividerX" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -217,6 +224,7 @@
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
......@@ -242,8 +250,106 @@
android:layout_marginTop="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
android:id="@+id/ll_check"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="发货信息"
android:textSize="15sp" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核人"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_check_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核时间"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_check_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核备注"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_check_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="15sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论