Skip to content

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

1.组装订单/坩埚订单 

2.//TODO erp用户激活测试，忘记/重置密码测试，坩埚下单页面，组装列表，往来（客户两个库），产品下单还差附件，mes，消息，刷新token
上级 10c5b3d8
隐藏空白字符变更
内嵌 并排
正在显示 包含 1085 行增加 和 86 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 5e43411f
......@@ -286,6 +286,39 @@ public interface ApiService {
@GET("/supplierOrder/current-user/page/list")
Observable<BaseBean> getSupplierOrder(@QueryMap Map<String, Object> param);
/**
* 订单
* <p>
* orderStatus app端订单筛选：
* 100：待审核
* 200：待接单
* 710： 待生产 （已接单、申请提前结束）
* 500：已入库
* 600： 已交付
* 960：已关闭 （审核失败、已拒单、已提前结束）
* identity 1:作为买家(销售部门) 2:作为卖家(生产部门)
*
* @return
*/
@GET("/crucibleOrder/current-user/page/list")
Observable<BaseBean> getCucibleOrder(@QueryMap Map<String, Object> param);
/**
* 订单
* <p>
* orderStatus app端订单筛选：
* 100：待审核
* 200：待接单
* 710： 待生产 （已接单、申请提前结束）
* 500：已入库
* 600： 已交付
* 960：已关闭 （审核失败、已拒单、已提前结束）
* identity 1:作为买家(销售部门) 2:作为卖家(生产部门)
*
* @return
*/
@GET("/crucibleSaleOrder/current-user/page/list")
Observable<BaseBean> getCucibleSaleOrder(@QueryMap Map<String, Object> param);
/**
* 产品列表
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleCrucibleOrderActivity.java
浏览文件 @ 5e43411f
......@@ -9,6 +9,8 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.SupplierOrderSearchActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.CrucibleOrderBuyFragment;
import com.wd.workoffice.ui.fg.CrucibleOrderSaleFragment;
import com.wd.workoffice.ui.fg.ProductOrderApplyFragment;
import com.wd.workoffice.ui.fg.ProductOrderFragment;
......@@ -37,6 +39,7 @@ public class SaleCrucibleOrderActivity extends WorkToolBarActivity {
ViewPager vpData;
private String tab[] = {
"坩埚生产订单", "坩埚销售订单"};
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -48,10 +51,10 @@ public class SaleCrucibleOrderActivity extends WorkToolBarActivity {
protected void initData() {
FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>();
ProductOrderFragment saleFragment = new ProductOrderFragment();
ProductOrderApplyFragment applyFragment = new ProductOrderApplyFragment();
CrucibleOrderBuyFragment saleFragment = new CrucibleOrderBuyFragment();
CrucibleOrderSaleFragment applyFragment = new CrucibleOrderSaleFragment();
Bundle bundle = new Bundle();
bundle.putString("identity", "1");
bundle.putString("identity", getIntent().getStringExtra("identity"));
saleFragment.setArguments(bundle);
applyFragment.setArguments(bundle);
data.add(saleFragment);
......@@ -82,7 +85,7 @@ public class SaleCrucibleOrderActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivity(SupplierOrderSearchActivity.class, "identity", "1","","");
startActivity(SupplierOrderSearchActivity.class, "identity", "1", "", "");
break;
}
return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleProductOrderActivity.java
浏览文件 @ 5e43411f
......@@ -51,7 +51,7 @@ public class SaleProductOrderActivity extends WorkToolBarActivity {
ProductOrderFragment saleFragment = new ProductOrderFragment();
ProductOrderApplyFragment applyFragment = new ProductOrderApplyFragment();
Bundle bundle = new Bundle();
bundle.putString("identity", "1");
bundle.putString("identity", getIntent().getStringExtra("identity"));
saleFragment.setArguments(bundle);
applyFragment.setArguments(bundle);
data.add(saleFragment);
......
app/src/main/java/com/wd/workoffice/ui/adapter/SaleCruibleAdapter.java 0 → 100644
浏览文件 @ 5e43411f
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.OrderBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class SaleCruibleAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public SaleCruibleAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getReceiveDeptName());
helper.setText(R.id.tv_status, item.getStatusName());
helper.setText(R.id.tv_place_name, item.getLaunchUserName());
helper.setText(R.id.tv_company, item.getLaunchDeptName());
helper.setText(R.id.tv_order_no, item.getId());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_send_time, item.getRequireTime());
helper.setText(R.id.tv_desc, item.getAttrName());
helper.setText(R.id.tv_price, String.valueOf(item.getLaunchOrderAmount()));
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/SaleProductAdapter.java
浏览文件 @ 5e43411f
......@@ -22,15 +22,11 @@ public class SaleProductAdapter extends BaseQuickAdapter<OrderBean, BaseViewHold
@Override
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_status, item.getStatusName());
helper.setText(R.id.tv_dep, item.getReceiveDeptName());
helper.setText(R.id.tv_place_name, item.getLaunchUserName());
helper.setText(R.id.tv_company, item.getLaunchDeptName());
helper.setText(R.id.tv_supplier,item.getSupplierName());
helper.setText(R.id.tv_order_no, item.getId());
helper.setText(R.id.tv_dep, item.getLaunchDeptName());
helper.setText(R.id.tv_order, item.getId());
helper.setText(R.id.tv_person, item.getLaunchUserName());
helper.setText(R.id.tv_stock,item.getEnterStockName());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_send_time, item.getRequireTime());
helper.setText(R.id.tv_desc, item.getAttrName());
helper.setText(R.id.tv_price, String.valueOf(item.getLaunchOrderAmount()));
}
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/SaleProductApplyAdapter.java
浏览文件 @ 5e43411f
......@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
......@@ -22,7 +23,7 @@ public class SaleProductApplyAdapter extends BaseQuickAdapter<OrderBean, BaseVie
@Override
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_status, item.getStatusName());
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(item.getStatus()));
helper.setText(R.id.tv_dep, item.getUsedStockName());
helper.setText(R.id.tv_from_dep, item.getEnterStockName());
helper.setText(R.id.tv_person, item.getAppliedByName());
......
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderBuyFragment.java 0 → 100644
浏览文件 @ 5e43411f
package com.wd.workoffice.ui.fg;
import android.os.Bundle;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 销售 - 供应订单
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class CrucibleOrderBuyFragment extends WorkBaseFg {
@BindView(R.id.tl_tab)
TabLayout tlTab;
@BindView(R.id.vp_data)
ViewPager vpData;
private String tab[] = {
"全部", "待审核", "待接单", "待生产", "已入库"};
private String order[] = {
"", "100", "200", "710", "500"};
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
tlTab.setupWithViewPager(vpData);
tlTab.setTabMode(TabLayout.MODE_FIXED);
}
@Override
protected void initData() {
FragmentManager sfm = getChildFragmentManager();
List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) {
CrucibleOrderBuyListFragment saleFragment = new CrucibleOrderBuyListFragment();
Bundle bundle = new Bundle();
bundle.putString("state", order[i]);
bundle.putString("identity", identity);
saleFragment.setArguments(bundle);
data.add(saleFragment);
}
VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
vpData.setAdapter(vpFgAdapter);
for (int i = 0; i < tab.length; i++) {
tlTab.getTabAt(i).setText(tab[i]);
}
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
identity = arguments.getString("identity");
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_order;
}
}
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderBuyListFragment.java 0 → 100644
浏览文件 @ 5e43411f
package com.wd.workoffice.ui.fg;
import android.os.Bundle;
import android.text.TextUtils;
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.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
import com.wd.workoffice.ui.adapter.SaleCruibleAdapter;
import com.wd.workoffice.ui.adapter.SaleProductApplyAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
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 CrucibleOrderBuyListFragment extends WorkBaseFg {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private String state;
private int page = 1;
private Map<String, Object> param;
private SaleCruibleAdapter dataAdapter;
private List<OrderBean> dataList;
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
param = WorkUtils.pageKey();
if (!TextUtils.isEmpty(state))
param.put("status", state);
param.put("identity", identity);
page = 1;
param.put("current", page);
dataList = new ArrayList<>();
dataAdapter = new SaleCruibleAdapter(R.layout.item_crucible_buy, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
getData();
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
state = arguments.getString("state");
identity = arguments.getString("identity");
}
}
private void getData() {
RtfUtils.getRtf().getCucibleOrder(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<OrderBean> getList = JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class);
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(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_work_contacts;
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(CheckOrderEvent event) {
page = 1;
param.put("current", page);
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderSaleFragment.java 0 → 100644
浏览文件 @ 5e43411f
package com.wd.workoffice.ui.fg;
import android.os.Bundle;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 销售 - 供应订单
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class CrucibleOrderSaleFragment extends WorkBaseFg {
@BindView(R.id.tl_tab)
TabLayout tlTab;
@BindView(R.id.vp_data)
ViewPager vpData;
private String tab[] = {
"已入库", "已交付"};
private String order[] = {
"500", "600"};
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
tlTab.setupWithViewPager(vpData);
tlTab.setTabMode(TabLayout.MODE_FIXED);
}
@Override
protected void initData() {
FragmentManager sfm = getChildFragmentManager();
List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) {
CrucibleOrderSaleListFragment saleFragment = new CrucibleOrderSaleListFragment();
Bundle bundle = new Bundle();
bundle.putString("state", order[i]);
bundle.putString("identity", identity);
saleFragment.setArguments(bundle);
data.add(saleFragment);
}
VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
vpData.setAdapter(vpFgAdapter);
for (int i = 0; i < tab.length; i++) {
tlTab.getTabAt(i).setText(tab[i]);
}
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
identity = arguments.getString("identity");
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_order;
}
}
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderSaleListFragment.java 0 → 100644
浏览文件 @ 5e43411f
package com.wd.workoffice.ui.fg;
import android.os.Bundle;
import android.text.TextUtils;
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.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
import com.wd.workoffice.ui.adapter.SaleCruibleAdapter;
import com.wd.workoffice.ui.adapter.SaleProductApplyAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
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 CrucibleOrderSaleListFragment extends WorkBaseFg {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private String state;
private int page = 1;
private Map<String, Object> param;
private SaleCruibleAdapter dataAdapter;
private List<OrderBean> dataList;
String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
param = WorkUtils.pageKey();
if (!TextUtils.isEmpty(state))
param.put("status", state);
param.put("identity", identity);
page = 1;
param.put("current", page);
dataList = new ArrayList<>();
dataAdapter = new SaleCruibleAdapter(R.layout.item_crucible_sale, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
getData();
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
state = arguments.getString("state");
identity = arguments.getString("identity");
}
}
private void getData() {
RtfUtils.getRtf().getCucibleSaleOrder(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<OrderBean> getList = JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class);
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(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_work_contacts;
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(CheckOrderEvent event) {
page = 1;
param.put("current", page);
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MainFragment.java
浏览文件 @ 5e43411f
......@@ -11,6 +11,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.vo.BatLayoutVo;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.sale.SaleCrucibleOrderActivity;
import com.wd.workoffice.ui.activity.bat.sale.SaleProductOrderActivity;
import com.wd.workoffice.ui.activity.bat.store.StoreFinancialActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkInStockActivity;
......@@ -185,6 +186,7 @@ public class MainFragment extends WorkBaseFg {
startActivity(SaleProductOrderActivity.class, "identity", "1");
break;
case 5:
startActivity(SaleCrucibleOrderActivity.class, "identity", "1");
break;
}
}
......@@ -238,9 +240,10 @@ public class MainFragment extends WorkBaseFg {
startActivity(ProductInsideOrderActivity.class);
break;
case 4:
startActivity(SaleProductOrderActivity.class);
startActivity(SaleProductOrderActivity.class, "identity", "1");
break;
case 5:
startActivity(SaleCrucibleOrderActivity.class, "identity", "1");
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/fg/ProductOrderApplyFragment.java
浏览文件 @ 5e43411f
......@@ -14,6 +14,7 @@ import com.wd.workoffice.ui.adapter.VpDataAdapter;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
......@@ -33,9 +34,11 @@ public class ProductOrderApplyFragment extends WorkBaseFg {
@BindView(R.id.vp_data)
ViewPager vpData;
private String tab[] = {
"未审核", "已通过","已驳回"};
"未审核", "已通过", "已驳回"};
private String order[] = {
"0", "1", "2"};
private String identity;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
......@@ -51,7 +54,7 @@ public class ProductOrderApplyFragment extends WorkBaseFg {
ProductOrderApplyListFragment saleFragment = new ProductOrderApplyListFragment();
Bundle bundle = new Bundle();
bundle.putString("state", order[i]);
bundle.putString("identity", "1");
bundle.putString("identity", identity);
saleFragment.setArguments(bundle);
data.add(saleFragment);
}
......@@ -62,6 +65,15 @@ public class ProductOrderApplyFragment extends WorkBaseFg {
}
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
identity = arguments.getString("identity");
}
}
@Override
protected void initEvent() {
}
......
app/src/main/java/com/wd/workoffice/ui/fg/ProductOrderApplyListFragment.java
浏览文件 @ 5e43411f
......@@ -53,6 +53,7 @@ public class ProductOrderApplyListFragment extends WorkBaseFg {
private Map<String, Object> param;
private SaleProductApplyAdapter dataAdapter;
private List<OrderBean> dataList;
private String identity;
@Override
protected void initView() {
......@@ -67,6 +68,7 @@ public class ProductOrderApplyListFragment extends WorkBaseFg {
param.put("status", state);
page = 1;
param.put("current", page);
param.put("identity", identity);
dataList = new ArrayList<>();
dataAdapter = new SaleProductApplyAdapter(R.layout.item_sale_product_apply, dataList);
dataAdapter.bindToRecyclerView(rvData);
......@@ -80,6 +82,7 @@ public class ProductOrderApplyListFragment extends WorkBaseFg {
Bundle arguments = getArguments();
if (arguments != null) {
state = arguments.getString("state");
identity = arguments.getString("identity");
}
}
......@@ -102,7 +105,7 @@ public class ProductOrderApplyListFragment extends WorkBaseFg {
toast(data.getMessage());
return;
}
List<OrderBean> getList= JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class);
List<OrderBean> getList = JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class);
if (page == 1) {
srlRefresh.finishRefresh();
......@@ -138,7 +141,7 @@ public class ProductOrderApplyListFragment extends WorkBaseFg {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkLogisticsDetailActivity.class, "info",JSON.toJSONString(dataList.get(position)));
startActivity(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/fg/ProductOrderFragment.java
浏览文件 @ 5e43411f
......@@ -51,6 +51,7 @@ public class ProductOrderFragment extends WorkBaseFg {
private Map<String, Object> param;
private SaleProductAdapter dataAdapter;
private List<OrderBean> dataList;
private String identity;
@Override
protected void initView() {
......@@ -62,7 +63,7 @@ public class ProductOrderFragment extends WorkBaseFg {
@Override
protected void initData() {
param = WorkUtils.pageKey();
// param.put("status", state);
param.put("identity", identity);
page = 1;
param.put("current", page);
dataList = new ArrayList<>();
......@@ -77,7 +78,7 @@ public class ProductOrderFragment extends WorkBaseFg {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
state = arguments.getString("state");
identity = arguments.getString("identity");
}
}
......@@ -100,7 +101,7 @@ public class ProductOrderFragment extends WorkBaseFg {
toast(data.getMessage());
return;
}
List<OrderBean> getList= JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class);
List<OrderBean> getList = JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class);
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
......@@ -135,7 +136,7 @@ public class ProductOrderFragment extends WorkBaseFg {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkLogisticsDetailActivity.class, "info",JSON.toJSONString(dataList.get(position)));
startActivity(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
}
});
}
......
app/src/main/res/layout/item_crucible_buy.xml 0 → 100644
浏览文件 @ 5e43411f
<?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="#0841F0"
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: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_place_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 2.所属公司 -->
<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_company"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 3.订单编号 -->
<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_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 4.下单时间 -->
<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_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 3.要求发货时间 -->
<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_send_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
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="right">
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15mm"
android:text="对方发起提前结束"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="订单总价:￥"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_crucible_sale.xml 0 → 100644
浏览文件 @ 5e43411f
<?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="#0841F0"
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>
<!-- 1.下单 -->
<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_place_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 2.所属公司 -->
<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_company"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
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_stock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 3.订单编号 -->
<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_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 4.下单时间 -->
<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_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 3.要求发货时间 -->
<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_send_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
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="right">
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15mm"
android:text="对方发起提前结束"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="订单总价:￥"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_sale_product.xml
浏览文件 @ 5e43411f
......@@ -30,7 +30,6 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="待生产"
android:textColor="#0841F0"
android:textSize="14sp" />
</RelativeLayout>
......@@ -43,7 +42,6 @@
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">
......@@ -53,12 +51,12 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="接单部门"
android:text="订单编号"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_dep"
android:id="@+id/tv_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -66,7 +64,7 @@
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 1.下单 -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -78,16 +76,17 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="下单人"
android:text="入库仓库"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_place_name"
android:id="@+id/tv_stock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
......@@ -103,12 +102,12 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="所属公司"
android:text="下单人"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_company"
android:id="@+id/tv_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -118,31 +117,6 @@
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/rv_supplier"
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_supplier"
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>
<!-- 3.订单编号 -->
<RelativeLayout
android:layout_width="match_parent"
......@@ -155,12 +129,12 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="订单编号"
android:text="下单部门"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_order_no"
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -195,32 +169,6 @@
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 3.要求发货时间 -->
<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_send_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
......@@ -234,7 +182,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15mm"
android:text="对方发起提前结束"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论