提交 7a06b3e0 authored 作者: lgd's avatar lgd

1.修改内部展示字段

上级 2438a16e
......@@ -114,7 +114,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
private List<StockBean> stockList = new ArrayList<>();
private List<String> stockNameList = new ArrayList<>();
private StockBean chooseStock;
// Map<String, Object> carMap = new HashMap<>();
// Map<String, Object> carMap = new HashMap<>();
private List<TradingBean.RecordsBean> tradingProductList;
private TradingProductAdapter tradingProductAdapter;
private Map<String, Object> tradeParam;
......@@ -175,8 +175,8 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
protected void initData() {
proList = new ArrayList<>();
if (TextUtils.equals("3", type)) {
proAdapter = new StoreProductAdapter(R.layout.item_store_product, proList,2);
}else {
proAdapter = new StoreProductAdapter(R.layout.item_store_product, proList, 2);
} else {
proAdapter = new StoreProductAdapter(R.layout.item_store_product, proList);
}
......@@ -268,7 +268,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
toast("请选择入库仓库");
return true;
}
if (tradingCarList.size()==0) {
if (tradingCarList.size() == 0) {
toast("购物车没有产品");
return true;
}
......@@ -709,8 +709,15 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(ModifyCarEvent event) {
String pro = event.getPro();
if (TextUtils.equals("6", type)) {
carList.clear();
carList.addAll(JSON.parseArray(pro, ProductBean.RecordsBean.class));
proAdapter.notifyDataSetChanged();
} else {
tradingCarList.clear();
tradingCarList.addAll(JSON.parseArray(pro, TradingBean.RecordsBean.class));
tradingProDetailAdapter.notifyDataSetChanged();
}
changeCarBadge();
}
......@@ -817,7 +824,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
tvSearch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(tvKey.getText().toString())){
if (TextUtils.isEmpty(tvKey.getText().toString())) {
toast("请输入搜索关键字");
return;
}
......@@ -861,14 +868,14 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
if (quantity.getId() == recordsBean.getId()) {
isHas = true;
recordsBean.setChooseNum(quantity.getChooseNum());
recordsBean.setChooseName(data.get(0).getName());
recordsBean.setChooseName(data.get(0).getSimpleCode());
recordsBean.setChangePro(data.get(0));
}
}
if (!isHas) {
quantity.setChangePro(data.get(0));
quantity.setChooseName(data.get(0).getName());
quantity.setChooseName(data.get(0).getSimpleCode());
tradingCarList.add(quantity);
}
if (data.size() > 0) {
......
package com.wd.workoffice.ui.activity.bat.store;
import android.os.Bundle;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.TradingBean;
import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.ui.adapter.TradingProCarAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -63,27 +67,26 @@ public class StoreTradingCarActivity extends WorkToolBarActivity {
@Override
protected void initEvent() {
// productAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
// @Override
// public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
// QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(StoreTradingCarActivity.this);
// dialog.setMessage("是否删除").addAction("取消", new QMUIDialogAction.ActionListener() {
// @Override
// public void onClick(QMUIDialog dialog, int index) {
// dialog.dismiss();
// }
// }).addAction("确定", new QMUIDialogAction.ActionListener() {
// @Override
// public void onClick(QMUIDialog dialog, int index) {
// dialog.dismiss();
// productList.remove(position);
// productAdapter.notifyDataSetChanged();
// EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(productList)));
// }
// }).show();
// }
// });
productAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(StoreTradingCarActivity.this);
dialog.setMessage("是否删除").addAction("取消", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
}
}).addAction("确定", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
productList.remove(position);
productAdapter.notifyDataSetChanged();
EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(productList)));
}
}).show();
}
});
}
@Override
......
......@@ -27,10 +27,10 @@ public class TradingProCarAdapter extends BaseQuickAdapter<TradingBean.RecordsBe
@Override
protected void convert(BaseViewHolder helper, TradingBean.RecordsBean item) {
helper.setText(R.id.tv_top_name, item.getProductName());
helper.setText(R.id.tv_top_card, item.getProductSimpleCode());
helper.setText(R.id.tv_top_card_name, item.getProductSoleCode());
helper.setText(R.id.tv_top_card, item.getProductSoleCode());
helper.setText(R.id.tv_top_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_apply_num, MathUtils.converData(item.getQuantity(),3));
helper.setText(R.id.tv_dept, item.getDeptName());
helper.setText(R.id.tv_dept, item.getStockName());
AddAndReduceView userNum = helper.getView(R.id.ar_use_num);
userNum.setNumber(item.getChooseNum());
userNum.setMaxNum(item.getQuantity());
......@@ -38,12 +38,13 @@ public class TradingProCarAdapter extends BaseQuickAdapter<TradingBean.RecordsBe
@Override
public void OnNumberChanged(String vs) {
item.setChooseNum(vs);
EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(getData())));
}
});
helper.setText(R.id.tv_name, item.getChangePro().getName());
helper.setText(R.id.tv_card, item.getChangePro().getSoleCode());
helper.setText(R.id.tv_card_name, item.getChangePro().getSoleCode());
helper.setText(R.id.tv_card_name, item.getChangePro().getSimpleCode());
helper.setText(R.id.tv_spec, item.getChangePro().getSpec());
helper.setText(R.id.tv_price, MathUtils.converData(item.getChangePro().getInternalPrice(),3));
helper.setText(R.id.tv_all_price, "小计:"+MathUtils.multiply(item.getChangePro().getCarNum(), MathUtils.converData(item.getChangePro().getInternalPrice(),3), 3));
......
......@@ -33,7 +33,7 @@ public class TradingProDetailAdapter extends BaseQuickAdapter<ProductBean.Record
protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getName());
helper.setText(R.id.tv_card, item.getSoleCode());
helper.setText(R.id.tv_card_name, item.getSoleCode());
helper.setText(R.id.tv_card_name, item.getSimpleCode());
helper.setText(R.id.tv_spec, item.getSpec());
helper.setText(R.id.tv_price, MathUtils.converData(item.getInternalPrice(), 3));
CheckBox cbChoose = helper.getView(R.id.cb_check);
......
......@@ -25,10 +25,10 @@ public class TradingProductAdapter extends BaseQuickAdapter<TradingBean.RecordsB
@Override
protected void convert(BaseViewHolder helper, TradingBean.RecordsBean item) {
helper.setText(R.id.tv_name,item.getProductName() );
helper.setText(R.id.tv_card, item.getProductSimpleCode() );
helper.setText(R.id.tv_card_name, item.getProductSoleCode());
helper.setText(R.id.tv_card, item.getProductSoleCode () );
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_num, String.valueOf(item.getQuantity()));
helper.setText(R.id.tv_dept, item.getDeptName());
helper.setText(R.id.tv_dept, item.getStockName());
if (!TextUtils.isEmpty(item.getChooseNum())) {
helper.setVisible(R.id.ll_car,true);
helper.setText(R.id.tv_pro,item.getChooseName());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论