Skip to content

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

1.物流列表 

2.//TODO erp用户激活测试，忘记/重置密码测试，产品下单还差附件，bat，mes，消息，刷新token，开票/收票接口
上级 2b555dd1
隐藏空白字符变更
内嵌 并排
正在显示 包含 285 行增加 和 12 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 6dc0373f
...@@ -473,13 +473,53 @@ public interface ApiService { ...@@ -473,13 +473,53 @@ public interface ApiService {
Observable<BaseBean> openTicket(@QueryMap Map<String, Object> param); Observable<BaseBean> openTicket(@QueryMap Map<String, Object> param);
/** /**
* app端从往来单位进入查看开票单 * /销售订单开票
*
* @return
*/
@GET("/invoiceApply/so/page/list")
Observable<BaseBean> openSoTicket(@QueryMap Map<String, Object> param);
/**
* 组装订单开票申请分页列表
*
* @return
*/
@GET("/invoiceApply/ao/page/list")
Observable<BaseBean> openAoTicket(@QueryMap Map<String, Object> param);
/**
* 外采购订单开票申请分页列表
*
* @return
*/
@GET("/invoiceApply/ao/page/list")
Observable<BaseBean> openPoTicket(@QueryMap Map<String, Object> param);
/**
* 坩埚订单开票申请分页列表
* *
* @return * @return
*/ */
@GET("/invoiceApply/app/page/list") @GET("/invoiceApply/ao/page/list")
Observable<BaseBean> openTicketFinancial(@QueryMap Map<String, Object> param); Observable<BaseBean> openCoTicket(@QueryMap Map<String, Object> param);
/**
* 外采购收票分页列表
*
* @return
*/
@GET("/receiptInvoiceApply/po/page")
Observable<BaseBean> receivePoTicket(@QueryMap Map<String, Object> param);
/**
* 供应收票申请管理
*
* @return
*/
@GET("/receiptInvoiceApply/fo/page")
Observable<BaseBean> receiveFoTicket(@QueryMap Map<String, Object> param);
/** /**
* 库存数量：一个仓库里的产品列表 * 库存数量：一个仓库里的产品列表
* *
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialReceiveTicketActivity.java
浏览文件 @ 6dc0373f
...@@ -29,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -29,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
...@@ -48,6 +49,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity { ...@@ -48,6 +49,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
private SmartRefreshLayout srlRefresh; private SmartRefreshLayout srlRefresh;
private List<TicketBean.RecordsBean> dataList; private List<TicketBean.RecordsBean> dataList;
private WorkTicketAdapter dataAdapter; private WorkTicketAdapter dataAdapter;
private String orderType="供应订单";
@Override @Override
protected void initView() { protected void initView() {
...@@ -55,7 +57,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity { ...@@ -55,7 +57,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
FinancialReceiveTicketFilterData filterData = new FinancialReceiveTicketFilterData(this,ddmChoose, new ThreeMenuClickListener() { FinancialReceiveTicketFilterData filterData = new FinancialReceiveTicketFilterData(this,ddmChoose, new ThreeMenuClickListener() {
@Override @Override
public void clickOne(String value) { public void clickOne(String value) {
param.put("orderType", WorkUtils.getOrderCode(value)); orderType = value;
page = 1; page = 1;
param.put("current", page); param.put("current", page);
getData(); getData();
...@@ -95,12 +97,19 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity { ...@@ -95,12 +97,19 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("orderType", "FO");
getData(); getData();
} }
private void getData() { private void getData() {
RtfUtils.getRtf().openTicketFinancial(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { Observable<BaseBean> baseBeanObservable;
if (TextUtils.equals(orderType, "供应订单")) {
baseBeanObservable = RtfUtils.getRtf().receiveFoTicket(param);
} else if (TextUtils.equals(orderType, "外采购订单")) {
baseBeanObservable = RtfUtils.getRtf().receivePoTicket(param);
} else {
baseBeanObservable = RtfUtils.getRtf().receiveFoTicket(param);
}
baseBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialTicketActivity.java
浏览文件 @ 6dc0373f
...@@ -18,6 +18,7 @@ import com.wd.workoffice.retrofit.RtfUtils; ...@@ -18,6 +18,7 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkFinancialOutAdapter; import com.wd.workoffice.ui.adapter.WorkFinancialOutAdapter;
import com.wd.workoffice.ui.adapter.WorkTicketAdapter; import com.wd.workoffice.ui.adapter.WorkTicketAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.FinancialOutFilterData; import com.wd.workoffice.util.ddmfilter.FinancialOutFilterData;
import com.wd.workoffice.util.ddmfilter.FinancialTicketFilterData; import com.wd.workoffice.util.ddmfilter.FinancialTicketFilterData;
...@@ -31,6 +32,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -31,6 +32,7 @@ import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
...@@ -50,14 +52,15 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -50,14 +52,15 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
private SmartRefreshLayout srlRefresh; private SmartRefreshLayout srlRefresh;
private List<TicketBean.RecordsBean> dataList; private List<TicketBean.RecordsBean> dataList;
private WorkTicketAdapter dataAdapter; private WorkTicketAdapter dataAdapter;
private String orderType="销售订单";
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
FinancialTicketFilterData filterData = new FinancialTicketFilterData(this,ddmChoose, new ThreeMenuClickListener() { FinancialTicketFilterData filterData = new FinancialTicketFilterData(this, ddmChoose, new ThreeMenuClickListener() {
@Override @Override
public void clickOne(String value) { public void clickOne(String value) {
param.put("orderType", WorkUtils.getOrderCode(value)); orderType = value;
page = 1; page = 1;
param.put("current", page); param.put("current", page);
getData(); getData();
...@@ -97,12 +100,21 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -97,12 +100,21 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("orderType", "SO");
getData(); getData();
} }
private void getData() { private void getData() {
RtfUtils.getRtf().receiveTicket(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { Observable<BaseBean> baseBeanObservable;
if (TextUtils.equals(orderType, "销售订单")) {
baseBeanObservable = RtfUtils.getRtf().openSoTicket(param);
} else if (TextUtils.equals(orderType, "外采购订单")) {
baseBeanObservable = RtfUtils.getRtf().openPoTicket(param);
} else if (TextUtils.equals(orderType, "坩埚订单")) {
baseBeanObservable = RtfUtils.getRtf().openCoTicket(param);
} else {
baseBeanObservable = RtfUtils.getRtf().openAoTicket(param);
}
baseBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -155,7 +167,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -155,7 +167,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class,"detail",JSON.toJSONString(dataList.get(position))); startActivity(WorkFinancialDetailActivity.class, "detail", JSON.toJSONString(dataList.get(position)));
} }
}); });
} }
......
app/src/main/res/drawable/shape_green_btn.xml 0 → 100644
浏览文件 @ 6dc0373f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ff359486" />
<corners android:radius="2dp" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_red_btn.xml 0 → 100644
浏览文件 @ 6dc0373f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffae4d58" />
<corners android:radius="2dp" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_bat_sale_confirm.xml
浏览文件 @ 6dc0373f
...@@ -415,4 +415,4 @@ ...@@ -415,4 +415,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/activity_work_financial_ticket_detail.xml 0 → 100644
浏览文件 @ 6dc0373f
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center_vertical|right"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_red_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="拒绝"
android:textColor="@color/white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_green_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="同意"
android:textColor="@color/white" />
</LinearLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:orientation="vertical"
android:paddingBottom="20mm">
<View style="@style/ViewX" />
<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="16sp" />
</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="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp" />
</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="16sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp" />
</RelativeLayout>
<View style="@style/ViewX" />
<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="16sp" />
</LinearLayout>
<View style="@style/ViewX" />
<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="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="部门权限"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_role"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:text="权限：无"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论