提交 a35c4fa7 authored 作者: lgd's avatar lgd

1.修改名称为退货/报废

上级 f8920a09
...@@ -386,7 +386,8 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -386,7 +386,8 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"), "orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(), "orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + ""); "productId", proList.get(position).getProductId() + "",
_TITLE,"退货/报废申请列表");
break; break;
case R.id.tv_flow: case R.id.tv_flow:
startActivity(ProFlowActivity.class, startActivity(ProFlowActivity.class,
......
...@@ -188,7 +188,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity { ...@@ -188,7 +188,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
String orderType = getIntent().getStringExtra("orderType"); String orderType = getIntent().getStringExtra("orderType");
String num = getIntent().getStringExtra("num"); String num = getIntent().getStringExtra("num");
if (Double.valueOf(num) == 0d) { if (Double.parseDouble(num) == 0d) {
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
......
...@@ -357,7 +357,8 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -357,7 +357,8 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"), "orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(), "orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + ""); "productId", proList.get(position).getProductId() + "",
_TITLE,"退货/报废申请列表");
break; break;
case R.id.tv_flow: case R.id.tv_flow:
startActivity(ProFlowActivity.class, startActivity(ProFlowActivity.class,
......
...@@ -49,6 +49,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -49,6 +49,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
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, MathUtils.converData(item.getProductCount(), 3)); helper.setText(R.id.tv_num, MathUtils.converData(item.getProductCount(), 3));
helper.setText(R.id.tv_return, "退货/报废");
// helper.setGone(R.id.rl_receive_order,true); // helper.setGone(R.id.rl_receive_order,true);
//// {"接单方生产", "接单方采购"}; //// {"接单方生产", "接单方采购"};
// if (!TextUtils.isEmpty(item.getProvideMethod())){ // if (!TextUtils.isEmpty(item.getProvideMethod())){
......
...@@ -40,6 +40,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O ...@@ -40,6 +40,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
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, MathUtils.converData(item.getProductCount(),3)); helper.setText(R.id.tv_num, MathUtils.converData(item.getProductCount(),3));
helper.setText(R.id.tv_return, "退货/报废");
if (!TextUtils.isEmpty(item.getAnnex())){ if (!TextUtils.isEmpty(item.getAnnex())){
helper.setText(R.id.tv_annex,"附件"); helper.setText(R.id.tv_annex,"附件");
// helper.setText(R.id.tv_annex,item.getAnnex().substring(1)); // helper.setText(R.id.tv_annex,item.getAnnex().substring(1));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论