Skip to content

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

1.修改订单显示状态 

2.提前结束添加列表审核
上级 1f9235c4
隐藏空白字符变更
内嵌 并排
正在显示 包含 209 行增加 和 28 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 5378a69e
......@@ -254,6 +254,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
}
flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems());
proAdapter.setStatus(dataBean.getStatus());
proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getReceiveDeptName());
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/EndApplyActivity.java
浏览文件 @ 5378a69e
......@@ -130,13 +130,6 @@ public class EndApplyActivity extends WorkToolBarActivity {
getData();
}
});
// dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
// @Override
// public void onLoadMoreRequested() {
// param.put("current", page);
// getData();
// }
// }, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
......@@ -145,6 +138,20 @@ public class EndApplyActivity extends WorkToolBarActivity {
"info", JSON.toJSONString(dataList.get(position)));
}
});
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.tv_refuse:
checkDialog(2, dataList.get(position).getId());
break;
case R.id.tv_agree:
checkDialog(1, dataList.get(position).getId());
break;
}
}
});
}
@Override
......@@ -173,14 +180,14 @@ public class EndApplyActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
checkDialog();
addDialog();
break;
}
return super.onOptionsItemSelected(item);
}
private void checkDialog() {
private void addDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
......@@ -199,7 +206,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
toast("请填写原因");
return;
}
check(etRemark.getText().toString());
add(etRemark.getText().toString());
addCartDialog.dismiss();
}
});
......@@ -213,7 +220,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
}
private void check(String remark) {
private void add(String remark) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("orderType", getIntent().getStringExtra("orderType"));
param.put("applyRemark", remark);
......@@ -269,4 +276,76 @@ public class EndApplyActivity extends WorkToolBarActivity {
public void refresh(CheckSendEvent event) {
getData();
}
private void checkDialog(int status,int id) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
tvDesc.setText(status == 1 ? "通过" : "拒绝");
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
check(status, etRemark.getText().toString(),id);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void check(int status, String remark ,int id) {
param.put("status", status);
param.put("auditRemark", remark);
param.put("id", id);
String orderType = getIntent().getStringExtra("orderType");
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().endSoCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().endPoCheck(id + "", WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().endSoCheck(id + "", WorkUtils.convertMapToBody(param));
}
observable.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;
}
toast("操作成功");
EventBus.getDefault().post(new CheckSendEvent());
EventBus.getDefault().post(new CheckOrderEvent());
finish();
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 5378a69e
......@@ -209,6 +209,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
}
flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems());
proAdapter.setStatus(dataBean.getStatus());
proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getReceiveDeptName());
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 5378a69e
......@@ -19,6 +19,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -29,6 +30,7 @@ import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
......@@ -198,8 +200,8 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
status = dataBean.getStatus();
changeView();
flowSheetList.clear();
flowList.clear();
flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size()<=3){
......@@ -209,7 +211,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
}
flowAdapter.notifyDataSetChanged();
proList.clear();
proList.addAll(dataBean.getOrderItems());
proAdapter.setAttr(dataBean.getAttr());
proAdapter.setStatus(dataBean.getStatus());
proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getCustomerName());
......@@ -574,5 +579,20 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
}
});
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(CheckSendEvent event) {
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @ 5378a69e
......@@ -15,6 +15,7 @@ import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ProductOrderDetailProductAdapter;
import com.wd.workoffice.util.MathUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -95,6 +96,7 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
}
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
proList.addAll(dataBean.getOrderItems());
proAdapter.setStatus(dataBean.getStatus());
proAdapter.notifyDataSetChanged();
tvStock.setText(dataBean.getExpandInfo().getOuterStoreName());
tvDep.setText(dataBean.getLaunchDeptName());
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ 5378a69e
......@@ -17,6 +17,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.OrderDetailProductAdapter;
......@@ -25,6 +26,7 @@ import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
......@@ -176,7 +178,8 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
if (dataBean != null && dataBean.getAttr() == 400) {
tvSendApply.setVisibility(View.GONE);
llBottom.setVisibility(View.GONE);
llApply.setVisibility(View.GONE);
}
break;
case 500:
......@@ -228,6 +231,8 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
return;
}
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
flowSheetList.clear();
flowList.clear();
flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size() <= 3) {
......@@ -237,8 +242,10 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
}
flowAdapter.notifyDataSetChanged();
proList.clear();
proList.addAll(dataBean.getOrderItems());
proAdapter.setStatus(dataBean.getStatus());
proAdapter.setAttr(dataBean.getAttr());
proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getCustomerName());
tvDep.setText(dataBean.getReceiveDeptName());
......@@ -501,9 +508,20 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(CheckSendEvent event) {
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/CruibleOrderDetailProductAdapter.java
浏览文件 @ 5378a69e
......@@ -30,11 +30,11 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getInnerPrice(),3)));
helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getInnerPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit());
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, MathUtils.converData(item.getProductCount(),3));
helper.setVisible(R.id.ll_from,false);
helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return);
......@@ -79,5 +79,13 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
helper.setGone(R.id.tv_add, false);
}
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/InsideOrderDetailProductAdapter.java
浏览文件 @ 5378a69e
......@@ -30,11 +30,11 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai
helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getInnerPrice(),3)));
helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getInnerPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit());
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, MathUtils.converData(item.getProductCount(),3));
helper.setGone(R.id.ll_from,false);
helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return);
......@@ -84,5 +84,13 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai
helper.setGone(R.id.tv_add, false);
}
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
浏览文件 @ 5378a69e
......@@ -17,6 +17,7 @@ import java.util.List;
public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
int status;
int attr;
public OrderDetailProductAdapter(int layoutResId, List data, Integer status) {
super(layoutResId, data);
......@@ -66,6 +67,9 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
break;
case 420:
helper.setGone(R.id.ll_btn, true);
if (attr==400){
helper.setGone(R.id.ll_btn, false);
}
break;
case 500:
helper.setGone(R.id.ll_btn, true);
......@@ -91,5 +95,12 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
}
}
public int getAttr() {
return attr;
}
public void setAttr(int attr) {
this.attr = attr;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java
浏览文件 @ 5378a69e
......@@ -17,7 +17,7 @@ import java.util.List;
public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
int status;
int attr;
public OutOrderDetailProductAdapter(int layoutResId, List data, Integer status) {
super(layoutResId, data);
this.status = status;
......@@ -34,7 +34,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getInnerPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit());
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, MathUtils.converData(item.getProductCount(),3));
helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow);
......@@ -51,11 +51,19 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
case 400:
case 410:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
case 420:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
if (attr==400){
helper.setGone(R.id.ll_btn, false);
}
break;
case 500:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
......@@ -73,5 +81,21 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
helper.setGone(R.id.tv_add, false);
}
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getAttr() {
return attr;
}
public void setAttr(int attr) {
this.attr = attr;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/ProductOrderDetailProductAdapter.java
浏览文件 @ 5378a69e
......@@ -30,11 +30,12 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getOuterPrice())));
helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getOuterPrice()),3)));
helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getOuterPrice(),3)));
helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(MathUtils.converData(item.getProductCount(),3),
MathUtils.converData(item.getOuterPrice(),3),3)));
helper.setText(R.id.tv_unit, item.getProductUnit());
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, MathUtils.converData(item.getProductCount(),3));
helper.setGone(R.id.ll_from,false);
helper.setGone(R.id.ll_annex,false);
helper.addOnClickListener(R.id.tv_get);
......@@ -53,5 +54,13 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
helper.setGone(R.id.tv_get, false);
}
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论