提交 8e8dc45b authored 作者: lgd's avatar lgd

1.开票收票

2.//TODO erp用户激活测试,忘记/重置密码测试,开票收票操作,产品下单还差附件,bat,mes,消息,刷新token,开票/收票接口
上级 6dc0373f
......@@ -656,7 +656,22 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkFinancialTicketDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="开票管理"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkFinancialReceiveTicketDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="收票管理"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
......@@ -115,8 +115,9 @@ public class TicketBean {
* examedByName : 冷益飞
* invoiceApplyItems : null
* deptName : 业务部
* customerName
*/
private String customerName;
private int createdBy;
private Object createdByName;
private String createdTime;
......@@ -148,6 +149,14 @@ public class TicketBean {
private Object invoiceApplyItems;
private String deptName;
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public int getCreatedBy() {
return createdBy;
}
......
package com.wd.workoffice.bean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class TicketDetailBean {
/**
* createdBy : 705
* createdByName : null
* createdTime : 2020-03-28 16:00:55
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 59
* applyId : 66
* orderId : AO100012
* productId : 32
* quantity : 1.0
* outProductName : 浸入式水口(方坯)
* invoiceUnitPrice : 850.0
* productName : 浸入式水口(方坯)
* productSoleCode : 70LTJ568-1001
* productSimpleCode : J568-1
* productSpec : 90
* productUnit : 支
* productWeight : 0.0
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private int id;
private int applyId;
private String orderId;
private int productId;
private double quantity;
private String outProductName;
private double invoiceUnitPrice;
private String productName;
private String productSoleCode;
private String productSimpleCode;
private String productSpec;
private String productUnit;
private double productWeight;
public int getCreatedBy() {
return createdBy;
}
public void setCreatedBy(int createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getApplyId() {
return applyId;
}
public void setApplyId(int applyId) {
this.applyId = applyId;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public int getProductId() {
return productId;
}
public void setProductId(int productId) {
this.productId = productId;
}
public double getQuantity() {
return quantity;
}
public void setQuantity(double quantity) {
this.quantity = quantity;
}
public String getOutProductName() {
return outProductName;
}
public void setOutProductName(String outProductName) {
this.outProductName = outProductName;
}
public double getInvoiceUnitPrice() {
return invoiceUnitPrice;
}
public void setInvoiceUnitPrice(double invoiceUnitPrice) {
this.invoiceUnitPrice = invoiceUnitPrice;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getProductSoleCode() {
return productSoleCode;
}
public void setProductSoleCode(String productSoleCode) {
this.productSoleCode = productSoleCode;
}
public String getProductSimpleCode() {
return productSimpleCode;
}
public void setProductSimpleCode(String productSimpleCode) {
this.productSimpleCode = productSimpleCode;
}
public String getProductSpec() {
return productSpec;
}
public void setProductSpec(String productSpec) {
this.productSpec = productSpec;
}
public String getProductUnit() {
return productUnit;
}
public void setProductUnit(String productUnit) {
this.productUnit = productUnit;
}
public double getProductWeight() {
return productWeight;
}
public void setProductWeight(double productWeight) {
this.productWeight = productWeight;
}
}
......@@ -493,7 +493,7 @@ public interface ApiService {
*
* @return
*/
@GET("/invoiceApply/ao/page/list")
@GET("/invoiceApply/po/page/list")
Observable<BaseBean> openPoTicket(@QueryMap Map<String, Object> param);
/**
......@@ -501,15 +501,48 @@ public interface ApiService {
*
* @return
*/
@GET("/invoiceApply/ao/page/list")
@GET("/invoiceApply/co/page/list")
Observable<BaseBean> openCoTicket(@QueryMap Map<String, Object> param);
/**
* so开票审核
*
* @return
*/
@GET("/invoiceApply/so/exam")
Observable<BaseBean> soExam(@QueryMap Map<String, Object> param);
/**
* ao开票审核
*
* @return
*/
@GET("/invoiceApply/ao/exam")
Observable<BaseBean> aoExam(@QueryMap Map<String, Object> param);
/**
* ao开票审核
*
* @return
*/
@GET("/invoiceApply/po/exam")
Observable<BaseBean> poExam(@QueryMap Map<String, Object> param );
/**
* co开票审核
*
* @return
*/
@GET("/invoiceApply/co/exam")
Observable<BaseBean> coExam(@QueryMap Map<String, Object> param );
/**
* 外采购收票分页列表
*
* @return
*/
@GET("/receiptInvoiceApply/po/page")
@GET("/receiptInvoiceApply/po/page/list")
Observable<BaseBean> receivePoTicket(@QueryMap Map<String, Object> param);
......@@ -518,7 +551,7 @@ public interface ApiService {
*
* @return
*/
@GET("/receiptInvoiceApply/fo/page")
@GET("/receiptInvoiceApply/fo/page/list")
Observable<BaseBean> receiveFoTicket(@QueryMap Map<String, Object> param);
/**
* 库存数量:一个仓库里的产品列表
......@@ -611,4 +644,22 @@ public interface ApiService {
@GET("/finance-logistics-apply/page/list")
Observable<BaseBean> logistic(@QueryMap Map<String, Object> param);
/**
* 发票明细列表
*
* @return
*/
@GET("/invoice-apply/item/list")
Observable<BaseBean> ticketDetail(@Query("applyId")String applyId );
/**
* 发票明细列表
*
* @return
*/
@GET("/receiptInvoiceApplyItem/list")
Observable<BaseBean> ticketReceiveDetail(@Query("applyId")String applyId );
}
......@@ -66,7 +66,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
//0未审核 1已通过 2不通过
if (TextUtils.equals(value, "全部类型")) {
param.put("status", "");
} else if (TextUtils.equals(value, "0未审核")) {
} else if (TextUtils.equals(value, "未审核")) {
param.put("status", "0");
} else if (TextUtils.equals(value, "已通过")) {
param.put("status", "1");
......
......@@ -15,6 +15,8 @@ import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkFinancialReceiveTicketAdapter;
import com.wd.workoffice.ui.adapter.WorkFinancialTicketAdapter;
import com.wd.workoffice.ui.adapter.WorkTicketAdapter;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.FinancialReceiveTicketFilterData;
......@@ -48,7 +50,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
private Map<String, Object> param;
private SmartRefreshLayout srlRefresh;
private List<TicketBean.RecordsBean> dataList;
private WorkTicketAdapter dataAdapter;
private WorkFinancialReceiveTicketAdapter dataAdapter;
private String orderType="供应订单";
@Override
......@@ -92,7 +94,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkTicketAdapter(R.layout.item_work_ticket, dataList);
dataAdapter = new WorkFinancialReceiveTicketAdapter(R.layout.item_work_ticket, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
......@@ -162,7 +164,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class,"detail",JSON.toJSONString(dataList.get(position)));
startActivity(WorkFinancialReceiveTicketDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
}
});
}
......
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.bean.TicketDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkFinancialTicketDetailAdapter;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 工作台 - 收票详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_refuse)
TextView tvRefuse;
@BindView(R.id.tv_agree)
TextView tvAgree;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.tv_tax)
TextView tvTax;
@BindView(R.id.tv_remark)
TextView tvRemark;
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.tv_desc)
TextView tvDesc;
private List<TicketDetailBean> dataList;
private WorkFinancialTicketDetailAdapter dataAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
tvDesc.setText("所属供应商");
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
TicketBean.RecordsBean info = JSON.parseObject(getIntent().getStringExtra("info"), TicketBean.RecordsBean.class);
getData(info.getId() + "");
tvClient.setText(info.getSupplierName());
tvPrice.setText(String.valueOf(info.getInvoiceSum()));
tvTax.setText(String.valueOf(info.getTax()));
tvRemark.setText(info.getApplyRemark());
if (TextUtils.equals(info.getStatus(), "0")) {
llBottom.setVisibility(View.VISIBLE);
} else {
llBottom.setVisibility(View.GONE);
}
dataList = new ArrayList<>();
dataAdapter = new WorkFinancialTicketDetailAdapter(R.layout.item_ticket_detail, dataList);
dataAdapter.bindToRecyclerView(rvData);
}
private void getData(String id) {
RtfUtils.getRtf().ticketReceiveDetail(id).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
List<TicketDetailBean> dataBean = JSON.parseArray(data.getData().toString(), TicketDetailBean.class);
dataList.addAll(dataBean);
dataAdapter.notifyDataSetChanged();
}
});
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_work_financial_ticket_detail;
}
@OnClick({R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
break;
case R.id.tv_agree:
break;
}
}
}
......@@ -17,6 +17,7 @@ import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkFinancialOutAdapter;
import com.wd.workoffice.ui.adapter.WorkFinancialTicketAdapter;
import com.wd.workoffice.ui.adapter.WorkTicketAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
......@@ -51,7 +52,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
private Map<String, Object> param;
private SmartRefreshLayout srlRefresh;
private List<TicketBean.RecordsBean> dataList;
private WorkTicketAdapter dataAdapter;
private WorkFinancialTicketAdapter dataAdapter;
private String orderType="销售订单";
@Override
......@@ -95,7 +96,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkTicketAdapter(R.layout.item_work_ticket, dataList);
dataAdapter = new WorkFinancialTicketAdapter(R.layout.item_work_ticket, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
......@@ -167,7 +168,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class, "detail", JSON.toJSONString(dataList.get(position)));
startActivity(WorkFinancialTicketDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
}
});
}
......
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.bean.TicketDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkFinancialTicketDetailAdapter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
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;
/**
* 工作台 - 开票详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkFinancialTicketDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_refuse)
TextView tvRefuse;
@BindView(R.id.tv_agree)
TextView tvAgree;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.tv_tax)
TextView tvTax;
@BindView(R.id.tv_remark)
TextView tvRemark;
@BindView(R.id.rv_data)
RecyclerView rvData;
private List<TicketDetailBean> dataList;
private WorkFinancialTicketDetailAdapter dataAdapter;
private Map<String, Object> param;
private String orderType;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
TicketBean.RecordsBean info = JSON.parseObject(getIntent().getStringExtra("info"), TicketBean.RecordsBean.class);
getData(info.getId() + "");
tvClient.setText(info.getCustomerName());
tvPrice.setText(String.valueOf(info.getInvoiceSum()));
tvTax.setText(String.valueOf(info.getTax()));
tvRemark.setText(info.getApplyRemark());
if (TextUtils.equals(info.getStatus(), "0")) {
llBottom.setVisibility(View.VISIBLE);
} else {
llBottom.setVisibility(View.GONE);
}
dataList = new ArrayList<>();
dataAdapter = new WorkFinancialTicketDetailAdapter(R.layout.item_ticket_detail, dataList);
dataAdapter.bindToRecyclerView(rvData);
param = new HashMap<>();
param.put("id",getIntent().getStringExtra("id"));
param.put("id",getIntent().getStringExtra("id"));
orderType = getIntent().getStringExtra("type");
}
private void getData(String id) {
RtfUtils.getRtf().ticketDetail(id).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
List<TicketDetailBean> dataBean = JSON.parseArray(data.getData().toString(), TicketDetailBean.class);
dataList.addAll(dataBean);
dataAdapter.notifyDataSetChanged();
}
});
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_work_financial_ticket_detail;
}
@OnClick({R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
exam(2);
break;
case R.id.tv_agree:
exam(1);
break;
}
}
private void exam(int status){
param.put("status",status);
Observable<BaseBean> baseBeanObservable;
if (TextUtils.equals(orderType, "销售订单")) {
baseBeanObservable = RtfUtils.getRtf().soExam(param);
} else if (TextUtils.equals(orderType, "外采购订单")) {
baseBeanObservable = RtfUtils.getRtf().poExam(param);
} else if (TextUtils.equals(orderType, "坩埚订单")) {
baseBeanObservable = RtfUtils.getRtf().coExam(param);
} else {
baseBeanObservable = RtfUtils.getRtf().aoExam(param);
}
baseBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
toast("操作成功");
}
});
}
}
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkFinancialReceiveTicketAdapter extends BaseQuickAdapter<TicketBean.RecordsBean, BaseViewHolder> {
public WorkFinancialReceiveTicketAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, TicketBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getSupplierName());
helper.setText(R.id.tv_tax, String.valueOf(item.getTax()));
helper.setText(R.id.tv_person, item.getApplierName());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
helper.setText(R.id.tv_all_price, String.valueOf(item.getInvoiceSum()));
}
}
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkFinancialTicketAdapter extends BaseQuickAdapter<TicketBean.RecordsBean, BaseViewHolder> {
public WorkFinancialTicketAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, TicketBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_tax, String.valueOf(item.getTax()));
helper.setText(R.id.tv_person, item.getApplierName());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
helper.setText(R.id.tv_all_price, String.valueOf(item.getInvoiceSum()));
}
}
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ContactsBean;
import com.wd.workoffice.bean.TicketDetailBean;
import com.wd.workoffice.util.MathUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkFinancialTicketDetailAdapter extends BaseQuickAdapter<TicketDetailBean, BaseViewHolder> {
public WorkFinancialTicketDetailAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, TicketDetailBean item) {
helper.setText(R.id.tv_name, item.getProductSimpleCode());
helper.setText(R.id.tv_order, item.getOrderId());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_weight, String.valueOf(item.getProductWeight()));
helper.setText(R.id.tv_price, String.valueOf(item.getInvoiceUnitPrice()));
helper.setText(R.id.tv_num, MathUtils.converData(item.getQuantity(), 3));
}
}
......@@ -130,7 +130,7 @@ public class WorkUtils {
String name = "";
switch (code) {
case 0:
name = "审核";
name = "审核";
break;
case 1:
name = "已通过";
......
......@@ -29,11 +29,11 @@ public class FinancialReceiveTicketFilterData {
private View mainView;
private RecyclerView rvData;
private SmartRefreshLayout srlRefresh;
private List<String> statusList = Arrays.asList("供应订单", "外采购订单");
private List<String> statusList = Arrays.asList("供应订单", "外采购订单");
private List<String> typeList = Arrays.asList("全部状态", "待审核", "已通过","已驳回");
ThreeMenuClickListener listener;
String[] TABLIST = new String[]{ "销售订单", "全部状态"};
String[] TABLIST = new String[]{ "供应订单", "全部状态"};
Context context;
public FinancialReceiveTicketFilterData(Context context, DropDownMenu menu, ThreeMenuClickListener listener) {
this.menu = menu;
......
......@@ -29,7 +29,7 @@ public class FinancialTicketFilterData {
private View mainView;
private RecyclerView rvData;
private SmartRefreshLayout srlRefresh;
private List<String> statusList = Arrays.asList("销售订单", "组装订单", "外采购订单","坩埚订单");
private List<String> statusList = Arrays.asList("销售订单", "组装订单", "外采购订单","坩埚订单");
private List<String> typeList = Arrays.asList("全部状态", "待审核", "已通过","已驳回");
ThreeMenuClickListener listener;
......
......@@ -13,6 +13,7 @@
android:orientation="horizontal">
<TextView
android:id="@+id/tv_refuse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
......@@ -23,6 +24,7 @@
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_agree"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
......@@ -64,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="基本信息"
android:textSize="16sp" />
android:textSize="15sp" />
</LinearLayout>
<RelativeLayout
......@@ -77,18 +79,20 @@
android:paddingVertical="15mm">
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所属客户"
android:textSize="16sp" />
android:textSize="15sp" />
<TextView
android:id="@+id/tv_client"
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" />
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
......@@ -106,16 +110,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开票总价"
android:textSize="16sp" />
android:textSize="15sp" />
<TextView
android:id="@+id/tv_name"
android:id="@+id/tv_price"
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" />
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/ViewX" />
......@@ -135,9 +139,14 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="开票来源"
android:textSize="16sp" />
android:textSize="15sp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View style="@style/ViewX" />
<RelativeLayout
......@@ -152,16 +161,16 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所属客户"
android:textSize="16sp" />
android:text="税费"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_tax"
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" />
android:textSize="15sp" />
</RelativeLayout>
<View style="@style/dividerX" />
......@@ -179,15 +188,15 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="部门权限"
android:textSize="16sp" />
android:text="备注"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_role"
android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:text="权限:无"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5mm"
android:text="邢台德龙钢铁客户"
android:textSize="16sp"
android:textStyle="bold" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="订单编号"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="规格"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_spec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="单位"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="单重"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_weight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:gravity="left">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开单单价:"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15mm"
android:text="申请数量:"
android:textColor="@color/red_btn_bg"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red_btn_bg"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......@@ -20,15 +20,15 @@
android:layout_alignParentLeft="true"
android:text="图号TH82739857"
android:textColor="@color/black"
android:textSize="16sp" />
android:textSize="15sp" />
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="#E3AD6E"
android:textSize="16sp" />
android:textColor="@color/orange"
android:textSize="15sp" />
</RelativeLayout>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论