Skip to content

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

1.校对 

2.//TODO erp用户激活，忘记密码测试，产品下单还差附件，bat，mes，消息，我的，刷新token
上级 474b1f57
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 1085 行增加 和 66 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 077eb313
......@@ -592,6 +592,30 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkFinancialPayActivity"
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.WorkFinancialDetailActivity"
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.WorkFinancialOutActivity"
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"
......
app/src/main/java/com/wd/workoffice/bean/OrderBean.java
浏览文件 @ 077eb313
......@@ -70,7 +70,7 @@ public class OrderBean {
private String receiveUserName;
private int receiveDeptId;
private double launchOrderAmount;
private Object orderTypeName;
private String orderTypeName;
private String launchDeptName;
private String receiveDeptName;
private ExpandInfoBean expandInfo;
......@@ -86,10 +86,19 @@ public class OrderBean {
private String statusName;
private String attrName;
private String requireTime;
private String inStockName;
private Object deptId;
private List<OrderItemsBean> orderItems;
private List<OrderFlowsBean> orderFlows;
public String getInStockName() {
return inStockName;
}
public void setInStockName(String inStockName) {
this.inStockName = inStockName;
}
public String getSupplierName() {
return supplierName;
}
......@@ -250,11 +259,11 @@ public class OrderBean {
this.launchOrderAmount = launchOrderAmount;
}
public Object getOrderTypeName() {
public String getOrderTypeName() {
return orderTypeName;
}
public void setOrderTypeName(Object orderTypeName) {
public void setOrderTypeName(String orderTypeName) {
this.orderTypeName = orderTypeName;
}
......
app/src/main/java/com/wd/workoffice/bean/workEnum/OrderType.java 0 → 100644
浏览文件 @ 077eb313
package com.wd.workoffice.bean.workEnum;
import java.util.Arrays;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public enum OrderType {
ALL("全部类型",""), SALE("销售订单","SO"), OUT_BUY("外采购流程","PO"),
SUPPLIER("供应订单","FO"), CRUCIBLE("坩埚订单","CO"), IN("内部交易订单","IO"),
BUILD("组装订单","AO");
private String name;
private String code;
OrderType(String name, String code) {
this.name = name;
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 077eb313
......@@ -494,7 +494,7 @@ public interface ApiService {
* @return
*/
@GET("/stockQuantity/app/oneOfOrder/{orderId}")
Observable<BaseBean> stockDetailFlow(@Path("orderId")String id , @Path("orderType")String orderType);
Observable<BaseBean> stockDetailFlow(@Path("orderId")String id , @Query("orderType") String orderType);
/**
* 获取当前用户的角色，数据、部门权限列表
......@@ -504,4 +504,19 @@ public interface ApiService {
@GET("/privilege/detail")
Observable<BaseBean> permissionDetail();
/**
* 回款管理
*
* @return
*/
@GET("/moneyBackApply/page/list")
Observable<BaseBean> moneyBack(@QueryMap Map<String, Object> param);
/**
* 付款申请-分页查询
*
* @return
*/
@GET("/moneyPayApply/page/list")
Observable<BaseBean> moneyPay(@QueryMap Map<String, Object> param);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialDetailActivity.java 0 → 100644
浏览文件 @ 077eb313
package com.wd.workoffice.ui.activity.bat.work;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 工作台 - 财务 - 详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkFinancialDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_status)
TextView tvStatus;
@BindView(R.id.tv_code)
TextView tvCode;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.tv_person)
TextView tvPerson;
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.tv_process)
TextView tvProcess;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.tv_position)
TextView tvPosition;
@BindView(R.id.tv_review)
TextView tvReview;
@BindView(R.id.tv_review_time)
TextView tvReviewTime;
@BindView(R.id.tv_desc)
TextView tvDesc;
private MoneyOutBean.RecordsBean dataBean;
@Override
protected void initView() {
ButterKnife.bind(this);
dataBean = JSON.parseObject(getIntent().getStringExtra("detail"), MoneyOutBean.RecordsBean.class);
tvClient.setText(dataBean.getCreatedTime());
tvCode.setText(dataBean.getSerialNumber());
// tvDesc.setText();
tvPerson.setText(dataBean.getApplierName());
tvPosition.setText(dataBean.getApplyRemark());
tvPrice.setText(MathUtils.converData(String.valueOf(dataBean.getApplyAmount()), 3));
tvProcess.setText(dataBean.getProcessName());
tvReview.setText(dataBean.getUpdatedByName());
tvReviewTime.setText(dataBean.getUpdatedTime());
tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(dataBean.getStatus())));
tvTime.setText(dataBean.getCreatedTime());
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_work_financial_out_detail;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialOutActivity.java 0 → 100644
浏览文件 @ 077eb313
package com.wd.workoffice.ui.activity.bat.work;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean;
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.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.FinancialOutFilterData;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
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 WorkFinancialOutActivity extends WorkToolBarActivity {
@BindView(R.id.ddm_choose)
DropDownMenu ddmChoose;
private RecyclerView rvData;
private int page = 1;
private Map<String, Object> param;
private SmartRefreshLayout srlRefresh;
private List<MoneyOutBean.RecordsBean> dataList;
private WorkFinancialOutAdapter dataAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
FinancialOutFilterData filterData = new FinancialOutFilterData(this,ddmChoose, new ThreeMenuClickListener() {
@Override
public void clickOne(String value) {
param.put("orderType", WorkUtils.getOrderCode(value));
page = 1;
param.put("current", page);
getData();
}
@Override
public void clickTwo(String value) {
//0未审核 1已通过 2不通过
if (TextUtils.equals(value, "全部类型")) {
param.put("status", "");
} else if (TextUtils.equals(value, "0未审核")) {
param.put("status", "0");
} else if (TextUtils.equals(value, "已通过")) {
param.put("status", "1");
} else {
param.put("status", "2");
}
page = 1;
param.put("page", page);
getData();
}
@Override
public void clickThree(String value) {
}
});
rvData = filterData.getRvData();
srlRefresh = filterData.getSrlRefresh();
}
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkFinancialOutAdapter(R.layout.item_work_in_stock, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
param.put("current", page);
param.put("orderType", "SO");
getData();
}
private void getData() {
RtfUtils.getRtf().moneyBack(param).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<MoneyOutBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), MoneyOutBean.class).getRecords();
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
dataAdapter.loadMoreEnd();
} else {
page++;
}
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
getData();
});
dataAdapter.setOnLoadMoreListener(() -> {
param.put("current", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class,"detail",JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_work_pro;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
// startActivity(WorkInStockSearchActivity.class);
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialPayActivity.java 0 → 100644
浏览文件 @ 077eb313
package com.wd.workoffice.ui.activity.bat.work;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean;
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.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.FinancialOutFilterData;
import com.wd.workoffice.util.ddmfilter.FinancialPayFilterData;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
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 WorkFinancialPayActivity extends WorkToolBarActivity {
@BindView(R.id.ddm_choose)
DropDownMenu ddmChoose;
private RecyclerView rvData;
private int page = 1;
private Map<String, Object> param;
private SmartRefreshLayout srlRefresh;
private List<MoneyOutBean.RecordsBean> dataList;
private WorkFinancialOutAdapter dataAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
FinancialPayFilterData filterData = new FinancialPayFilterData(this,ddmChoose, new ThreeMenuClickListener() {
@Override
public void clickOne(String value) {
param.put("orderType", WorkUtils.getOrderCode(value));
page = 1;
param.put("current", page);
getData();
}
@Override
public void clickTwo(String value) {
//0未审核 1已通过 2不通过
if (TextUtils.equals(value, "全部类型")) {
param.put("status", "");
} else if (TextUtils.equals(value, "0未审核")) {
param.put("status", "0");
} else if (TextUtils.equals(value, "已通过")) {
param.put("status", "1");
} else {
param.put("status", "2");
}
page = 1;
param.put("page", page);
getData();
}
@Override
public void clickThree(String value) {
}
});
rvData = filterData.getRvData();
srlRefresh = filterData.getSrlRefresh();
}
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkFinancialOutAdapter(R.layout.item_work_in_stock, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
param.put("current", page);
param.put("orderType", "PO");
getData();
}
private void getData() {
RtfUtils.getRtf().moneyPay(param).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<MoneyOutBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), MoneyOutBean.class).getRecords();
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
dataAdapter.loadMoreEnd();
} else {
page++;
}
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
getData();
});
dataAdapter.setOnLoadMoreListener(() -> {
param.put("current", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class,"detail",JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_work_pro;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
// startActivity(WorkInStockSearchActivity.class);
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkInStockDetailActivity.java
浏览文件 @ 077eb313
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
......@@ -17,7 +16,7 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkInStockDetailAdapter;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.InSotckDetailFilterData;
import com.wd.workoffice.util.ddmfilter.InStockDetailFilterData;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
......@@ -56,18 +55,19 @@ public class WorkInStockDetailActivity extends WorkToolBarActivity {
ButterKnife.bind(this);
tvName.setText(getIntent().getStringExtra("name"));
tvNum.setText("实例数量 "+getIntent().getStringExtra("num"));
InSotckDetailFilterData filterData = new InSotckDetailFilterData(ddmChoose, new ThreeMenuClickListener() {
InStockDetailFilterData filterData = new InStockDetailFilterData(this,ddmChoose, new ThreeMenuClickListener() {
@Override
public void clickOne(String value) {
if (TextUtils.equals(value, "全部类型")) {
param.put("type", "");
param.put("siteType", "");
} else if (TextUtils.equals(value, "厂内库")) {
param.put("type", "IN");
param.put("siteType", "IN");
} else {
param.put("type", "OUT");
param.put("siteType", "OUT");
}
// param.put("type", value);
page = 1;
param.put("page", page);
param.put("current", page);
getData();
}
......@@ -183,10 +183,4 @@ public class WorkInStockDetailActivity extends WorkToolBarActivity {
return super.onOptionsItemSelected(item);
}
@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/WorkInStockDetailSearchActivity.java
浏览文件 @ 077eb313
package com.wd.workoffice.ui.activity.bat.work;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
......@@ -61,7 +62,15 @@ public class WorkInStockDetailSearchActivity extends WorkBaseActivity {
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void initData() {
......@@ -72,6 +81,7 @@ public class WorkInStockDetailSearchActivity extends WorkBaseActivity {
param = WorkUtils.pageKey();
param.put("current", page);
param.put("stockTypeId", getIntent().getStringExtra("id"));
param.put("searchKey", "name");
getData();
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkInStockSearchActivity.java
浏览文件 @ 077eb313
package com.wd.workoffice.ui.activity.bat.work;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
......@@ -61,7 +62,15 @@ public class WorkInStockSearchActivity extends WorkBaseActivity {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void initData() {
dataList = new ArrayList<>();
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseOrderSearchActivity.java
浏览文件 @ 077eb313
......@@ -112,7 +112,8 @@ public class WorkWarehouseOrderSearchActivity extends WorkBaseActivity implement
workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkProDetailActivity.class, "pro", JSON.toJSONString(dataList.get(position)));
startActivity(WorkWarehouseOrderDetailActivity.class,
"id", dataList.get(position).getId(),"type", dataList.get(position).getOrderType());
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailActivity.java
浏览文件 @ 077eb313
......@@ -49,7 +49,7 @@ public class WorkWarehouseStockDetailActivity extends WorkToolBarActivity {
@Override
protected void initView() {
ButterKnife.bind(this);
StockDetailFilterData filterData = new StockDetailFilterData(ddmChoose, new OneMenuClickListener() {
StockDetailFilterData filterData = new StockDetailFilterData(this,ddmChoose, new OneMenuClickListener() {
@Override
public void click(String value) {
param.put("orderType", value);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailSearchActivity.java
浏览文件 @ 077eb313
package com.wd.workoffice.ui.activity.bat.work;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
......@@ -62,7 +63,15 @@ public class WorkWarehouseStockDetailSearchActivity extends WorkBaseActivity {
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void initData() {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockSearchActivity.java
浏览文件 @ 077eb313
package com.wd.workoffice.ui.activity.bat.work;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
......@@ -74,7 +75,15 @@ public class WorkWarehouseStockSearchActivity extends WorkBaseActivity {
param.put("current", page);
getData();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
private void getData() {
RtfUtils.getRtf().stockList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkFinancialOutAdapter.java 0 → 100644
浏览文件 @ 077eb313
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.MoneyOutBean;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkFinancialOutAdapter extends BaseQuickAdapter<MoneyOutBean.RecordsBean, BaseViewHolder> {
public WorkFinancialOutAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper,MoneyOutBean.RecordsBean item) {
helper.setText(R.id.tv_name,item.getSerialNumber());
helper.setText(R.id.tv_dep,item.getApplyDeptName());
helper.setText(R.id.tv_client,item.getCustomerName());
helper.setText(R.id.tv_process,item.getProcessName());
helper.setText(R.id.tv_order_type,item.getOrderTypeName());
helper.setText(R.id.tv_price,String.valueOf(item.getApplyAmount()));
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
}
}
app/src/main/java/com/wd/workoffice/ui/fg/WorkProFragment.java
浏览文件 @ 077eb313
......@@ -56,7 +56,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
ButterKnife.bind(this, getContentView());
workProPresenter = new WorkProPresenter();
workProPresenter.onAttach(this);
ProFilterData filterData = new ProFilterData(ddmChoose, new ThreeMenuClickListener() {
ProFilterData filterData = new ProFilterData(getActivity(),ddmChoose, new ThreeMenuClickListener() {
@Override
public void clickOne(String value) {
if (TextUtils.equals(value, "全部状态")) {
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkWarehouse1Fragment.java
浏览文件 @ 077eb313
......@@ -51,7 +51,7 @@ public class WorkWarehouse1Fragment extends WorkBaseFg implements WorkWarehouseC
ButterKnife.bind(this, getContentView());
workProPresenter = new WorkWarehousePresenter();
workProPresenter.onAttach(this);
WarehouseFilterData filterData = new WarehouseFilterData(ddmChoose, new WarehouseFilterClickListener() {
WarehouseFilterData filterData = new WarehouseFilterData(getActivity(),ddmChoose, new WarehouseFilterClickListener() {
@Override
public void clickType(String value) {
if (TextUtils.equals(value, "全部类型")) {
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkWarehouse2Fragment.java
浏览文件 @ 077eb313
......@@ -13,6 +13,7 @@ import com.wd.workoffice.bean.listener.WarehouseOrderFilterClickListener;
import com.wd.workoffice.contract.WorkWarehouseContract;
import com.wd.workoffice.presenter.WorkWarehousePresenter;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseOrderDetailActivity;
import com.wd.workoffice.ui.adapter.WorkWarehouseOrderAdapter;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.WarehouseOrderFilterData;
......@@ -49,7 +50,7 @@ public class WorkWarehouse2Fragment extends WorkBaseFg implements WorkWarehouseC
ButterKnife.bind(this, getContentView());
workProPresenter = new WorkWarehousePresenter();
workProPresenter.onAttach(this);
WarehouseOrderFilterData filterData = new WarehouseOrderFilterData(ddmChoose, new WarehouseOrderFilterClickListener() {
WarehouseOrderFilterData filterData = new WarehouseOrderFilterData(getActivity(),ddmChoose, new WarehouseOrderFilterClickListener() {
@Override
public void clickType(String value) {
param.put("orderType", value);
......@@ -90,7 +91,8 @@ public class WorkWarehouse2Fragment extends WorkBaseFg implements WorkWarehouseC
workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkProDetailActivity.class, "pro", JSON.toJSONString(dataList.get(position)));
startActivity(WorkWarehouseOrderDetailActivity.class,
"id", dataList.get(position).getId(),"type", dataList.get(position).getOrderType());
}
});
}
......
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @ 077eb313
......@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.workEnum.OrderType;
import java.io.File;
import java.util.HashMap;
......@@ -103,6 +104,42 @@ public class WorkUtils {
}
}
/**
* name：订单code
*
* @param name
* @return
*/
public static String getOrderCode(String name) {
String code ="";
for (OrderType value : OrderType.values()) {
if (TextUtils.equals(value.getName(),name)){
code=value.getCode();
}
}
return code;
}
/**
* 财务状态
* 0未审核 1已通过 2不通过
* @param code
* @return
*/
public static String getFinancialStatus(Integer code) {
String name = "";
switch (code) {
case 0:
name = "未审核";
break;
case 1:
name = "已通过";
break;
case 2:
name = "不通过";
break;
}
return name;
}
public static File uriToFile(Uri uri, Context context) {
String path = null;
if ("file".equals(uri.getScheme())) {
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/FinancialOutFilterData.java 0 → 100644
浏览文件 @ 077eb313
package com.wd.workoffice.util.ddmfilter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.ui.adapter.FilterAdapter;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class FinancialOutFilterData {
DropDownMenu menu;
private List<View> viewList;
private View mainView;
private RecyclerView rvData;
private SmartRefreshLayout srlRefresh;
private List<String> statusList = Arrays.asList("销售订单", "组装订单", "外采购单订单");
private List<String> typeList = Arrays.asList("全部状态", "待审核", "已通过","已驳回");
ThreeMenuClickListener listener;
String[] TABLIST = new String[]{ "销售订单", "全部状态"};
Context context;
public FinancialOutFilterData(Context context,DropDownMenu menu, ThreeMenuClickListener listener) {
this.menu = menu;
this.context=context;
this.listener = listener;
initView();
}
private void initView() {
mainView = LayoutInflater.from(context).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(typeList, 1);
addTabView(statusList, 2);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
}
private void addTabView(List<String> dataList, int type) {
View view = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_filter_pro, null);
RecyclerView rvData = view.findViewById(R.id.rv_filter);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
FilterAdapter filterAdapter = new FilterAdapter(R.layout.item_filter, dataList);
filterAdapter.bindToRecyclerView(rvData);
viewList.add(view);
filterAdapter.setOnItemClickListener((adapter, v, position) -> {
filterAdapter.setChoosePos(position);
menu.setTabText(dataList.get(position));
if (listener != null) {
switch (type) {
case 1:
listener.clickOne(dataList.get(position));
break;
case 2:
listener.clickTwo(dataList.get(position));
break;
}
}
menu.closeMenu();
filterAdapter.notifyDataSetChanged();
});
}
public SmartRefreshLayout getSrlRefresh() {
return srlRefresh;
}
public void setSrlRefresh(SmartRefreshLayout srlRefresh) {
this.srlRefresh = srlRefresh;
}
public RecyclerView getRvData() {
return rvData;
}
public void setRvData(RecyclerView rvData) {
this.rvData = rvData;
}
}
app/src/main/java/com/wd/workoffice/util/ddmfilter/FinancialPayFilterData.java 0 → 100644
浏览文件 @ 077eb313
package com.wd.workoffice.util.ddmfilter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.ui.adapter.FilterAdapter;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class FinancialPayFilterData {
DropDownMenu menu;
private List<View> viewList;
private View mainView;
private RecyclerView rvData;
private SmartRefreshLayout srlRefresh;
private List<String> statusList = Arrays.asList("外采购单订单", "供应订单");
private List<String> typeList = Arrays.asList("全部状态", "待审核", "已通过", "已驳回");
ThreeMenuClickListener listener;
String[] TABLIST = new String[]{"外采购单订单", "全部状态"};
Context context;
public FinancialPayFilterData(Context context, DropDownMenu menu, ThreeMenuClickListener listener) {
this.context = context;
this.menu = menu;
this.listener = listener;
initView();
}
private void initView() {
mainView = LayoutInflater.from(context).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(typeList, 1);
addTabView(statusList, 2);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
}
private void addTabView(List<String> dataList, int type) {
View view = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_filter_pro, null);
RecyclerView rvData = view.findViewById(R.id.rv_filter);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
FilterAdapter filterAdapter = new FilterAdapter(R.layout.item_filter, dataList);
filterAdapter.bindToRecyclerView(rvData);
viewList.add(view);
filterAdapter.setOnItemClickListener((adapter, v, position) -> {
filterAdapter.setChoosePos(position);
menu.setTabText(dataList.get(position));
if (listener != null) {
switch (type) {
case 1:
listener.clickOne(dataList.get(position));
break;
case 2:
listener.clickTwo(dataList.get(position));
break;
}
}
menu.closeMenu();
filterAdapter.notifyDataSetChanged();
});
}
public SmartRefreshLayout getSrlRefresh() {
return srlRefresh;
}
public void setSrlRefresh(SmartRefreshLayout srlRefresh) {
this.srlRefresh = srlRefresh;
}
public RecyclerView getRvData() {
return rvData;
}
public void setRvData(RecyclerView rvData) {
this.rvData = rvData;
}
}
app/src/main/java/com/wd/workoffice/util/ddmfilter/InSotckDetailFilterData.java → app/src/main/java/com/wd/workoffice/util/ddmfilter/InStockDetailFilterData.java
浏览文件 @ 077eb313
package com.wd.workoffice.util.ddmfilter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
......@@ -22,7 +23,7 @@ import androidx.recyclerview.widget.RecyclerView;
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class InSotckDetailFilterData {
public class InStockDetailFilterData {
DropDownMenu menu;
private List<View> viewList;
private View mainView;
......@@ -32,20 +33,21 @@ public class InSotckDetailFilterData {
private List<String> typeList = Arrays.asList("全部类型", "厂内库", "场外库");
ThreeMenuClickListener listener;
String[] TABLIST = new String[]{ "区分", "状态"};
String[] TABLIST = new String[]{"区分", "状态"};
Context context;
public InSotckDetailFilterData(DropDownMenu menu, ThreeMenuClickListener listener) {
public InStockDetailFilterData(Context context, DropDownMenu menu, ThreeMenuClickListener listener) {
this.context = context;
this.menu = menu;
this.listener = listener;
initView();
}
private void initView() {
mainView = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_pro, null);
mainView = LayoutInflater.from(context).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(typeList, 1);
addTabView(statusList, 2);
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/ProFilterData.java
浏览文件 @ 077eb313
package com.wd.workoffice.util.ddmfilter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
......@@ -34,8 +35,9 @@ public class ProFilterData {
ThreeMenuClickListener listener;
String[] TABLIST = new String[]{"全部状态", "全部流程", "是否上架"};
public ProFilterData(DropDownMenu menu, ThreeMenuClickListener listener) {
Context context;
public ProFilterData(Context context , DropDownMenu menu, ThreeMenuClickListener listener) {
this.context = context;
this.menu = menu;
this.listener = listener;
initView();
......@@ -43,10 +45,10 @@ public class ProFilterData {
private void initView() {
mainView = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_pro, null);
mainView = LayoutInflater.from(context).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(statusList, 1);
addTabView(processList, 2);
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/StockDetailFilterData.java
浏览文件 @ 077eb313
package com.wd.workoffice.util.ddmfilter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
......@@ -33,8 +34,9 @@ public class StockDetailFilterData {
OneMenuClickListener listener;
String[] TABLIST = new String[]{"订单类型"};
public StockDetailFilterData(DropDownMenu menu, OneMenuClickListener listener) {
Context context;
public StockDetailFilterData( Context context,DropDownMenu menu, OneMenuClickListener listener) {
this.context=context;
this.menu = menu;
this.listener = listener;
initView();
......@@ -42,10 +44,10 @@ public class StockDetailFilterData {
private void initView() {
mainView = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_pro, null);
mainView = LayoutInflater.from(context).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(Config.warehouseStatusList, 1);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/WarehouseFilterData.java
浏览文件 @ 077eb313
package com.wd.workoffice.util.ddmfilter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
......@@ -33,8 +34,9 @@ public class WarehouseFilterData {
WarehouseFilterClickListener listener;
String[] TABLIST = new String[]{"区分", "全部状态"};
public WarehouseFilterData(DropDownMenu menu, WarehouseFilterClickListener listener) {
Context context;
public WarehouseFilterData( Context context,DropDownMenu menu, WarehouseFilterClickListener listener) {
this. context=context;
this.menu = menu;
this.listener = listener;
initView();
......@@ -42,10 +44,10 @@ public class WarehouseFilterData {
private void initView() {
mainView = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_pro, null);
mainView = LayoutInflater.from(context).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(typeList, 1);
addTabView(statusList, 2);
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/WarehouseOrderFilterData.java
浏览文件 @ 077eb313
package com.wd.workoffice.util.ddmfilter;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
......@@ -33,8 +34,10 @@ public class WarehouseOrderFilterData {
WarehouseOrderFilterClickListener listener;
String[] TABLIST = new String[]{"全部类型"};
Context context;
public WarehouseOrderFilterData(DropDownMenu menu, WarehouseOrderFilterClickListener listener) {
public WarehouseOrderFilterData(Context context, DropDownMenu menu, WarehouseOrderFilterClickListener listener) {
this.context = context;
this.menu = menu;
this.listener = listener;
initView();
......@@ -42,10 +45,10 @@ public class WarehouseOrderFilterData {
private void initView() {
mainView = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_pro, null);
mainView = LayoutInflater.from(context).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(Config.warehouseStatusList, 1);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
......
app/src/main/res/layout/activity_work_in_stock_detail.xml
浏览文件 @ 077eb313
......@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm">
android:paddingVertical="10mm">
<TextView
android:id="@+id/tv_name"
......@@ -17,6 +17,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:textColor="@color/black"
android:textStyle="bold"
android:text="钢水控制库" />
<TextView
......
app/src/main/res/layout/item_financial_out.xml 0 → 100644
浏览文件 @ 077eb313
<?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:layout_marginTop="10mm"
android:paddingTop="10mm"
android:paddingBottom="20mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="邢台德龙钢铁客户"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="待生产"
android:textColor="@color/orange"
android:textSize="14sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:paddingVertical="10mm"
android:background="#FCFCFD"
android:orientation="vertical">
<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_dep"
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_client"
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_process"
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_order_type"
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_price"
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>
\ No newline at end of file
app/src/main/res/layout/item_warehoust_order.xml
浏览文件 @ 077eb313
......@@ -8,6 +8,7 @@
android:paddingHorizontal="20mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="保护渣"
......@@ -29,12 +30,11 @@
android:id="@+id/tv_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="销售订单"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_img_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
......@@ -43,13 +43,14 @@
android:textSize="12sp" />
<TextView
android:id="@+id/tv_img_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="销售订单"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
......@@ -63,17 +64,17 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8mm"
android:layout_marginLeft="5mm"
android:layout_marginTop="10mm"
android:text="库存信息"
android:textColor="@color/flexible_text_gray"
/>
android:textSize="12sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5mm"
android:layout_height="wrap_content"
android:layout_marginTop="5mm" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_warehoust_order_stock.xml
浏览文件 @ 077eb313
......@@ -5,7 +5,7 @@
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
>
<LinearLayout
android:layout_width="match_parent"
......@@ -26,10 +26,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="销售内库"
android:textColor="@color/black"
android:textSize="15sp" />
android:textSize="14sp" />
<TextView
android:id="@+id/tv_type"
......@@ -37,15 +36,14 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:layout_marginTop="8mm"
android:paddingHorizontal="10mm">
<TextView
......@@ -53,10 +51,9 @@
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" />
android:textSize="12sp" />
<TextView
android:id="@+id/tv_out_num"
......@@ -66,7 +63,7 @@
android:layout_centerVertical="true"
android:text="销售内库"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:textSize="12sp" />
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/menu/menu_my_edit_info.xml → app/src/main/res/menu/menu_add.xml
浏览文件 @ 077eb313
......@@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/preview"
android:title="编辑资料"
android:id="@+id/add"
android:title="添加"
app:showAsAction="always" />
</menu>
\ No newline at end of file
app/src/main/res/values/colors.xml
浏览文件 @ 077eb313
......@@ -11,4 +11,7 @@
<color name="flexible_background">#fff6f9fb</color>
<color name="input_background">#F0F5F8</color>
<color name="red_btn_bg">#C45D5D</color>
<color name="orange">#FF5722</color>
<color name="flexible_text_color">#333333</color>
</resources>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论