提交 885a5e88 authored 作者: lgd's avatar lgd

1.添加接受逻辑

2.//TODO ,退件详情(top流程图,审核历史),内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,编辑任务担当无法修改.支数参数
上级 60ce1ea2
...@@ -1477,6 +1477,43 @@ public interface ApiService { ...@@ -1477,6 +1477,43 @@ public interface ApiService {
@PUT("/enterStoreApply/io/audit/{id}") @PUT("/enterStoreApply/io/audit/{id}")
Observable<BaseBean> addIoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody); Observable<BaseBean> addIoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
* step3-接单
*
* @return
*/
@PUT("/insideOrder/apply/{orderId}")
Observable<BaseBean> insideOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
* step3-接单
*
* @return
*/
@PUT("/saleOrder/apply/{orderId}")
Observable<BaseBean> saleOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
* step3-接单
*
* @return
*/
@PUT("/supplierOrder/apply/{orderId}")
Observable<BaseBean> supplierOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
* step3-接单
*
* @return
*/
@PUT("/crucible/apply/{orderId}")
Observable<BaseBean> crucibleApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/**
* step3-接单
*
* @return
*/
@PUT("/purchaseOrder/apply/{orderId}")
Observable<BaseBean> purchaseOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
/** /**
* 质检申请列表 * 质检申请列表
* *
......
...@@ -146,6 +146,12 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -146,6 +146,12 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
} }
break; break;
case 200: case 200:
if (WorkUtils.orderReceivePermission(6,dataBean.getReceiveDeptId())){
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
tvRefuse.setText("拒单");
}
break; break;
case 300: case 300:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
...@@ -328,10 +334,18 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -328,10 +334,18 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.tv_refuse: case R.id.tv_refuse:
if (status==200){
checkReceiveDialog(2,dataBean.getId());
}else {
checkDialog(2); checkDialog(2);
}
break; break;
case R.id.tv_agree: case R.id.tv_agree:
if (status==200){
checkReceiveDialog(1,dataBean.getId());
}else {
checkDialog(1); checkDialog(1);
}
break; break;
case R.id.tv_finish_apply: case R.id.tv_finish_apply:
if (dataBean == null) { if (dataBean == null) {
...@@ -430,4 +444,83 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -430,4 +444,83 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
private void checkReceiveDialog(int status, String 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);
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注");
return;
}
checkReceive(status, etRemark.getText().toString(), id);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void checkReceive(int status, String remark, String id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("result", status);
param.put("comment", remark);
param.put("id", id);
RtfUtils.getRtf().crucibleApplyCheck(id + "", WorkUtils.convertMapToBody(param)).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 CheckOrderEvent());
llBottom.setVisibility(View.GONE);
finish();
}
});
}
} }
...@@ -128,8 +128,12 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -128,8 +128,12 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
} }
break; break;
case 200: case 200:
// llBottom.setVisibility(View.VISIBLE); if (WorkUtils.orderReceivePermission(4,dataBean.getReceiveDeptId())){
// llCheck.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
tvRefuse.setText("拒单");
}
break; break;
case 300: case 300:
break; break;
...@@ -287,10 +291,18 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -287,10 +291,18 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.tv_refuse: case R.id.tv_refuse:
if (status==200){
checkReceiveDialog(2,dataBean.getId());
}else {
checkDialog(2); checkDialog(2);
}
break; break;
case R.id.tv_agree: case R.id.tv_agree:
if (status==200){
checkReceiveDialog(1,dataBean.getId());
}else {
checkDialog(1); checkDialog(1);
}
break; break;
case R.id.tv_finish_apply: case R.id.tv_finish_apply:
if (dataBean == null) { if (dataBean == null) {
...@@ -390,10 +402,82 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -390,10 +402,82 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
}); });
} }
private void checkReceiveDialog(int status, String 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);
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { public void onTextChanged(CharSequence s, int start, int before, int count) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation }
ButterKnife.bind(this);
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注");
return;
}
checkReceive(status, etRemark.getText().toString(), id);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void checkReceive(int status, String remark, String id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("result", status);
param.put("comment", remark);
param.put("id", id);
RtfUtils.getRtf().insideOrderApplyCheck(id + "", WorkUtils.convertMapToBody(param)).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 CheckOrderEvent());
llBottom.setVisibility(View.GONE);
finish();
}
});
} }
} }
...@@ -18,7 +18,9 @@ import com.wd.workoffice.R; ...@@ -18,7 +18,9 @@ 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.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckAddStockEvent;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
...@@ -40,6 +42,7 @@ import butterknife.BindView; ...@@ -40,6 +42,7 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
/** /**
...@@ -226,6 +229,12 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -226,6 +229,12 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
} }
break; break;
case 200: case 200:
if (WorkUtils.orderReceivePermission(2, dataBean.getReceiveDeptId())) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
tvRefuse.setText("拒单");
}
break; break;
case 300: case 300:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
...@@ -327,10 +336,18 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -327,10 +336,18 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
settingDialog.show(); settingDialog.show();
break; break;
case R.id.tv_refuse: case R.id.tv_refuse:
if (status==200){
checkReceiveDialog(2,dataBean.getId());
}else {
checkDialog(2); checkDialog(2);
}
break; break;
case R.id.tv_agree: case R.id.tv_agree:
if (status==200){
checkReceiveDialog(1,dataBean.getId());
}else {
checkDialog(1); checkDialog(1);
}
break; break;
case R.id.tv_finish_apply: case R.id.tv_finish_apply:
if (dataBean == null) { if (dataBean == null) {
...@@ -468,4 +485,84 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -468,4 +485,84 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
}); });
} }
private void checkReceiveDialog(int status, String 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);
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注");
return;
}
checkReceive(status, etRemark.getText().toString(), id);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void checkReceive(int status, String remark, String id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("result", status);
param.put("comment", remark);
param.put("id", id);
RtfUtils.getRtf().purchaseOrderApplyCheck(id + "", WorkUtils.convertMapToBody(param)).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 CheckOrderEvent());
llBottom.setVisibility(View.GONE);
finish();
}
});
}
} }
...@@ -149,6 +149,12 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -149,6 +149,12 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
} }
break; break;
case 200: case 200:
if (WorkUtils.orderReceivePermission(1,dataBean.getReceiveDeptId())){
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
tvRefuse.setText("拒单");
}
break; break;
case 300: case 300:
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
...@@ -302,10 +308,18 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -302,10 +308,18 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.tv_refuse: case R.id.tv_refuse:
if (status==200){
checkReceiveDialog(2,dataBean.getId());
}else {
checkDialog(2); checkDialog(2);
}
break; break;
case R.id.tv_agree: case R.id.tv_agree:
if (status==200){
checkReceiveDialog(1,dataBean.getId());
}else {
checkDialog(1); checkDialog(1);
}
break; break;
case R.id.tv_finish_apply: case R.id.tv_finish_apply:
if (dataBean == null) { if (dataBean == null) {
...@@ -405,4 +419,83 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -405,4 +419,83 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
private void checkReceiveDialog(int status, String 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);
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注");
return;
}
checkReceive(status, etRemark.getText().toString(), id);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void checkReceive(int status, String remark, String id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("result", status);
param.put("comment", remark);
param.put("id", id);
RtfUtils.getRtf().saleOrderApplyCheck(id + "", WorkUtils.convertMapToBody(param)).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 CheckOrderEvent());
llBottom.setVisibility(View.GONE);
}
});
}
} }
...@@ -141,6 +141,12 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity { ...@@ -141,6 +141,12 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
} }
break; break;
case 200: case 200:
if (WorkUtils.orderReceivePermission(3, dataBean.getReceiveDeptId())) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
tvRefuse.setText("拒单");
}
break; break;
case 300: case 300:
break; break;
...@@ -302,10 +308,18 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity { ...@@ -302,10 +308,18 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.tv_refuse: case R.id.tv_refuse:
if (status==200){
checkReceiveDialog(2,dataBean.getId());
}else {
checkDialog(2); checkDialog(2);
}
break; break;
case R.id.tv_agree: case R.id.tv_agree:
if (status==200){
checkReceiveDialog(1,dataBean.getId());
}else {
checkDialog(1); checkDialog(1);
}
break; break;
case R.id.tv_finish_apply: case R.id.tv_finish_apply:
if (dataBean == null) { if (dataBean == null) {
...@@ -405,5 +419,81 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity { ...@@ -405,5 +419,81 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
private void checkReceiveDialog(int status, String 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);
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvNum.setText(s.length() + "/140");
}
});
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注");
return;
}
checkReceive(status, etRemark.getText().toString(), id);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void checkReceive(int status, String remark, String id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("result", status);
param.put("comment", remark);
param.put("id", id);
RtfUtils.getRtf().supplierOrderApplyCheck(id + "", WorkUtils.convertMapToBody(param)).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 CheckOrderEvent());
llBottom.setVisibility(View.GONE);
}
});
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论