Skip to content

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

1.添加部门，接口未走通 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token
上级 9f0f65f5
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 61 行增加 和 35 行删除
app/src/main/java/com/wd/workoffice/bean/event/AddDepEvent.java
浏览文件 @ f3d987c6
package com.wd.workoffice.bean.event;
import com.wd.workoffice.bean.DepBean;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class AddDepEvent {
DepBean depBean;
public AddDepEvent() {
public AddDepEvent(DepBean depBean) {
this.depBean = depBean;
}
public DepBean getDepBean() {
return depBean;
}
public void setDepBean(DepBean depBean) {
this.depBean = depBean;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/login/UserRegisterDepActivity.java
浏览文件 @ f3d987c6
package com.wd.workoffice.ui.activity.login;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -19,10 +15,8 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.event.AddDepEvent;
import com.wd.workoffice.bean.event.CheckAddStockEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.SendApplyAddActivity;
import com.wd.workoffice.ui.adapter.WorkChooseDepAdapter;
import org.greenrobot.eventbus.EventBus;
......@@ -30,7 +24,6 @@ import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
......@@ -112,6 +105,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity {
Intent intent = new Intent();
intent.putExtra("depName", dataList.get(position).getName());
intent.putExtra("depId", dataList.get(position).getId());
intent.putExtra("dep", JSON.toJSONString(dataList.get(position)));
setResult(10001, intent);
finish();
}
......@@ -122,6 +116,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity {
protected int layoutId() {
return R.layout.activity_register_dep;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu);
......@@ -137,6 +132,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity {
}
return super.onOptionsItemSelected(item);
}
@Override
public void onStart() {
super.onStart();
......@@ -151,6 +147,7 @@ public class UserRegisterDepActivity extends WorkToolBarActivity {
@Subscribe
public void refresh(AddDepEvent event) {
getData();
dataList.add(0, event.getDepBean());
dataAdapter.notifyDataSetChanged();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/login/UserRegisterDepAddActivity.java
浏览文件 @ f3d987c6
......@@ -12,6 +12,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.event.AddDepEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -53,7 +54,7 @@ public class UserRegisterDepAddActivity extends WorkToolBarActivity {
typeDialog.addItems(type, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseType = which+1;
chooseType = which + 1;
tvType.setText(type[which]);
dialog.dismiss();
}
......@@ -85,29 +86,37 @@ public class UserRegisterDepAddActivity extends WorkToolBarActivity {
param.put("type", chooseType);
param.put("name", name);
param.put("code", code);
RtfUtils.getRtf().addDep(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;
}
EventBus.getDefault().post(new AddDepEvent());
toast("添加成功");
finish();
}
});
DepBean depBean = new DepBean();
depBean.setType(chooseType);
depBean.setName(name);
depBean.setCode(code);
depBean.setOfRegisterNewDept(1);
EventBus.getDefault().post(new AddDepEvent(depBean));
finish();
// RtfUtils.getRtf().addDep(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;
// }
// EventBus.getDefault().post(new AddDepEvent());
// toast("添加成功");
// finish();
// }
// });
}
......
app/src/main/java/com/wd/workoffice/ui/activity/login/UserRegisterThreeActivity.java
浏览文件 @ f3d987c6
......@@ -10,6 +10,7 @@ import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean;
......@@ -53,6 +54,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us
private int chooseDep = -1;
private AlertDialog.Builder builder;
private Integer depId;
private DepBean dep;
@Override
protected void initView() {
......@@ -126,7 +128,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us
startActivityForResult(UserRegisterDepActivity.class, 10001);
break;
case R.id.btn_submit:
if (depId == null) {
if (dep == null) {
toast("请选择部门");
return;
}
......@@ -137,7 +139,14 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us
param.put("email", etEmail.getText().toString());
param.put("phone", getIntent().getStringExtra("phone"));
// param.put("erpId", "");
param.put("deptId", depId);
param.put("ofRegisterNewDept", dep.getOfRegisterNewDept());
if (dep.getOfRegisterNewDept()==1){
param.put("newDeptName", dep.getName());
param.put("newDeptErpId", dep.getCode());
param.put("newDeptType", dep.getType());
}else {
param.put("deptId", dep.getId());
}
param.put("verifyCode", getIntent().getStringExtra("code"));
userRegisterThreePresenter.register(param);
break;
......@@ -179,6 +188,7 @@ public class UserRegisterThreeActivity extends WorkToolBarActivity implements Us
String depName = data.getStringExtra("depName");
depId = data.getIntExtra("id", 0);
tvProductContent.setText(depName);
dep = JSON.parseObject(data.getStringExtra("dep"), DepBean.class);
}
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论