Skip to content

W
workoffice
提交 3b74d5a3 authored 作者: flexiblexd@163.com's avatar flexiblexd@163.com
浏览文件
操作

1.添加客户筛选

上级 12b23bde
隐藏空白字符变更
内嵌 并排
正在显示 包含 181 行增加 和 93 行删除
app/src/main/java/com/wd/workoffice/ui/activity/mes/MesProActivity.java
浏览文件 @ 3b74d5a3
......@@ -63,6 +63,7 @@ public class MesProActivity extends WorkToolBarActivity {
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
paramMap.put("customer",getIntent().getStringExtra("user"));
param.put("paramMap",paramMap);
param.put("pageNum", 1);
getData();
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/history/HistoryDetailActivity.java
浏览文件 @ 3b74d5a3
......@@ -558,35 +558,40 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add1:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add2:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add3:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add4:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add5:
if (userDataDetailBean == null) {
......@@ -602,7 +607,8 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.rl_add:
// startActivity(MesMiddleAddActivity.class);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ 3b74d5a3
......@@ -204,7 +204,8 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesThreeModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getProductList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getProductList().get(position))
,"user",data.getCustomerUserCode());
}
});
data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
......@@ -213,7 +214,8 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
// startActivity(MesSupplierActivity.class,
// "position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
startActivity(MesSupplierModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position))
,"user",data.getCustomerUserCode());
}
});
......@@ -221,14 +223,16 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesOtherSupplierModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position))
,"user",data.getCustomerUserCode());
}
});
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position))
,"user",data.getCustomerUserCode());
}
});
......@@ -245,14 +249,16 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesMiddleModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position))
,"user",data.getCustomerUserCode());
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position))
,"user",data.getCustomerUserCode());
}
});
}
......@@ -382,23 +388,28 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
break;
case R.id.tv_add7:
startActivity(MesSpeedAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add1:
startActivity(MesThreeAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add2:
startActivity(MesSupplierAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add3:
startActivity(MesOtherSupplierAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add4:
startActivity(MesPackageAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add5:
startActivity(MesStockAddActivity.class,
......@@ -407,11 +418,13 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
break;
case R.id.tv_add6:
startActivity(MesMiddleAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.rl_add:
startActivity(MesMiddleAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ 3b74d5a3
......@@ -306,27 +306,31 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position)));
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position))
,"user",data.getCustomerUserCode());
}
});
data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position))
,"user",data.getCustomerUserCode());
}
});
data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position)));
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position))
,"user",data.getCustomerUserCode());
}
});
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position)));
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position))
,"user",data.getCustomerUserCode());
}
});
......@@ -341,13 +345,15 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position))
,"user",data.getCustomerUserCode());
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position)));
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position))
,"user",data.getCustomerUserCode());
}
});
}
......@@ -372,28 +378,36 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
, "data", JSON.toJSONString(param));
break;
case R.id.tv_add1:
startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add2:
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add3:
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add4:
startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add5:
startActivity(MesStockAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesStockAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add6:
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add7:
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.rl_add:
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineModifyActivity.java
浏览文件 @ 3b74d5a3
......@@ -312,25 +312,29 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position)));
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position))
,"user",data.getCustomerUserCode());
}
});
data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position))
,"user",data.getCustomerUserCode());
}
});
data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position)));
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position))
,"user",data.getCustomerUserCode());
}
});
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position)));
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position))
,"user",data.getCustomerUserCode());
}
});
......@@ -345,13 +349,15 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position))
,"user",data.getCustomerUserCode());
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position)));
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position))
,"user",data.getCustomerUserCode());
}
});
}
......@@ -380,35 +386,40 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add7:
if (machineDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add2:
if (machineDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add3:
if (machineDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add4:
if (machineDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.tv_add5:
if (machineDetailBean == null) {
......@@ -425,7 +436,8 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
return;
}
startActivity(MesMiddleAddActivity.class, "continuousCasterCode",
data.getContinuousCasterCode());
data.getContinuousCasterCode()
, "user", data.getCustomerUserCode());
break;
case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesPackageAddActivity.java
浏览文件 @ 3b74d5a3
......@@ -185,7 +185,7 @@ public class MesPackageAddActivity extends WorkToolBarActivity {
addImg(3);
break;
case R.id.rl_pro:
startActivityForResult(MesProActivity.class, 10001);
startActivityForResult(MesProActivity.class, 10001,"user",getIntent().getStringExtra("user"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesPackageModifyActivity.java
浏览文件 @ 3b74d5a3
......@@ -298,7 +298,7 @@ public class MesPackageModifyActivity extends WorkToolBarActivity {
addImg(3);
break;
case R.id.rl_pro:
startActivityForResult(MesProActivity.class, 10001);
startActivityForResult(MesProActivity.class, 10001,"user",getIntent().getStringExtra("user"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSupplierAddActivity.java
浏览文件 @ 3b74d5a3
......@@ -155,7 +155,7 @@ public class MesSupplierAddActivity extends WorkToolBarActivity {
switch (view.getId()) {
case R.id.rl_pro_code:
startActivityForResult(MesProActivity.class, 10001
, "from", "1");
, "from", "1","user",getIntent().getStringExtra("user"));
break;
case R.id.rl_time:
PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSupplierModifyActivity.java
浏览文件 @ 3b74d5a3
......@@ -207,7 +207,7 @@ public class MesSupplierModifyActivity extends WorkToolBarActivity {
switch (view.getId()) {
case R.id.rl_pro_code:
startActivityForResult(MesProActivity.class, 10001
, "from", "1");
, "from", "1","user",getIntent().getStringExtra("user"));
break;
case R.id.rl_time:
PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesThreeAddActivity.java
浏览文件 @ 3b74d5a3
......@@ -216,7 +216,7 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
case R.id.rl_time:
break;
case R.id.rl_pro:
startActivityForResult(MesProActivity.class, 10001);
startActivityForResult(MesProActivity.class, 10001,"user",getIntent().getStringExtra("user"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesThreeModifyActivity.java
浏览文件 @ 3b74d5a3
......@@ -334,7 +334,7 @@ public class MesThreeModifyActivity extends WorkToolBarActivity {
case R.id.rl_time:
break;
case R.id.rl_pro:
startActivityForResult(MesProActivity.class, 10001);
startActivityForResult(MesProActivity.class, 10001,"user",getIntent().getStringExtra("user"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ 3b74d5a3
......@@ -560,35 +560,40 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add1:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add2:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add3:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add4:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add5:
if (userDataDetailBean == null) {
......@@ -604,7 +609,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.rl_add:
// startActivity(MesMiddleAddActivity.class);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailAddActivity.java
浏览文件 @ 3b74d5a3
......@@ -505,9 +505,11 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesThreeModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getProductList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getProductList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(dataParam.getProductList().get(position)));
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(dataParam.getProductList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
}
});
......@@ -516,9 +518,11 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesSupplierModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSupplyList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSupplyList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(dataParam.getSupplyList().get(position)));
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(dataParam.getSupplyList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
}
});
......@@ -527,9 +531,11 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesOtherSupplierModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getOtherSupList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getOtherSupList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(dataParam.getOtherSupList().get(position)));
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(dataParam.getOtherSupList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
}
});
......@@ -538,9 +544,11 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesPackageModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getOtherLadleList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getOtherLadleList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(dataParam.getOtherLadleList().get(position)));
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(dataParam.getOtherLadleList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
}
});
......@@ -565,9 +573,11 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesMiddleModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSettleList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSettleList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(dataParam.getSettleList().get(position)));
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(dataParam.getSettleList().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
}
});
......@@ -576,9 +586,11 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesSpeedModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSpeeds().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSpeeds().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(dataParam.getSpeeds().get(position)));
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(dataParam.getSpeeds().get(position))
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
}
});
......@@ -639,42 +651,52 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
case R.id.tv_add7:
if (TextUtils.equals("1", from)) {
startActivity(MesSpeedAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
break;
case R.id.tv_add1:
if (TextUtils.equals("1", from)) {
startActivity(MesThreeAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesThreeAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
startActivity(MesThreeAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
break;
case R.id.tv_add2:
if (TextUtils.equals("1", from)) {
startActivity(MesSupplierAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
break;
case R.id.tv_add3:
if (TextUtils.equals("1", from)) {
startActivity(MesOtherSupplierAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
// startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add4:
if (TextUtils.equals("1", from)) {
startActivity(MesPackageAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesPackageAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
startActivity(MesPackageAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
// startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
......@@ -695,9 +717,11 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
case R.id.tv_add6:
if (TextUtils.equals("1", from)) {
startActivity(MesMiddleAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "user", dataParam.getMainInfo().getCustomerUserCode());
}
// startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @ 3b74d5a3
......@@ -501,26 +501,30 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position)));
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position))
,"user",userDataDetailBean.getMainInfo().getCustomerUserCode());
}
});
data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position))
,"user",userDataDetailBean.getMainInfo().getCustomerUserCode());
}
});
data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position)));
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position))
,"user",userDataDetailBean.getMainInfo().getCustomerUserCode());
}
});
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position)));
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position))
,"user",userDataDetailBean.getMainInfo().getCustomerUserCode());
}
});
......@@ -535,13 +539,15 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position))
,"user",userDataDetailBean.getMainInfo().getCustomerUserCode());
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position)));
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position))
,"user",userDataDetailBean.getMainInfo().getCustomerUserCode());
}
});
}
......@@ -607,28 +613,32 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add2:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add3:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add4:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add5:
if (userDataDetailBean == null) {
......@@ -644,14 +654,16 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add7:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "user", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论