Skip to content

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

1.往来 开收票 

2.//TODO erp用户激活测试，忘记/重置密码测试，往来（客户两个库），产品下单还差附件，mes，消息，刷新token
上级 fbed1703
显示空白字符变更
内嵌 并排
正在显示 包含 157 行增加 和 56 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 6699115f
......@@ -433,7 +433,7 @@
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkOpenTicketActivity"
android:name=".ui.activity.bat.work.WorkContactsOpenTicketActivity"
android:configChanges="keyboardHidden|orientation"
android:label="开票管理"
android:launchMode="singleTop"
......@@ -441,7 +441,7 @@
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkReceiveTicketActivity"
android:name=".ui.activity.bat.work.WorkContactsReceiveTicketActivity"
android:configChanges="keyboardHidden|orientation"
android:label="收票管理"
android:launchMode="singleTop"
......
app/src/main/java/com/wd/workoffice/bean/ContactsMoneyBean.java
浏览文件 @ 6699115f
......@@ -130,6 +130,15 @@ public class ContactsMoneyBean {
private Object type;
private Object deptIdList;
private String processCodeName;
private String receiveDeptName;
public String getReceiveDeptName() {
return receiveDeptName;
}
public void setReceiveDeptName(String receiveDeptName) {
this.receiveDeptName = receiveDeptName;
}
public int getCreatedBy() {
return createdBy;
......
app/src/main/java/com/wd/workoffice/bean/FlowBean.java
浏览文件 @ 6699115f
......@@ -154,6 +154,15 @@ public class FlowBean {
private String createdUser;
private String targetName;
private String sourceName;
private String causeText;
public String getCauseText() {
return causeText;
}
public void setCauseText(String causeText) {
this.causeText = causeText;
}
public String getTargetName() {
return targetName;
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 6699115f
......@@ -900,7 +900,28 @@ public interface ApiService {
*/
@GET("/finance-dept-ar-ap-part-detail/app/page/list")
Observable<BaseBean> contactsMoney(@QueryMap Map<String, Object> param);
/**
* 物流账单
* transitPartId
* type
* AR：应收 AP应付(String)
* searchValue
*
* @return
*/
@GET("/finance-logistics/page/list")
Observable<BaseBean> contactsMoneyLogistic(@QueryMap Map<String, Object> param);
/**
* 物流账单
* transitPartId
* type
* AR：应收 AP应付(String)
* searchValue
*
* @return
*/
@GET("/finance-logistics-flow/page/list")
Observable<BaseBean> contactsMoneyLogisticFlow(@QueryMap Map<String, Object> param);
/**
* 部门应收应付账款流水
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsDetailActivity.java
浏览文件 @ 6699115f
......@@ -90,11 +90,10 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity {
case R.id.ll_settle:
break;
case R.id.ll_receive_ticket:
startActivity(WorkReceiveTicketActivity.class, "id", getIntent().getStringExtra("id"));
startActivity(WorkContactsReceiveTicketActivity.class, "id", getIntent().getStringExtra("id"));
break;
case R.id.ll_open_ticket:
startActivity(WorkOpenTicketActivity.class, "id", getIntent().getStringExtra("id"));
startActivity(WorkContactsOpenTicketActivity.class, "id", getIntent().getStringExtra("id"));
break;
case R.id.ll_order:
break;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsMoneyActivity.java
浏览文件 @ 6699115f
......@@ -17,6 +17,7 @@ import com.wd.workoffice.bean.ContactsMoneyBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ContactsGetMoneyAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -29,6 +30,7 @@ import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
......@@ -74,23 +76,36 @@ public class WorkContactsMoneyActivity extends WorkToolBarActivity {
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
param.put("transitPartId", getIntent().getStringExtra("id"));
// param.put("financeDeptArApPartId", getIntent().getStringExtra("id"));
if (TextUtils.equals("1", type)) {
param.put("type", "AR");//AR：应收 AP应付(String)
param.put("transitPartId", getIntent().getStringExtra("id"));
} else if (TextUtils.equals("2", type)) {
param.put("type", "AP");
param.put("transitPartId", getIntent().getStringExtra("id"));
tvGet.setText("应付款(万)");
setTitle("应付账款");
} else {//3
param.put("type", "AP");
tvDep.setVisibility(View.GONE);
tvDep.setVisibility(View.VISIBLE);
tvGet.setText("应付款(万)");
param.put("type", "AP");
param.put("logisticsId", getIntent().getStringExtra("id"));
param.put("receiveDeptId", UserKeeper.getInstance().getUserDepId());
setTitle("应付账款");
}
param.put("current", page);
getData();
}
private void getData() {
RtfUtils.getRtf().contactsMoney(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (TextUtils.equals("3", type)) {
observable = RtfUtils.getRtf().contactsMoneyLogistic(param);
} else {
observable = RtfUtils.getRtf().contactsMoney(param);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -150,7 +165,8 @@ public class WorkContactsMoneyActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkContactsMoneyFlowActivity.class, "id", dataList.get(position).getId() + "");
startActivity(WorkContactsMoneyFlowActivity.class, "type", type,
"id", dataList.get(position).getId() + "");
}
});
}
......@@ -160,11 +176,4 @@ public class WorkContactsMoneyActivity extends WorkToolBarActivity {
return R.layout.activity_contacts_get_money;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsMoneyFlowActivity.java
浏览文件 @ 6699115f
package com.wd.workoffice.ui.activity.bat.work;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
......@@ -30,6 +31,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
......@@ -60,18 +62,26 @@ public class WorkContactsMoneyFlowActivity extends WorkToolBarActivity {
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new ContactsMoneyFlowAdapter(R.layout.item_work_flow, clientList);
clientAdapter = new ContactsMoneyFlowAdapter(R.layout.item_work_flow, clientList, Integer.valueOf(getIntent().getStringExtra("type")));
clientAdapter.bindToRecyclerView(rvData);
clientAdapter.setEmptyView(R.layout.view_empty_content,rvData);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
param.put("financeDeptArApPartDetailId", getIntent().getStringExtra("id"));
page = 1;
param.put("current", page);
getData();
}
private void getData() {
RtfUtils.getRtf().contactsMoneyFlow(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (TextUtils.equals("3", getIntent().getStringExtra("type"))) {
observable = RtfUtils.getRtf().contactsMoneyLogisticFlow(param);
param.put("financeLogisticsId", getIntent().getStringExtra("id"));
} else {
observable = RtfUtils.getRtf().contactsMoneyFlow(param);
param.put("financeDeptArApPartDetailId", getIntent().getStringExtra("id"));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -121,7 +131,7 @@ public class WorkContactsMoneyFlowActivity extends WorkToolBarActivity {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkContactsMoneyFlowDetailActivity.class,"detail",JSON.toJSONString(clientList.get(position)));
startActivity(WorkContactsMoneyFlowDetailActivity.class, "type",getIntent().getStringExtra("type"), "detail", JSON.toJSONString(clientList.get(position)));
}
});
}
......@@ -140,7 +150,7 @@ public class WorkContactsMoneyFlowActivity extends WorkToolBarActivity {
@Override
public void onTimeSelect(Date date, View v) {
String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd"));
param.put("searchStartTime",time+ " 00:00:00");
param.put("searchStartTime", time + " 00:00:00");
tvStart.setText(time);
page = 1;
param.put("current", page);
......@@ -153,7 +163,7 @@ public class WorkContactsMoneyFlowActivity extends WorkToolBarActivity {
@Override
public void onTimeSelect(Date date, View v) {
String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd"));
param.put("searchEndTime", time+ " 23:59:59");
param.put("searchEndTime", time + " 23:59:59");
tvEnd.setText(time);
page = 1;
param.put("current", page);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsMoneyFlowDetailActivity.java
浏览文件 @ 6699115f
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
......@@ -35,6 +38,14 @@ public class WorkContactsMoneyFlowDetailActivity extends WorkToolBarActivity {
TextView tvTime;
@BindView(R.id.tv_desc)
TextView tvDesc;
@BindView(R.id.rl_show_type)
RelativeLayout rlShowType;
@BindView(R.id.rl_id)
RelativeLayout rlId;
@BindView(R.id.rl_from_account)
RelativeLayout rlFromAccount;
@BindView(R.id.rl_to_account)
RelativeLayout rlToAccount;
private FlowBean.RecordsBean dataBean;
@Override
......@@ -49,6 +60,12 @@ public class WorkContactsMoneyFlowDetailActivity extends WorkToolBarActivity {
tvDesc.setText(dataBean.getRemark());
tvOperating.setText(dataBean.getCreatedUser());
tvTime.setText(dataBean.getCreatedTime());
if (TextUtils.equals(getIntent().getStringExtra("type"), "3")) {
rlShowType.setVisibility(View.GONE);
rlToAccount.setVisibility(View.GONE);
rlFromAccount.setVisibility(View.GONE);
rlId.setVisibility(View.GONE);
}
}
@Override
......@@ -65,10 +82,4 @@ public class WorkContactsMoneyFlowDetailActivity extends WorkToolBarActivity {
return R.layout.activity_contacts_flow_detail;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkOpenTicketActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsOpenTicketActivity.java
浏览文件 @ 6699115f
package com.wd.workoffice.ui.activity.bat.work;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
......@@ -33,7 +35,7 @@ import io.reactivex.disposables.Disposable;
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkOpenTicketActivity extends WorkToolBarActivity {
public class WorkContactsOpenTicketActivity extends WorkToolBarActivity {
@BindView(R.id.rv_data)
RecyclerView rvData;
......@@ -58,8 +60,8 @@ public class WorkOpenTicketActivity extends WorkToolBarActivity {
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
param.put("deptId", getIntent().getStringExtra("id"));
param.put("customerId", UserKeeper.getInstance().getUserId());
param.put("deptId", UserKeeper.getInstance().getUserDepId());
param.put("customerId", getIntent().getStringExtra("id"));
param.put("current", page);
getData();
}
......@@ -123,6 +125,13 @@ public class WorkOpenTicketActivity extends WorkToolBarActivity {
getData();
}
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialTicketDetailActivity.class, "type","contacts", "info", JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkReceiveTicketActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsReceiveTicketActivity.java
浏览文件 @ 6699115f
package com.wd.workoffice.ui.activity.bat.work;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
......@@ -34,7 +36,7 @@ import io.reactivex.disposables.Disposable;
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkReceiveTicketActivity extends WorkToolBarActivity {
public class WorkContactsReceiveTicketActivity extends WorkToolBarActivity {
@BindView(R.id.rv_data)
RecyclerView rvData;
......@@ -124,6 +126,13 @@ public class WorkReceiveTicketActivity extends WorkToolBarActivity {
getData();
}
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialReceiveTicketDetailActivity.class,"type","contacts", "info", JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialTicketDetailActivity.java
浏览文件 @ 6699115f
......@@ -94,6 +94,9 @@ public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity {
param = new HashMap<>();
param.put("id", info.getId());
orderType = getIntent().getStringExtra("type");
if (TextUtils.equals("contacts",orderType)){
llBottom.setVisibility(View.GONE);
}
}
private void getData(String id) {
......
app/src/main/java/com/wd/workoffice/ui/adapter/ContactsGetMoneyAdapter.java
浏览文件 @ 6699115f
......@@ -7,6 +7,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.bean.ClientBean;
import com.wd.workoffice.bean.ContactsMoneyBean;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
......@@ -30,12 +31,16 @@ public class ContactsGetMoneyAdapter extends BaseQuickAdapter<ContactsMoneyBean.
@Override
protected void convert(BaseViewHolder helper, ContactsMoneyBean.RecordsBean item) {
helper.setText(R.id.tv_process, item.getProcessCodeName());
helper.setText(R.id.tv_get, MathUtils.divide(String.valueOf(item.getExpectAmount()), "10000", 4));
helper.setText(R.id.tv_apply, MathUtils.divide(String.valueOf(item.getApplyAmount()), "10000", 4));
helper.setText(R.id.tv_back, MathUtils.divide(String.valueOf(item.getFinishAmount()), "10000", 4));
if (type == 3) {
helper.setVisible(R.id.tv_dep, true);
helper.setText(R.id.tv_process, WorkUtils.getOrderName(item.getProcessCode()));
helper.setText(R.id.tv_dep, item.getReceiveDeptName());
}else {
helper.setText(R.id.tv_process, item.getProcessCodeName());
}
}
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/ContactsMoneyFlowAdapter.java
浏览文件 @ 6699115f
......@@ -8,16 +8,23 @@ import com.wd.workoffice.bean.FlowBean;
import java.util.List;
import androidx.annotation.Nullable;
/**
* Created by flexible on 2018/8/13.
*/
public class ContactsMoneyFlowAdapter extends BaseQuickAdapter<FlowBean.RecordsBean, BaseViewHolder> {
int type;
public ContactsMoneyFlowAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
public ContactsMoneyFlowAdapter(int layoutResId, @Nullable List<FlowBean.RecordsBean> data, int type) {
super(layoutResId, data);
this.type = type;
}
@Override
protected void convert(BaseViewHolder helper, FlowBean.RecordsBean item) {
......@@ -25,6 +32,9 @@ public class ContactsMoneyFlowAdapter extends BaseQuickAdapter<FlowBean.RecordsB
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_desc, item.getLinkSerialNumber());
helper.setText(R.id.tv_dep, item.getInvoiceTypeName());
if (type == 3) {
helper.setText(R.id.tv_desc, item.getCauseText());
}
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkTicketAdapter.java
浏览文件 @ 6699115f
......@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
......@@ -27,6 +28,7 @@ public class WorkTicketAdapter extends BaseQuickAdapter<TicketBean.RecordsBean,
helper.setText(R.id.tv_person, item.getApplierName());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_all_price, String.valueOf(item.getInvoiceSum()));
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
}
}
app/src/main/res/layout/activity_contacts_flow_detail.xml
浏览文件 @ 6699115f
......@@ -9,6 +9,7 @@
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_show_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -35,6 +36,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -88,9 +90,8 @@
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_from_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -118,6 +119,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_to_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -142,13 +144,6 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<View style="@style/dividerX" />
......
app/src/main/res/layout/activity_contacts_get_money.xml
浏览文件 @ 6699115f
......@@ -26,7 +26,7 @@
android:text="接单部门"
android:visibility="gone"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/tv_process"
......@@ -36,7 +36,7 @@
android:gravity="center"
android:text="所属流程"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/tv_get"
......@@ -46,7 +46,7 @@
android:gravity="center"
android:text="应收款(万)"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/tv_apply"
......@@ -56,7 +56,7 @@
android:gravity="center"
android:text="申请中(万)"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/tv_back"
......@@ -66,7 +66,7 @@
android:gravity="center"
android:text="已回款(万)"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<ImageView
......
app/src/main/res/layout/activity_work_account_flow.xml
浏览文件 @ 6699115f
......@@ -44,7 +44,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="10mm"
android:background="@android:color/white" />
</LinearLayout>
......
app/src/main/res/layout/item_contacts_get_money.xml
浏览文件 @ 6699115f
......@@ -15,7 +15,7 @@
android:gravity="center"
android:text="接单部门"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp"
android:textSize="11sp"
android:visibility="gone" />
<TextView
......@@ -27,7 +27,7 @@
android:gravity="center"
android:text="所属流程"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/tv_get"
......@@ -37,7 +37,7 @@
android:gravity="center"
android:text="应收款(万)"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/tv_apply"
......@@ -47,7 +47,7 @@
android:gravity="center"
android:text="申请中(万)"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/tv_back"
......@@ -57,7 +57,7 @@
android:gravity="center"
android:text="已回款(万)"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="11sp" />
<ImageView
android:layout_width="15mm"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论