提交 95edff1e authored 作者: lgd's avatar lgd

1.退货

2.//TODO 设备三个子菜单,退件详情(审核历史(缺接口)),领用申请列表(数据不对),坩埚下单,mes其他页面,编辑任务担当无法修改.支数参数
上级 f77afcd0
......@@ -1531,6 +1531,44 @@ public interface ApiService {
@PUT("/enterStoreApply/fo/quality-inspection/audit/{id}")
Observable<BaseBean> enterFoStoreApplyList(@Path("id") String id, @Body RequestBody requestBody);
/**
* 部门管理员审核
*
* @return
*/
@PUT("/returnApply/so/audit/{applyId}")
Observable<BaseBean> soReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 业务部审核
*
* @return
*/
@PUT("/returnApply/so/audit/business/{applyId}")
Observable<BaseBean> soBusinessReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 业务部审核
*
* @return
*/
@PUT("/returnApply/so/audit/finance/{applyId}")
Observable<BaseBean> soFinanceReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 集团审核
*
* @return
*/
@PUT("/returnApply/so/audit/group/{applyId}")
Observable<BaseBean> soGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 集团审核
*
* @return
*/
@PUT("/returnApply/po/audit/group/{applyId}")
Observable<BaseBean> poGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 获取一个订单子表的全部流水
*
......
package com.wd.workoffice.ui.activity.bat.order;
import android.graphics.Color;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
......@@ -28,6 +29,7 @@ import org.greenrobot.eventbus.EventBus;
import java.util.Map;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
......@@ -79,18 +81,66 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
TextView tvRemark;
@BindView(R.id.rl_order)
RelativeLayout rlOrder;
@BindView(R.id.tv_top1)
TextView tvTop1;
@BindView(R.id.tv_top2)
TextView tvTop2;
@BindView(R.id.tv_top3)
TextView tvTop3;
@BindView(R.id.tv_top4)
TextView tvTop4;
@BindView(R.id.tv_top5)
TextView tvTop5;
@BindView(R.id.view_node1)
View viewNode1;
@BindView(R.id.view_line1)
View viewLine1;
@BindView(R.id.view_node2)
View viewNode2;
@BindView(R.id.view_line2)
View viewLine2;
@BindView(R.id.view_node3)
View viewNode3;
@BindView(R.id.view_line3)
View viewLine3;
@BindView(R.id.view_node4)
View viewNode4;
@BindView(R.id.view_line4)
View viewLine4;
@BindView(R.id.view_node5)
View viewNode5;
@BindView(R.id.view_line5)
View viewLine5;
@BindView(R.id.tv_dep1)
TextView tvDep1;
@BindView(R.id.tv_dep2)
TextView tvDep2;
@BindView(R.id.tv_dep3)
TextView tvDep3;
@BindView(R.id.tv_dep4)
TextView tvDep4;
@BindView(R.id.tv_dep5)
TextView tvDep5;
private ReturnApplyBean.RecordsBean info;
private String orderType;
@Override
protected void initView() {
ButterKnife.bind(this);
rvProcess.setLayoutManager(new GridLayoutManager(this, 5, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"), ReturnApplyBean.RecordsBean.class);
orderType = getIntent().getStringExtra("orderType");
changeView();
//ReturnProcessAdapter returnProcessAdapter =new ReturnProcessAdapter(R.layout.item_return_process,info.getStatus());
// returnProcessAdapter.bindToRecyclerView(rvProcess);
}
private void changeView() {
tvName.setText(info.getProductSimpleCode());
tvProName.setText(info.getProductName());
tvProCode.setText(info.getProductSoleCode());
......@@ -101,14 +151,127 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
tvTime.setText(info.getCreatedTime());
tvRemark.setText(String.valueOf(info.getApplyRemark()));
tvStatus.setText(WorkUtils.getReturnStatus(Integer.valueOf(info.getStatus())));
// if (TextUtils.equals(info.getStatus(), "0")) {
// llBottom.setVisibility(View.VISIBLE);
// llCheck.setVisibility(View.GONE);
// changePermission();
// } else {
// llBottom.setVisibility(View.GONE);
// llCheck.setVisibility(View.VISIBLE);
// }
changeProcess(info.getStatus());
changeCheckView(info.getStatus());
changePermission(info.getStatus());
}
/**
* 修改审核显示隐藏
*
* @param status
*/
private void changeCheckView(String status) {
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (status.startsWith("1") && !status.endsWith("4")) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
} else {
llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.GONE);
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (TextUtils.equals("0", status)) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
} else {
llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.GONE);
}
rlHistory.setVisibility(View.GONE);
llCheck.setVisibility(View.GONE);
}
}
/**
* 退件状态
* 10未审核
* 11 12 13 14已通过
* 21 22 23 24不通过
* (尾号1部门管理员 2业务部 3财务部 4集团,首数字1:通过,2:驳回)
*
* @param status
* @return
*/
private void changeProcess(String status) {
if (status.startsWith("1")) {
if (status.endsWith("1")) {
changeProcessView(viewNode2, viewLine2, 0);
changeProcessView(viewNode3, viewLine3, 1);
tvTop2.setText("通过");
tvTop3.setText("待审核");
} else if (status.endsWith("2")) {
changeProcessView(viewNode2, viewLine2, 0);
changeProcessView(viewNode3, viewLine3, 0);
changeProcessView(viewNode4, viewLine4, 1);
tvTop2.setText("通过");
tvTop3.setText("通过");
tvTop4.setText("待审核");
} else if (status.endsWith("3")) {
changeProcessView(viewNode2, viewLine2, 0);
changeProcessView(viewNode3, viewLine3, 0);
changeProcessView(viewNode4, viewLine4, 0);
changeProcessView(viewNode5, viewLine5, 1);
tvTop2.setText("通过");
tvTop3.setText("通过");
tvTop4.setText("通过");
tvTop5.setText("待审核");
} else if (status.endsWith("4")) {
changeProcessView(viewNode2, viewLine2, 0);
changeProcessView(viewNode3, viewLine3, 0);
changeProcessView(viewNode4, viewLine4, 0);
changeProcessView(viewNode5, viewLine5, 0);
tvTop2.setText("通过");
tvTop3.setText("通过");
tvTop4.setText("通过");
tvTop5.setText("通过");
}
} else if (status.startsWith("2")) {
if (status.endsWith("1")) {
changeProcessView(viewNode2, viewLine2, 1);
tvTop2.setText("驳回");
} else if (status.endsWith("2")) {
changeProcessView(viewNode2, viewLine2, 0);
changeProcessView(viewNode3, viewLine3, 1);
tvTop2.setText("通过");
tvTop3.setText("驳回");
} else if (status.endsWith("3")) {
changeProcessView(viewNode2, viewLine2, 0);
changeProcessView(viewNode3, viewLine3, 0);
changeProcessView(viewNode4, viewLine4, 1);
tvTop2.setText("通过");
tvTop3.setText("通过");
tvTop4.setText("驳回");
} else if (status.endsWith("4")) {
changeProcessView(viewNode2, viewLine2, 0);
changeProcessView(viewNode3, viewLine3, 0);
changeProcessView(viewNode4, viewLine4, 0);
changeProcessView(viewNode4, viewLine5, 1);
tvTop2.setText("通过");
tvTop3.setText("通过");
tvTop4.setText("通过");
tvTop5.setText("驳回");
}
}
}
/**
* status 1 变红
* 0 变蓝
*
* @param changeView
* @param changeLine
* @param status
*/
private void changeProcessView(View changeView, View changeLine, int status) {
if (status == 0) {
changeView.setBackgroundResource(R.drawable.shape_circle);
changeLine.setBackgroundColor(Color.parseColor("#5D99C4"));
} else {
changeView.setBackgroundResource(R.drawable.shape_red_circle);
changeLine.setBackgroundColor(getResources().getColor(R.color.flexible_gray_background));
}
}
......@@ -122,14 +285,22 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
}
private void changePermission() {
private void changePermission(String status) {
boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
if (status.startsWith("1")) {
if (status.endsWith("0")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_RETURN_EDIT_DEPT_ADMIN.getPermission());
} else if (status.endsWith("1")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_RETURN_EDIT_BUSINESS_DEPARTMENT.getPermission());
} else if (status.endsWith("2")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_RETURN_EDIT_FINANCE_DEPT.getPermission());
} else if (status.endsWith("3")) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_RETURN_EDIT_GROUP.getPermission());
}
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getPermission());
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT.getPermission());
}
......@@ -189,14 +360,27 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
private void check(int status, String remark, int id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("result", status);
param.put("comment", remark);
param.put("status", status == 1 ? Integer.valueOf(info.getStatus()) + 1 : Integer.valueOf(info.getStatus()) + 11);
param.put("productAmount", info.getProductAmount());
param.put("auditRemark", remark);
param.put("id", id);
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().enterFoStoreApplyList(id + "", WorkUtils.convertMapToBody(param));
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (info.getStatus().endsWith("0")) {
observable = RtfUtils.getRtf().soReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else if (info.getStatus().endsWith("1")) {
observable = RtfUtils.getRtf().soBusinessReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else if (info.getStatus().endsWith("2")) {
observable = RtfUtils.getRtf().soFinanceReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else if (info.getStatus().endsWith("3")) {
observable = RtfUtils.getRtf().soGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().soReturnApply(id + "", WorkUtils.convertMapToBody(param));
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().enterFoStoreApplyList(id + "", WorkUtils.convertMapToBody(param));
observable = RtfUtils.getRtf().soReturnApply(id + "", WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
......@@ -218,7 +402,9 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
}
toast("操作成功");
EventBus.getDefault().post(new CheckAddStockEvent());
finish();
int changeStatus = status == 1 ? Integer.valueOf(info.getStatus()) + 1 : Integer.valueOf(info.getStatus()) + 11;
info.setStatus(changeStatus + "");
changeView();
}
});
}
......@@ -245,16 +431,9 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
"identity", getIntent().getStringExtra("identity"),
"id", getIntent().getStringExtra("id"),
"status", getIntent().getStringExtra("status"));
} else {
}
break;
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import java.util.ArrayList;
import java.util.Arrays;
/**
* Created by flexible on 2018/8/13.
*/
public class ReturnProcessAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
private String status;
/**
* 财务状态
* 10未审核 11 12 13 14已通过 21 22 23 24不通过(尾号1部门管理员 2业务部 3财务部 4集团,首数字1:通过,2:驳回)
*
* @param code
* @return
*/
private String[] depArray = new String[]{"买家", "部门管理员", "业务员", "财务部", "集团"};
public ReturnProcessAdapter(int layoutResId, String status) {
super(layoutResId, new ArrayList<>());
this.status = status;
getData().addAll(Arrays.asList(depArray));
notifyDataSetChanged();
}
@Override
protected void convert(BaseViewHolder helper, String item) {
if (helper.getAdapterPosition() == 4) {
helper.setGone(R.id.iv_line, false);
}
helper.setText(R.id.tv_dep, item);
}
}
......@@ -269,7 +269,7 @@ public class WorkUtils {
}
/**
* 财务状态
* 退件状态
* 10未审核 11 12 13 14已通过 21 22 23 24不通过(尾号1部门管理员 2业务部 3财务部 4集团,首数字1:通过,2:驳回)
*
* @param code
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/flexible_gray_background" />
<corners android:radius="360mm" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/red" />
<corners android:radius="360mm" />
</shape>
\ No newline at end of file
......@@ -101,7 +101,16 @@
android:id="@+id/rv_process"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="10mm" />
android:paddingHorizontal="20mm"
android:paddingVertical="10mm"
android:visibility="gone" />
<include
android:id="@+id/ll_process"
layout="@layout/view_return_process"
android:layout_marginVertical="10mm"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
<View style="@style/ViewX" />
......@@ -246,7 +255,6 @@
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="-10mm"
android:text="发起请求"
android:textColor="#5D99C4"
android:textSize="12sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="4mm"
android:gravity="center_vertical">
<View
android:id="@+id/iv_simple"
android:layout_width="10mm"
android:layout_height="10mm"
android:background="@drawable/shape_circle" />
<View
android:id="@+id/iv_line"
style="@style/dividerX"
android:layout_width="match_parent"
android:layout_height="1mm"
android:background="#5D99C4" />
</LinearLayout>
<TextView
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="-10mm"
android:text="买家"
android:textColor="#5D99C4" />
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="20mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_top1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="发起退货"
android:textColor="#5D99C4"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_top2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingLeft="8mm"
android:textColor="#5D99C4"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_top3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingLeft="4mm"
android:textColor="#5D99C4"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_top4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="#5D99C4"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_top5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="#5D99C4"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="6mm"
android:layout_marginLeft="15mm">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical">
<View
android:id="@+id/view_node1"
android:layout_width="10mm"
android:layout_height="10mm"
android:background="@drawable/shape_circle" />
<View
android:id="@+id/view_line1"
style="@style/dividerX"
android:layout_width="match_parent"
android:layout_height="1mm"
android:background="#5D99C4" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical">
<View
android:id="@+id/view_node2"
android:layout_width="10mm"
android:layout_height="10mm"
android:background="@drawable/shape_circle_gray" />
<View
android:id="@+id/view_line2"
style="@style/dividerX"
android:layout_width="match_parent"
android:layout_height="1mm"
android:background="@color/flexible_gray_background" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical">
<View
android:id="@+id/view_node3"
android:layout_width="10mm"
android:layout_height="10mm"
android:background="@drawable/shape_circle_gray" />
<View
android:id="@+id/view_line3"
style="@style/dividerX"
android:layout_width="match_parent"
android:layout_height="1mm"
android:background="@color/flexible_gray_background" />/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical">
<View
android:id="@+id/view_node4"
android:layout_width="10mm"
android:layout_height="10mm"
android:background="@drawable/shape_circle_gray" />
<View
android:id="@+id/view_line4"
style="@style/dividerX"
android:layout_width="match_parent"
android:layout_height="1mm"
android:background="@color/flexible_gray_background" />
/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical">
<View
android:id="@+id/view_node5"
android:layout_width="10mm"
android:layout_height="10mm"
android:background="@drawable/shape_circle_gray" />
<View
android:id="@+id/view_line5"
style="@style/dividerX"
android:layout_width="match_parent"
android:layout_height="1mm"
android:background="@color/flexible_gray_background"
android:visibility="invisible" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5mm">
<TextView
android:id="@+id/tv_dep1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="买家"
android:paddingLeft="5mm"
android:textColor="#5D99C4"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_dep2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="部门管理员"
android:textColor="#5D99C4"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_dep3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="业务员"
android:textColor="#5D99C4"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_dep4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="财务部"
android:textColor="#5D99C4"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_dep5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="集团"
android:textColor="#5D99C4"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论