Skip to content

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

1.修改内部交易

上级 504525cc
隐藏空白字符变更
内嵌 并排
正在显示 包含 469 行增加 和 356 行删除
app/src/main/java/com/wd/workoffice/bean/TradingBean.java
浏览文件 @ e10c8eb3
...@@ -135,6 +135,24 @@ public class TradingBean { ...@@ -135,6 +135,24 @@ public class TradingBean {
private Object quantityDetailList; private Object quantityDetailList;
private Object quantityFlowList; private Object quantityFlowList;
private String chooseNum; private String chooseNum;
private String chooseName;
private ProductBean.RecordsBean changePro;
public ProductBean.RecordsBean getChangePro() {
return changePro;
}
public void setChangePro(ProductBean.RecordsBean changePro) {
this.changePro = changePro;
}
public String getChooseName() {
return chooseName;
}
public void setChooseName(String chooseName) {
this.chooseName = chooseName;
}
public String getChooseNum() { public String getChooseNum() {
return chooseNum; return chooseNum;
......
app/src/main/java/com/wd/workoffice/contract/BatChooseInfoContract.java
浏览文件 @ e10c8eb3
...@@ -41,7 +41,7 @@ public interface BatChooseInfoContract { ...@@ -41,7 +41,7 @@ public interface BatChooseInfoContract {
void getStock(List<StockBean> dataList); void getStock(List<StockBean> dataList);
void getTradingPro(TradingBean.RecordsBean code, List<ProductBean.RecordsBean> dataList); void getTradingPro( List<ProductBean.RecordsBean> dataList);
void getTradingProList(List<TradingBean.RecordsBean> dataList); void getTradingProList(List<TradingBean.RecordsBean> dataList);
} }
...@@ -55,7 +55,7 @@ public interface BatChooseInfoContract { ...@@ -55,7 +55,7 @@ public interface BatChooseInfoContract {
void getStock(Map<String,Object> param); void getStock(Map<String,Object> param);
void getTradingPro(TradingBean.RecordsBean code); void getTradingPro(String code);
void getTradingProList(Map<String,Object> param); void getTradingProList(Map<String,Object> param);
} }
......
app/src/main/java/com/wd/workoffice/presenter/BatChooseInfoPresenter.java
浏览文件 @ e10c8eb3
...@@ -114,9 +114,9 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract. ...@@ -114,9 +114,9 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract.
} }
@Override @Override
public void getTradingPro(TradingBean.RecordsBean code) { public void getTradingPro(String code) {
mView.showLoading(); mView.showLoading();
mModel.getTradingPro(code.getProductSoleCode()).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { mModel.getTradingPro(code).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
mDisposable.add(d); mDisposable.add(d);
...@@ -135,8 +135,7 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract. ...@@ -135,8 +135,7 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract.
mView.onError(data.getMessage()); mView.onError(data.getMessage());
return; return;
} }
List<ProductBean.RecordsBean> productBean = JSON.parseArray(data.getData().toString(), ProductBean.RecordsBean.class); mView.getTradingPro(JSON.parseArray(data.getData().toString(), ProductBean.RecordsBean.class));
mView.getTradingPro(code, JSON.parseArray(data.getData().toString(), ProductBean.RecordsBean.class));
} }
}); });
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseInfoActivity.java
浏览文件 @ e10c8eb3
...@@ -4,6 +4,7 @@ import android.content.DialogInterface; ...@@ -4,6 +4,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArrayMap;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
...@@ -113,12 +114,15 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose ...@@ -113,12 +114,15 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
private List<StockBean> stockList = new ArrayList<>(); private List<StockBean> stockList = new ArrayList<>();
private List<String> stockNameList = new ArrayList<>(); private List<String> stockNameList = new ArrayList<>();
private StockBean chooseStock; private StockBean chooseStock;
Map<String, Object> carMap = new HashMap<>(); // Map<String, Object> carMap = new HashMap<>();
private List<TradingBean.RecordsBean> tradingProductList; private List<TradingBean.RecordsBean> tradingProductList;
private TradingProductAdapter tradingProductAdapter; private TradingProductAdapter tradingProductAdapter;
private Map<String, Object> tradeParam; private Map<String, Object> tradeParam;
private StockBean chooseSendStock; private StockBean chooseSendStock;
private BadgeCarProvider mActionProvider; private BadgeCarProvider mActionProvider;
private TradingProDetailAdapter tradingProDetailAdapter;
private List<ProductBean.RecordsBean> changeProList;
private List<TradingBean.RecordsBean> tradingCarList = new ArrayList<>();
@Override @Override
protected void initView() { protected void initView() {
...@@ -218,7 +222,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose ...@@ -218,7 +222,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
@Override @Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals("6", type)) { if (TextUtils.equals("6", type)) {
batChooseInfoPresenter.getTradingPro(tradingProductList.get(position)); openDialogInside(tradingProductList.get(position));
} else { } else {
openDialog(proList.get(position)); openDialog(proList.get(position));
} }
...@@ -228,7 +232,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose ...@@ -228,7 +232,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
tradingProductAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { tradingProductAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override @Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
batChooseInfoPresenter.getTradingPro(tradingProductList.get(position)); openDialogInside(tradingProductList.get(position));
} }
}); });
} }
...@@ -264,12 +268,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose ...@@ -264,12 +268,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
toast("请选择入库仓库"); toast("请选择入库仓库");
return true; return true;
} }
if (!carMap.containsKey("pro")) { if (tradingCarList.size()==0) {
toast("购物车没有产品"); toast("购物车没有产品");
return true; return true;
} }
startActivity(StoreTradingCarActivity.class, startActivity(StoreTradingCarActivity.class,
"pro", JSON.toJSONString(carMap), "pro", JSON.toJSONString(tradingCarList),
"supplierId", supplyId == null ? "" : supplyId.toString(), "supplierId", supplyId == null ? "" : supplyId.toString(),
"subProcess", chooseProcess == null ? "" : chooseProcess.getName(), "subProcess", chooseProcess == null ? "" : chooseProcess.getName(),
"subProcessId", chooseProcess == null ? "" : chooseProcess.getId() + "", "subProcessId", chooseProcess == null ? "" : chooseProcess.getId() + "",
...@@ -625,8 +629,11 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose ...@@ -625,8 +629,11 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
} }
@Override @Override
public void getTradingPro(TradingBean.RecordsBean data, List<ProductBean.RecordsBean> list) { public void getTradingPro(List<ProductBean.RecordsBean> list) {
openDialogInside(data, list); toast("搜索完成");
changeProList.clear();
changeProList.addAll(list);
tradingProDetailAdapter.notifyDataSetChanged();
} }
@Override @Override
...@@ -788,25 +795,35 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose ...@@ -788,25 +795,35 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
* 内部交易选择产品 * 内部交易选择产品
* *
* @param quantity * @param quantity
* @param data
*/ */
private void openDialogInside(TradingBean.RecordsBean quantity, List<ProductBean.RecordsBean> data) { private void openDialogInside(TradingBean.RecordsBean quantity) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_add_cart_trading, null); View view = LayoutInflater.from(this).inflate(R.layout.view_add_cart_trading, null);
TextView tvOk = view.findViewById(R.id.tv_ok); TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvCancel = view.findViewById(R.id.tv_cancel); TextView tvCancel = view.findViewById(R.id.tv_cancel);
TextView tvSearch = view.findViewById(R.id.iv_search);
EditText tvKey = view.findViewById(R.id.et_key);
AddAndReduceView useNum = view.findViewById(R.id.ar_use_num); AddAndReduceView useNum = view.findViewById(R.id.ar_use_num);
useNum.setMaxNum(quantity.getQuantity()); useNum.setMaxNum(quantity.getQuantity());
AddAndReduceView num = view.findViewById(R.id.ar_num); AddAndReduceView num = view.findViewById(R.id.ar_num);
RecyclerView rvProduct = view.findViewById(R.id.rv_pro); RecyclerView rvProduct = view.findViewById(R.id.rv_pro);
rvProduct.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvProduct.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
List<ProductBean.RecordsBean> dataList = new ArrayList<>(); changeProList = new ArrayList<>();
dataList.addAll(data); tradingProDetailAdapter = new TradingProDetailAdapter(R.layout.item_trading_product_dialog, changeProList);
TradingProDetailAdapter tradingProDetailAdapter = new TradingProDetailAdapter(R.layout.item_trading_product_dialog, dataList);
tradingProDetailAdapter.bindToRecyclerView(rvProduct); tradingProDetailAdapter.bindToRecyclerView(rvProduct);
builder.setView(view); builder.setView(view);
AlertDialog addCartDialog = builder.create(); AlertDialog addCartDialog = builder.create();
tvSearch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(tvKey.getText().toString())){
toast("请输入搜索关键字");
return;
}
batChooseInfoPresenter.getTradingPro(tvKey.getText().toString());
}
});
tvOk.setOnClickListener(new View.OnClickListener() { tvOk.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -815,18 +832,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose ...@@ -815,18 +832,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
toast("请选择使用数量"); toast("请选择使用数量");
return; return;
} }
Map<Integer, Boolean> isChoose = tradingProDetailAdapter.getIsChoose();
List<ProductBean.RecordsBean> info = new ArrayList<>(); List<ProductBean.RecordsBean> info = new ArrayList<>();
for (Map.Entry<Integer, Boolean> entry : isChoose.entrySet()) { if (tradingProDetailAdapter.getChoosePos() == -1) {
if (entry.getValue()) {
ProductBean.RecordsBean recordsBean = dataList.get(entry.getKey());
info.add(recordsBean);
}
}
if (info.size() == 0) {
toast("请选择置换产品"); toast("请选择置换产品");
return; return;
} }
info.add(changeProList.get(tradingProDetailAdapter.getChoosePos()));
quantity.setChooseNum(String.valueOf(useNum.getNumber())); quantity.setChooseNum(String.valueOf(useNum.getNumber()));
addCartInside(quantity, info, num.getNumber()); addCartInside(quantity, info, num.getNumber());
addCartDialog.dismiss(); addCartDialog.dismiss();
...@@ -845,14 +856,18 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose ...@@ -845,14 +856,18 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
for (ProductBean.RecordsBean bean : data) { for (ProductBean.RecordsBean bean : data) {
bean.setCarNum(number); bean.setCarNum(number);
} }
carMap.put("pro", JSON.toJSONString(quantity)); quantity.setChangePro(data.get(0));
carMap.put("proDetail", JSON.toJSONString(data)); quantity.setChooseName(data.get(0).getName());
tradingCarList.add(quantity);
// carMap.put("pro", JSON.toJSONString(quantity));
// carMap.put("proDetail", JSON.toJSONString(data));
if (data.size() > 0) { if (data.size() > 0) {
mActionProvider.setBadgeVisibility(View.VISIBLE); mActionProvider.setBadgeVisibility(View.VISIBLE);
} else { } else {
mActionProvider.setBadgeVisibility(View.GONE); mActionProvider.setBadgeVisibility(View.GONE);
} }
toast("加入购物车成功"); toast("加入购物车成功");
tradingProductAdapter.notifyDataSetChanged();
} }
private void changeCarBadge() { private void changeCarBadge() {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreTradingCarActivity.java
浏览文件 @ e10c8eb3
package com.wd.workoffice.ui.activity.bat.store; package com.wd.workoffice.ui.activity.bat.store;
import android.os.Bundle;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.TradingBean; import com.wd.workoffice.bean.TradingBean;
import com.wd.workoffice.bean.event.ModifyCarEvent; import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.ui.adapter.TradingProCarAdapter; import com.wd.workoffice.ui.adapter.TradingProCarAdapter;
import com.wd.workoffice.util.MathUtils; import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.widget.AddAndReduceView;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
...@@ -19,7 +18,6 @@ import org.greenrobot.eventbus.ThreadMode; ...@@ -19,7 +18,6 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
...@@ -34,7 +32,6 @@ import butterknife.OnClick; ...@@ -34,7 +32,6 @@ import butterknife.OnClick;
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class StoreTradingCarActivity extends WorkToolBarActivity { public class StoreTradingCarActivity extends WorkToolBarActivity {
@BindView(R.id.tv_num) @BindView(R.id.tv_num)
TextView tvNum; TextView tvNum;
@BindView(R.id.tv_price) @BindView(R.id.tv_price)
...@@ -43,24 +40,10 @@ public class StoreTradingCarActivity extends WorkToolBarActivity { ...@@ -43,24 +40,10 @@ public class StoreTradingCarActivity extends WorkToolBarActivity {
TextView tvOk; TextView tvOk;
@BindView(R.id.ll_bottom) @BindView(R.id.ll_bottom)
RelativeLayout llBottom; RelativeLayout llBottom;
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_card)
TextView tvCard;
@BindView(R.id.tv_card_name)
TextView tvCardName;
@BindView(R.id.tv_dept)
TextView tvDept;
@BindView(R.id.tv_apply_num)
TextView tvApplyNum;
@BindView(R.id.ar_use_num)
AddAndReduceView arUseNum;
@BindView(R.id.rv_product) @BindView(R.id.rv_product)
RecyclerView rvProduct; RecyclerView rvProduct;
private List<ProductBean.RecordsBean> productList; private List<TradingBean.RecordsBean> productList;
private TradingProCarAdapter productAdapter; private TradingProCarAdapter productAdapter;
private Map data;
private TradingBean.RecordsBean pro;
@Override @Override
protected void initView() { protected void initView() {
...@@ -70,31 +53,17 @@ public class StoreTradingCarActivity extends WorkToolBarActivity { ...@@ -70,31 +53,17 @@ public class StoreTradingCarActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
data = JSON.parseObject(getIntent().getStringExtra("pro"), Map.class);
pro = JSON.parseObject(data.get("pro").toString(), TradingBean.RecordsBean.class);
tvName.setText(pro.getProductName());
tvCard.setText(pro.getProductSimpleCode());
tvCardName.setText(pro.getProductSoleCode());
tvApplyNum.setText(MathUtils.converData(pro.getQuantity(),3));
tvDept.setText(pro.getDeptName());
arUseNum.setMaxNum(pro.getQuantity());
arUseNum.setNumber(pro.getChooseNum());
productList = new ArrayList<>(); productList = new ArrayList<>();
productAdapter = new TradingProCarAdapter(R.layout.item_trading_product_car, productList); productAdapter = new TradingProCarAdapter(R.layout.item_trading_product_car, productList);
productAdapter.bindToRecyclerView(rvProduct); productAdapter.bindToRecyclerView(rvProduct);
productList.addAll(JSON.parseArray(data.get("proDetail").toString(), ProductBean.RecordsBean.class)); productList.addAll(JSON.parseArray(getIntent().getStringExtra("pro"), TradingBean.RecordsBean.class));
productAdapter.notifyDataSetChanged(); productAdapter.notifyDataSetChanged();
changeNumAndPrice(); changeNumAndPrice();
} }
@Override @Override
protected void initEvent() { protected void initEvent() {
arUseNum.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
@Override
public void OnNumberChanged(String vs) {
pro.setChooseNum(vs);
}
});
// productAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { // productAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
// @Override // @Override
// public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { // public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
...@@ -125,13 +94,11 @@ public class StoreTradingCarActivity extends WorkToolBarActivity { ...@@ -125,13 +94,11 @@ public class StoreTradingCarActivity extends WorkToolBarActivity {
@OnClick(R.id.tv_ok) @OnClick(R.id.tv_ok)
public void onViewClicked() { public void onViewClicked() {
String allPrice = ""; String allPrice = "";
for (ProductBean.RecordsBean recordsBean : productList) { for (TradingBean.RecordsBean recordsBean : productList) {
allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getChangePro().getCarNum()
, MathUtils.converData(recordsBean.getInternalPrice(),3), 3), 3); , MathUtils.converData(recordsBean.getChangePro().getInternalPrice(), 3), 3), 3);
} }
data.put("proDetail",productList); startActivity(StoreTradingConfirmActivity.class, "pro", JSON.toJSONString(productList),
data.put("pro",pro);
startActivity(StoreTradingConfirmActivity.class, "pro",JSON.toJSONString(data),
"subProcess", getIntent().getStringExtra("subProcess"), "subProcess", getIntent().getStringExtra("subProcess"),
"supplierId", getIntent().getStringExtra("supplierId"), "supplierId", getIntent().getStringExtra("supplierId"),
"inStockId", getIntent().getStringExtra("inStockId"), "inStockId", getIntent().getStringExtra("inStockId"),
...@@ -161,8 +128,8 @@ public class StoreTradingCarActivity extends WorkToolBarActivity { ...@@ -161,8 +128,8 @@ public class StoreTradingCarActivity extends WorkToolBarActivity {
private void changeNumAndPrice() { private void changeNumAndPrice() {
tvNum.setText("共 ".concat(productList.size() + "").concat(" 件")); tvNum.setText("共 ".concat(productList.size() + "").concat(" 件"));
String allPrice = ""; String allPrice = "";
for (ProductBean.RecordsBean recordsBean : productList) { for (TradingBean.RecordsBean recordsBean : productList) {
allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum(), recordsBean.getInternalPrice() + "", 3), allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getChangePro().getCarNum(), recordsBean.getChangePro().getInternalPrice() + "", 3),
3); 3);
} }
tvPrice.setText("总计: ¥ ".concat(allPrice)); tvPrice.setText("总计: ¥ ".concat(allPrice));
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreTradingConfirmActivity.java
浏览文件 @ e10c8eb3
...@@ -5,14 +5,11 @@ import android.content.DialogInterface; ...@@ -5,14 +5,11 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -24,7 +21,6 @@ import com.tbruyelle.rxpermissions2.RxPermissions; ...@@ -24,7 +21,6 @@ import com.tbruyelle.rxpermissions2.RxPermissions;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.TradingBean; import com.wd.workoffice.bean.TradingBean;
import com.wd.workoffice.bean.workEnum.PermissionType; import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.retrofit.ApiService; import com.wd.workoffice.retrofit.ApiService;
...@@ -57,9 +53,7 @@ import butterknife.ButterKnife; ...@@ -57,9 +53,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.RtfHelper; import flexible.xd.android_base.network.rtfhttp.RtfHelper;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.LogUtils;
import flexible.xd.android_base.utils.TimeUtils; import flexible.xd.android_base.utils.TimeUtils;
import flexible.xd.android_base.utils.constant.TimeConstants;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import okhttp3.MediaType; import okhttp3.MediaType;
...@@ -73,7 +67,6 @@ import okhttp3.RequestBody; ...@@ -73,7 +67,6 @@ import okhttp3.RequestBody;
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class StoreTradingConfirmActivity extends WorkToolBarActivity { public class StoreTradingConfirmActivity extends WorkToolBarActivity {
@BindView(R.id.tv_num) @BindView(R.id.tv_num)
TextView tvNum; TextView tvNum;
@BindView(R.id.tv_price) @BindView(R.id.tv_price)
...@@ -114,11 +107,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity { ...@@ -114,11 +107,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
EditText etInput5; EditText etInput5;
@BindView(R.id.tv_input5) @BindView(R.id.tv_input5)
TextView tvInput5; TextView tvInput5;
@BindView(R.id.tv_card) private List<TradingBean.RecordsBean> proList;
TextView tvCard;
@BindView(R.id.tv_use_num)
TextView tvUseNum;
private List<ProductBean.RecordsBean> proList;
private TradingConfimProAdapter proAdapter; private TradingConfimProAdapter proAdapter;
private QMUIDialog.MenuDialogBuilder setDialog; private QMUIDialog.MenuDialogBuilder setDialog;
private String[] setArray = new String[]{"钢控", "锆碳"}; private String[] setArray = new String[]{"钢控", "锆碳"};
...@@ -150,14 +139,10 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity { ...@@ -150,14 +139,10 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
Map data = JSON.parseObject(getIntent().getStringExtra("pro"), Map.class);
pro = JSON.parseObject(data.get("pro").toString(), TradingBean.RecordsBean.class);
tvCard.setText(pro.getProductName());
tvUseNum.setText(pro.getChooseNum());
proList = new ArrayList<>(); proList = new ArrayList<>();
proAdapter = new TradingConfimProAdapter(R.layout.item_trading_confirm_pro, proList); proAdapter = new TradingConfimProAdapter(R.layout.item_trading_confirm_pro, proList);
proAdapter.bindToRecyclerView(rvPro); proAdapter.bindToRecyclerView(rvPro);
proList.addAll(JSON.parseArray(data.get("proDetail").toString(), ProductBean.RecordsBean.class)); proList.addAll(JSON.parseArray(getIntent().getStringExtra("pro"), TradingBean.RecordsBean.class));
proAdapter.notifyDataSetChanged(); proAdapter.notifyDataSetChanged();
changeNumAndPrice(); changeNumAndPrice();
param = new HashMap<>(); param = new HashMap<>();
...@@ -188,17 +173,17 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity { ...@@ -188,17 +173,17 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
* @param proList * @param proList
* @return * @return
*/ */
private List<JSONObject> coverProInfo(List<ProductBean.RecordsBean> proList) { private List<JSONObject> coverProInfo(List<TradingBean.RecordsBean> proList) {
List<JSONObject> orderItems = new ArrayList<>(); List<JSONObject> orderItems = new ArrayList<>();
for (ProductBean.RecordsBean recordsBean : proList) { for (TradingBean.RecordsBean recordsBean : proList) {
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
data.put("productId", recordsBean.getId()); data.put("productId", recordsBean.getChangePro().getId());
data.put("productCount", recordsBean.getCarNum()); data.put("productCount", recordsBean.getChangePro().getCarNum());
data.put("type", "PDS"); data.put("type", "PDS");
data.put("sourceProductId", pro.getProductId()); data.put("sourceProductId", recordsBean.getProductId());
data.put("sourceProductCount", pro.getChooseNum()); data.put("sourceProductCount", recordsBean.getChooseNum());
data.put("stockId", pro.getStockId()); data.put("stockId", recordsBean.getStockId());
data.put("annex", recordsBean.getUrl()); data.put("annex", recordsBean.getChangePro().getUrl());
orderItems.add(data); orderItems.add(data);
} }
return orderItems; return orderItems;
...@@ -232,7 +217,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity { ...@@ -232,7 +217,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
* @param tv * @param tv
*/ */
private void addNumListener(EditText et, TextView tv) { private void addNumListener(EditText et, TextView tv) {
WorkUtils.addNumListener(et,tv); WorkUtils.addNumListener(et, tv);
} }
@Override @Override
...@@ -350,8 +335,8 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity { ...@@ -350,8 +335,8 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
private void changeNumAndPrice() { private void changeNumAndPrice() {
tvNum.setText("共 ".concat(proList.size() + "").concat(" 件")); tvNum.setText("共 ".concat(proList.size() + "").concat(" 件"));
String allPrice = ""; String allPrice = "";
for (ProductBean.RecordsBean recordsBean : proList) { for (TradingBean.RecordsBean recordsBean : proList) {
allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() , MathUtils.converData(recordsBean.getInternalPrice(),3), 3), 3); allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getChangePro().getCarNum(), MathUtils.converData(recordsBean.getChangePro().getInternalPrice(), 3), 3), 3);
} }
tvPrice.setText("总计: ¥ ".concat(allPrice)); tvPrice.setText("总计: ¥ ".concat(allPrice));
} }
...@@ -363,8 +348,8 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity { ...@@ -363,8 +348,8 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
Integer clientId = data.getIntExtra("id", 0); Integer clientId = data.getIntExtra("id", 0);
String name = data.getStringExtra("name"); String name = data.getStringExtra("name");
Integer position = Integer.valueOf(data.getStringExtra("position")); Integer position = Integer.valueOf(data.getStringExtra("position"));
proList.get(position).setFactoryId(clientId); proList.get(position).getChangePro().setFactoryId(clientId);
proList.get(position).setFactoryName(name); proList.get(position).getChangePro().setFactoryName(name);
proAdapter.notifyItemChanged(position); proAdapter.notifyItemChanged(position);
} else if (requestCode == 10002 && resultCode == RESULT_OK) { } else if (requestCode == 10002 && resultCode == RESULT_OK) {
if (Matisse.obtainResult(data).size() != 0) { if (Matisse.obtainResult(data).size() != 0) {
...@@ -393,7 +378,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity { ...@@ -393,7 +378,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
return; return;
} }
toast("上传成功"); toast("上传成功");
proList.get(choosePosition).setUrl(jsonObject.getString("data")); proList.get(choosePosition).getChangePro().setUrl(jsonObject.getString("data"));
coverProInfo(proList); coverProInfo(proList);
proAdapter.notifyDataSetChanged(); proAdapter.notifyDataSetChanged();
} }
...@@ -428,4 +413,11 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity { ...@@ -428,4 +413,11 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
} }
}); });
} }
@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/store/StoreTradingProductActivity.java
浏览文件 @ e10c8eb3
...@@ -110,14 +110,14 @@ public class StoreTradingProductActivity extends WorkToolBarActivity { ...@@ -110,14 +110,14 @@ public class StoreTradingProductActivity extends WorkToolBarActivity {
toast("请选择使用数量"); toast("请选择使用数量");
return; return;
} }
Map<Integer, Boolean> isChoose = tradingProDetailAdapter.getIsChoose(); // Map<Integer, Boolean> isChoose = tradingProDetailAdapter.getIsChoose();
List<ProductBean.RecordsBean> info = new ArrayList<>(); List<ProductBean.RecordsBean> info = new ArrayList<>();
for (Map.Entry<Integer, Boolean> entry : isChoose.entrySet()) { // for (Map.Entry<Integer, Boolean> entry : isChoose.entrySet()) {
if (entry.getValue()) { // if (entry.getValue()) {
ProductBean.RecordsBean recordsBean = dataList.get(entry.getKey()); // ProductBean.RecordsBean recordsBean = dataList.get(entry.getKey());
info.add(recordsBean); // info.add(recordsBean);
} // }
} // }
if (info.size() == 0) { if (info.size() == 0) {
toast("请选择置换产品"); toast("请选择置换产品");
return; return;
......
app/src/main/java/com/wd/workoffice/ui/adapter/TradingConfimProAdapter.java
浏览文件 @ e10c8eb3
...@@ -11,6 +11,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -11,6 +11,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProductBean; import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.TradingBean;
import com.wd.workoffice.bean.event.ModifyCarEvent; import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.util.MathUtils; import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.widget.AddAndReduceView; import com.wd.workoffice.widget.AddAndReduceView;
...@@ -25,7 +26,7 @@ import flexible.xd.android_base.utils.ToastUtil; ...@@ -25,7 +26,7 @@ import flexible.xd.android_base.utils.ToastUtil;
* Created by flexible on 2018/8/13. * Created by flexible on 2018/8/13.
*/ */
public class TradingConfimProAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, BaseViewHolder> { public class TradingConfimProAdapter extends BaseQuickAdapter<TradingBean.RecordsBean, BaseViewHolder> {
public TradingConfimProAdapter(int layoutResId, List data) { public TradingConfimProAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
...@@ -33,12 +34,18 @@ public class TradingConfimProAdapter extends BaseQuickAdapter<ProductBean.Record ...@@ -33,12 +34,18 @@ public class TradingConfimProAdapter extends BaseQuickAdapter<ProductBean.Record
@Override @Override
protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) { protected void convert(BaseViewHolder helper, TradingBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getName());
helper.setText(R.id.tv_num, String.valueOf(item.getCarNum()));
helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarNum() , MathUtils.converData(item.getInternalPrice(),3), 3)); helper.setText(R.id.tv_card, item.getProductName());
helper.setText(R.id.tv_use_num, MathUtils.converData(item.getChooseNum(),3));
helper.setText(R.id.tv_name, item.getChangePro().getName());
helper.setText(R.id.tv_num, MathUtils.converData(item.getChangePro().getCarNum(),3));
helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getChangePro().getCarNum() ,
MathUtils.converData(item.getChangePro().getInternalPrice(),3), 3));
helper.addOnClickListener(R.id.rl_upload); helper.addOnClickListener(R.id.rl_upload);
if (!TextUtils.isEmpty(item.getUrl())){ if (!TextUtils.isEmpty(item.getChangePro().getUrl())){
helper.setText(R.id.tv_upload, "已上传，点击替换"); helper.setText(R.id.tv_upload, "已上传，点击替换");
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/TradingProCarAdapter.java
浏览文件 @ e10c8eb3
package com.wd.workoffice.ui.adapter; package com.wd.workoffice.ui.adapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProductBean; import com.wd.workoffice.bean.TradingBean;
import com.wd.workoffice.bean.event.ModifyCarEvent; import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.util.MathUtils; import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.widget.AddAndReduceView; import com.wd.workoffice.widget.AddAndReduceView;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by flexible on 2018/8/13. * Created by flexible on 2018/8/13.
*/ */
public class TradingProCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, BaseViewHolder> { public class TradingProCarAdapter extends BaseQuickAdapter<TradingBean.RecordsBean, BaseViewHolder> {
public TradingProCarAdapter(int layoutResId, List data) { public TradingProCarAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
} }
@Override @Override
protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) { protected void convert(BaseViewHolder helper, TradingBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getName()); helper.setText(R.id.tv_top_name, item.getProductName());
helper.setText(R.id.tv_card, item.getSoleCode()); helper.setText(R.id.tv_top_card, item.getProductSimpleCode());
helper.setText(R.id.tv_card_name, item.getSoleCode()); helper.setText(R.id.tv_top_card_name, item.getProductSoleCode());
helper.setText(R.id.tv_spec, item.getSpec()); helper.setText(R.id.tv_apply_num, MathUtils.converData(item.getQuantity(),3));
helper.setText(R.id.tv_price, MathUtils.converData(item.getInternalPrice(),3)); helper.setText(R.id.tv_dept, item.getDeptName());
helper.setText(R.id.tv_all_price, "小计:"+MathUtils.multiply(item.getCarNum(), MathUtils.converData(item.getInternalPrice(),3), 3)); AddAndReduceView userNum = helper.getView(R.id.ar_use_num);
userNum.setNumber(item.getChooseNum());
userNum.setMaxNum(item.getQuantity());
userNum.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
@Override
public void OnNumberChanged(String vs) {
item.setChooseNum(vs);
}
});
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_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));
AddAndReduceView num = helper.getView(R.id.ar_num); AddAndReduceView num = helper.getView(R.id.ar_num);
num.setNumber(item.getCarNum()); num.setNumber(item.getChangePro().getCarNum());
num.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() { num.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
@Override @Override
public void OnNumberChanged(String vs) { public void OnNumberChanged(String vs) {
item.setCarNum(vs); item.getChangePro().setCarNum(vs);
helper.setText(R.id.tv_all_price, "小计:"+MathUtils.multiply(vs , MathUtils.converData(item.getInternalPrice(),3), 3)); helper.setText(R.id.tv_all_price, "小计:"+MathUtils.multiply(vs , MathUtils.converData(item.getChangePro().getInternalPrice(),3), 3));
EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(getData()))); EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(getData())));
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/TradingProDetailAdapter.java
浏览文件 @ e10c8eb3
package com.wd.workoffice.ui.adapter; package com.wd.workoffice.ui.adapter;
import android.view.View;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
...@@ -21,38 +22,53 @@ import java.util.Map; ...@@ -21,38 +22,53 @@ import java.util.Map;
public class TradingProDetailAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, BaseViewHolder> { public class TradingProDetailAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, BaseViewHolder> {
Map<Integer, Boolean> isChoose = new HashMap<>();
int choosePos = -1;
public TradingProDetailAdapter(int layoutResId, List data) { public TradingProDetailAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
for (int i = 0; i < isChoose.entrySet().size(); i++) {
isChoose.put(i, false);
}
} }
@Override @Override
protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) { protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) {
helper.setText(R.id.tv_name,item.getName() ); helper.setText(R.id.tv_name, item.getName());
helper.setText(R.id.tv_card, item.getSoleCode() ); 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.getSoleCode());
helper.setText(R.id.tv_spec,item.getSpec()); helper.setText(R.id.tv_spec, item.getSpec());
helper.setText(R.id.tv_price, MathUtils.converData(item.getInternalPrice(),3)); helper.setText(R.id.tv_price, MathUtils.converData(item.getInternalPrice(), 3));
CheckBox cbChoose = helper.getView(R.id.cb_check); CheckBox cbChoose = helper.getView(R.id.cb_check);
cbChoose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { if (helper.getAdapterPosition() == choosePos) {
cbChoose.setChecked(true);
} else {
cbChoose.setChecked(false);
}
cbChoose.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onClick(View v) {
isChoose.put(helper.getAdapterPosition(), cbChoose.isChecked()); if (choosePos ==helper.getAdapterPosition()){
}else {
choosePos = helper.getAdapterPosition();
notifyDataSetChanged();
}
} }
}); });
// cbChoose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
// @Override
// public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
// notifyItemChanged(choosePos);
// choosePos = helper.getAdapterPosition();
//// cbChoose.setChecked(isChecked);
// }
// });
} }
public Map<Integer, Boolean> getIsChoose() { public int getChoosePos() {
return isChoose; return choosePos;
} }
public void setIsChoose(Map<Integer, Boolean> isChoose) { public void setChoosePos(int choosePos) {
this.isChoose = isChoose; this.choosePos = choosePos;
} }
} }
app/src/main/java/com/wd/workoffice/ui/adapter/TradingProductAdapter.java
浏览文件 @ e10c8eb3
package com.wd.workoffice.ui.adapter; package com.wd.workoffice.ui.adapter;
import android.text.TextUtils;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProductBean; import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.TradingBean; import com.wd.workoffice.bean.TradingBean;
import com.wd.workoffice.util.MathUtils;
import java.util.List; import java.util.List;
...@@ -26,6 +29,13 @@ public class TradingProductAdapter extends BaseQuickAdapter<TradingBean.RecordsB ...@@ -26,6 +29,13 @@ public class TradingProductAdapter extends BaseQuickAdapter<TradingBean.RecordsB
helper.setText(R.id.tv_card_name, item.getProductSoleCode()); helper.setText(R.id.tv_card_name, item.getProductSoleCode());
helper.setText(R.id.tv_num, String.valueOf(item.getQuantity())); 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.getDeptName());
if (!TextUtils.isEmpty(item.getChooseNum())) {
helper.setVisible(R.id.ll_car,true);
helper.setText(R.id.tv_pro,item.getChooseName());
helper.setText(R.id.tv_car_num, MathUtils.converData(item.getChooseNum(), 3));
}else{
helper.setVisible(R.id.ll_car,false);
}
helper.addOnClickListener(R.id.tv_cart); helper.addOnClickListener(R.id.tv_cart);
} }
} }
......
app/src/main/res/layout/activity_trading_confirm.xml
浏览文件 @ e10c8eb3
...@@ -79,67 +79,6 @@ ...@@ -79,67 +79,6 @@
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="使用数量"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_use_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:gravity="center"
android:text="置换产品信息"
android:textSize="17sp"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_pro" android:id="@+id/rv_pro"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/activity_treading_shopcar.xml
浏览文件 @ e10c8eb3
...@@ -59,145 +59,6 @@ ...@@ -59,145 +59,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="图号TH82739857"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:padding="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="图号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_card_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="来源仓库"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_dept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="可申请数量"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_apply_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="使用数量"
android:textColor="@color/flexible_text_sup"
android:textSize="16sp" />
<com.wd.workoffice.widget.AddAndReduceView
android:id="@+id/ar_use_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_product" android:id="@+id/rv_product"
......
app/src/main/res/layout/item_trading_confirm_pro.xml
浏览文件 @ e10c8eb3
...@@ -7,7 +7,66 @@ ...@@ -7,7 +7,66 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="10mm"> android:paddingVertical="10mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="使用数量"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_use_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:gravity="center"
android:text="置换产品信息"
android:textSize="17sp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/item_trading_product.xml
浏览文件 @ e10c8eb3
...@@ -116,11 +116,57 @@ ...@@ -116,11 +116,57 @@
</LinearLayout> </LinearLayout>
<TextView <LinearLayout
android:id="@+id/tv_cart" android:layout_width="match_parent"
android:layout_width="90mm" android:layout_height="wrap_content"
android:layout_height="26mm" android:gravity="center_vertical">
android:layout_gravity="right"
android:layout_marginTop="10mm" <LinearLayout
android:background="@mipmap/product_add_cart" /> android:id="@+id/ll_car"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="invisible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="使用数量:"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_car_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="100mm"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15mm"
android:text="置换产品:"
android:textColor="@color/red_btn_bg"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="100mm"
android:textColor="@color/red_btn_bg"
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_cart"
android:layout_width="90mm"
android:layout_height="26mm"
android:layout_gravity="right"
android:background="@mipmap/product_add_cart" />
</LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_trading_product_car.xml
浏览文件 @ e10c8eb3
...@@ -4,9 +4,155 @@ ...@@ -4,9 +4,155 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginTop="10mm"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="10mm"> android:paddingVertical="10mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<TextView
android:id="@+id/tv_top_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="图号TH82739857"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:padding="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_top_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="图号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_top_card_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="来源仓库"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_dept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="可申请数量"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_apply_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="使用数量"
android:textColor="@color/flexible_text_sup"
android:textSize="16sp" />
<com.wd.workoffice.widget.AddAndReduceView
android:id="@+id/ar_use_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="置换产品信息"
android:layout_marginTop="10mm"
android:textColor="@color/black"
android:textSize="16sp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/view_add_cart_trading.xml
浏览文件 @ e10c8eb3
...@@ -48,11 +48,38 @@ ...@@ -48,11 +48,38 @@
android:text="选择置换产品" android:text="选择置换产品"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm"
android:gravity="center"
android:paddingVertical="5mm">
<EditText
android:id="@+id/et_key"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:paddingVertical="5mm"
android:paddingHorizontal="3mm"
android:hint="搜索置换产品"
android:textSize="14sp"
android:background="@drawable/shape_client_search" />
<TextView
android:id="@+id/iv_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingHorizontal="8mm"
android:text="搜索"
/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_pro" android:id="@+id/rv_pro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="200mm"
android:layout_marginTop="5mm" /> android:layout_marginTop="5mm" />
<LinearLayout <LinearLayout
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论