提交 4d0feb33 authored 作者: lgd's avatar lgd

1.订单搜索

2.//TODO 坩埚下单,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级 eda2601b
...@@ -90,6 +90,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity { ...@@ -90,6 +90,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
param.put("searchKey", "orderId");
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
......
...@@ -27,7 +27,7 @@ import butterknife.ButterKnife; ...@@ -27,7 +27,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
/** /**
* 销售订单搜索 * 内部订单搜索
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
...@@ -77,6 +77,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS ...@@ -77,6 +77,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
param.put("searchKey", "orderId");
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
......
...@@ -86,6 +86,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale ...@@ -86,6 +86,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
param.put("searchKey", "orderId");
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
......
...@@ -75,6 +75,7 @@ public class ProductOrderSearchActivity extends WorkBaseActivity { ...@@ -75,6 +75,7 @@ public class ProductOrderSearchActivity extends WorkBaseActivity {
param.put("identity", identity); param.put("identity", identity);
page = 1; page = 1;
param.put("current", page); param.put("current", page);
param.put("searchKey", "orderId");
dataList = new ArrayList<>(); dataList = new ArrayList<>();
dataAdapter = new SaleProductAdapter(R.layout.item_sale_product, dataList); dataAdapter = new SaleProductAdapter(R.layout.item_sale_product, dataList);
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
......
...@@ -152,12 +152,13 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal ...@@ -152,12 +152,13 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
page=1; page=1;
param.put("current", page); param.put("current", page);
param.put("searchValue", key); param.put("searchValue", key);
param.put("searchKey", "orderId");
saleSalePresenter.getOrder(param); saleSalePresenter.getOrder(param);
} }
@Override @Override
public void saleList(List<OrderBean> dataList) { public void saleList(List<OrderBean> dataList) {
toast("加载成功"); toast("搜索成功");
if (page == 1) { if (page == 1) {
orderList.clear(); orderList.clear();
orderList.addAll(dataList); orderList.addAll(dataList);
......
...@@ -86,6 +86,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal ...@@ -86,6 +86,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("current", page); param.put("current", page);
param.put("identity", identity); param.put("identity", identity);
param.put("searchKey", "orderId");
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
toast(R.string.permission); toast(R.string.permission);
} }
......
...@@ -48,7 +48,7 @@ public class WorkSendApplyAddAdapter extends BaseQuickAdapter<OrderDetail.OrderI ...@@ -48,7 +48,7 @@ public class WorkSendApplyAddAdapter extends BaseQuickAdapter<OrderDetail.OrderI
helper.setText(R.id.tv_unit, item.getProductUnit()); helper.setText(R.id.tv_unit, item.getProductUnit());
// helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType())); // helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount())); helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
helper.setText(R.id.tv_apply_send_num, String.valueOf(item.getStoreSum())); helper.setText(R.id.tv_apply_send_num, String.valueOf(item.getCanOutStoreProductSum()));
helper.setText(R.id.tv_send_num, String.format("发货数量:%s",String.valueOf(item.getShipSum()))); helper.setText(R.id.tv_send_num, String.format("发货数量:%s",String.valueOf(item.getShipSum())));
AddAndReduceView nrcNum = helper.getView(R.id.arv_num); AddAndReduceView nrcNum = helper.getView(R.id.arv_num);
nrcNum.setMaxNum(item.getStoreSum()); nrcNum.setMaxNum(item.getStoreSum());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论