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

1.修改选择信息bug

2.//TODO (采购新增,设备采购-维修列表接口,新增维修的部门接口,接单显示规则),坩埚下单,下单时间选择器当前时间验证,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级 899f2bd0
......@@ -93,7 +93,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
private Integer clientId;
private BatChooseInfoPresenter batChooseInfoPresenter;
private List<String> processNameList = new ArrayList<>();
private List<ProcessBean> processList;
private List<ProcessBean> processList= new ArrayList<>();
private ProcessBean chooseProcess;
private QMUIDialog.MenuDialogBuilder processDialog;
private QMUIDialog.MenuDialogBuilder stockDialog;
......@@ -101,7 +101,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
private List<ProductBean.RecordsBean> carList = new ArrayList<>();
private Integer supplyId;
private Map<String, Object> stockParam;
private List<StockBean> stockList;
private List<StockBean> stockList =new ArrayList<>();
private List<String> stockNameList = new ArrayList<>();
private StockBean chooseStock;
Map<String, Object> carMap = new HashMap<>();
......@@ -114,8 +114,6 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
ButterKnife.bind(this);
batChooseInfoPresenter = new BatChooseInfoPresenter();
batChooseInfoPresenter.onAttach(this);
processDialog = DialogUtils.listDialog(this);
stockDialog = DialogUtils.listDialog(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
type = getIntent().getStringExtra("type");
changeView();
......@@ -257,7 +255,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
return super.onOptionsItemSelected(item);
}
if (chooseProcess == null) {
toast("请选择子流程");
toast("请选择关联仓库");
return super.onOptionsItemSelected(item);
}
break;
......@@ -271,7 +269,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
return super.onOptionsItemSelected(item);
}
if (chooseProcess == null) {
toast("请选择子流程");
toast("请选择关联仓库");
return super.onOptionsItemSelected(item);
}
break;
......@@ -404,6 +402,10 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
toast("请先选择客户");
return;
}
if (processList.size() == 0) {
toast("没有数据哦");
return;
}
processDialog.show();
break;
case "2":
......@@ -415,6 +417,10 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
toast("请先选择客户");
return;
}
if (processList.size() == 0) {
toast("没有数据哦");
return;
}
processDialog.show();
break;
case "3":
......@@ -422,14 +428,26 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
toast("请先选择供应商");
return;
}
if (stockList.size() == 0) {
toast("没有数据哦");
return;
}
stockDialog.show();
break;
case "4":
break;
case "5":
if (stockList.size() == 0) {
toast("没有数据哦");
return;
}
stockDialog.show();
break;
case "6":
if (stockList.size() == 0) {
toast("没有数据哦");
return;
}
stockDialog.show();
break;
}
......@@ -449,9 +467,11 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
switch (type) {
case "1":
param.put("transitPartId", clientId);
tvCommonContent.setText("");
batChooseInfoPresenter.getProcess(permissionCode, clientId);
break;
case "2":
tvCommonContent.setText("");
batChooseInfoPresenter.getProcess(permissionCode, clientId);
break;
case "3":
......@@ -463,6 +483,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
case "6":
break;
}
page = 1;
batChooseInfoPresenter.getPro(param);
}
break;
......@@ -476,10 +497,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
break;
case "2":
param.put("transitPartId", supplyId);
page = 1;
batChooseInfoPresenter.getPro(param);
break;
case "3":
param.put("transitPartId", supplyId);
page = 1;
batChooseInfoPresenter.getPro(param);
break;
case "4":
......@@ -501,6 +524,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
for (StockBean dep : dataList) {
stockNameList.add(dep.getName());
}
stockDialog = DialogUtils.listDialog(this);
stockDialog.addItems(stockNameList.toArray(new String[stockNameList.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
......@@ -537,11 +561,13 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
@Override
public void processList(List<ProcessBean> dataList) {
processList = dataList;
processList.clear();
processList.addAll(dataList);
processNameList.clear();
for (ProcessBean process : dataList) {
processNameList.add(process.getName());
}
processDialog = DialogUtils.listDialog(this);
processDialog.addItems(processNameList.toArray(new String[processNameList.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论