Skip to content

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

1.修改列表刷新bug，修改跳转bug，修改编辑详情bug 

2.添加刪除
上级 37219f51
显示空白字符变更
内嵌 并排
正在显示 包含 382 行增加 和 42 行删除
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 52acac03
......@@ -224,13 +224,29 @@ public interface MesApiService {
Observable<BaseMesBean> threeAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* otherSupplierAdd
* 连铸三大件单独新增 删除
*
* @return
*/
@GET("/himes/api/msContinuousProducts/delete/{id}.json")
Observable<BaseMesBean> threeDelete(@Path("id") String id,@Query("functionId") String functionId);
/**
* 其他供应商供货三大件
*
* @return
*/
@POST("/himes/api/msSupplierSupply/save.json")
Observable<BaseMesBean> otherSupplierAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* 其他供应商供货三大件 刪除
*
* @return
*/
@GET("/himes/api/msSupplierSupply/delete/{id}.json")
Observable<BaseMesBean> otherSupplierDelete(@Path("id") String id, @Query("functionId") String functionId);
/**
* otherSupplierAdd
*
......@@ -241,16 +257,23 @@ public interface MesApiService {
/**
* otherSupplierAdd
* 三大件供货记录表
*
* @return
*/
@POST("/himes/api/msSupplyRecord/save.json")
Observable<BaseMesBean> supplierAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* 三大件供货记录表
*
* @return
*/
@GET("/himes/api/msSupplyRecord/delete/{id}.json")
Observable<BaseMesBean> supplierDelete( @Path("id") String id,@Query("functionId") String functionId);
/**
* otherSupplierAdd
* 中间包承包与结算
*
* @return
*/
......@@ -258,12 +281,28 @@ public interface MesApiService {
Observable<BaseMesBean> middleAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* otherSupplierAdd
* 中间包承包与结算 删除
*
* @return
*/
@GET("/himes/api/msContractAndSettlement/delete/{id}.json")
Observable<BaseMesBean> middleDelete(@Path("id")String id ,@Query("functionId") String functionId);
/**
*拉速信息
*
* @return
*/
@POST("/himes/api/msContinuousCasterSpeed/save.json")
Observable<BaseMesBean> speedAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* 拉速信息 删除
*
* @return
*/
@GET("/himes/api/msContinuousCasterSpeed/delete/{id}.json")
Observable<BaseMesBean> speedDelete(@Path("id") String id, @Query("functionId") String functionId);
/**
......@@ -298,13 +337,21 @@ public interface MesApiService {
Observable<BaseMesBean> canModify(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* otherSupplierAdd
* 三大件库存记录
*
* @return
*/
@POST("/himes/api/msStockRecord/save.json")
Observable<BaseMesBean> stockAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* 三大件库存记录 删除
*
* @return
*/
@GET("/himes/api/msStockRecord/delete/{id}.json")
Observable<BaseMesBean> stockDelete(@Path("id") String id,
@Query("functionId") String functionId);
/**
* 审核接口
......@@ -339,6 +386,14 @@ public interface MesApiService {
@GET("/himes/api/msLadleRefractoryRecord/show/{id}.json")
Observable<BaseMesBean> packageDetail(@Path("id") String id, @Query("functionId") String functionId);
/**
* 其他中包耐材记录 刪除
*
* @return
*/
@GET("/himes/api/msLadleRefractoryRecord/delete/{id}.json")
Observable<BaseMesBean> packageDelete(@Path("id") String id, @Query("functionId") String functionId);
/**
* 炼钢厂保存、更新
*
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ 52acac03
......@@ -236,7 +236,9 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesStockModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
"position", position + "", "from", "1",
"data", JSON.toJSONString(machineDetailBean.getStockList().get(position))
, "id", data.getCustomerUserCode());
}
});
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ 52acac03
......@@ -333,7 +333,9 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesStockModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
startActivity(MesStockModifyActivity.class,
"id",data.getCustomerUserCode(),
"data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
}
});
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineModifyActivity.java
浏览文件 @ 52acac03
......@@ -267,44 +267,44 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
}
data1Adapter.notifyDataSetChanged();
}
data1Adapter.notifyDataSetChanged();
if (machineDetailBean.getSupplyList() != null) {
for (MachineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
data2List.add(productListBean.getProductsName());
}
data2Adapter.notifyDataSetChanged();
}
data2Adapter.notifyDataSetChanged();
if (machineDetailBean.getOtherSupList() != null) {
for (MachineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
data3List.add(productListBean.getSupplierName());
}
data3Adapter.notifyDataSetChanged();
}
data3Adapter.notifyDataSetChanged();
if (machineDetailBean.getOtherLadleList() != null) {
for (MachineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
data4List.add(productListBean.getRefractoryName());
}
data4Adapter.notifyDataSetChanged();
}
data4Adapter.notifyDataSetChanged();
if (machineDetailBean.getStockList() != null) {
for (MachineDetailBean.StockListBean productListBean : machineDetailBean.getStockList()) {
data5List.add(productListBean.getProductsName());
}
data5Adapter.notifyDataSetChanged();
}
data5Adapter.notifyDataSetChanged();
if (machineDetailBean.getSettleList() != null) {
for (MachineDetailBean.SettleListBean productListBean : machineDetailBean.getSettleList()) {
data6List.add(productListBean.getSettlementMethod());
}
data6Adapter.notifyDataSetChanged();
}
data6Adapter.notifyDataSetChanged();
if (machineDetailBean.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
data7List.add(productListBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
data7Adapter.notifyDataSetChanged();
}
@Override
......@@ -337,7 +337,9 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesStockModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
startActivity(MesStockModifyActivity.class,
"id",data.getCustomerUserCode(),
"data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
}
});
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
......@@ -346,6 +348,12 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
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)));
}
});
}
@Override
......@@ -354,7 +362,7 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
}
@OnClick({R.id.rl_cover4, R.id.rl_protection4,
@OnClick({R.id.rl_cover4, R.id.rl_protection4,R.id.tv_add2,
R.id.tv_add7, R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4})
public void onViewClicked(View view) {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleModifyActivity.java
浏览文件 @ 52acac03
......@@ -72,20 +72,56 @@ public class MesMiddleModifyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(from, "1")) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
}else{
getMenuInflater().inflate(R.menu.menu_finish_delete, menu);
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
case R.id.delete:
delete();
break;
}
return super.onOptionsItemSelected(item);
}
private void delete() {
RtfUtils.getMesRtf().middleDelete(dataBean.getId(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("刪除成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
private void submit() {
String middleStatus = etMiddleStatus.getText().toString();
String threeStatus = etThreeStatus.getText().toString();
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesOtherSupplierModifyActivity.java
浏览文件 @ 52acac03
......@@ -201,6 +201,32 @@ public class MesOtherSupplierModifyActivity extends WorkToolBarActivity {
});
}
private void delete() {
RtfUtils.getMesRtf().otherSupplierDelete(dataBean.getId(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("刪除成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void initEvent() {
}
......@@ -213,16 +239,25 @@ public class MesOtherSupplierModifyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(from, "1")) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
}else{
getMenuInflater().inflate(R.menu.menu_finish_delete, menu);
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
case R.id.delete:
delete();
break;
}
return super.onOptionsItemSelected(item);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesPackageModifyActivity.java
浏览文件 @ 52acac03
......@@ -222,6 +222,33 @@ public class MesPackageModifyActivity extends WorkToolBarActivity {
});
}
private void delete() {
RtfUtils.getMesRtf().packageDelete(dataBean.getId(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("刪除成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void initEvent() {
}
......@@ -234,16 +261,25 @@ public class MesPackageModifyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(from, "1")) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
}else{
getMenuInflater().inflate(R.menu.menu_finish_delete, menu);
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
case R.id.delete:
delete();
break;
}
return super.onOptionsItemSelected(item);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSpeedModifyActivity.java
浏览文件 @ 52acac03
......@@ -147,6 +147,31 @@ public class MesSpeedModifyActivity extends WorkToolBarActivity {
}
});
}
private void delete() {
RtfUtils.getMesRtf().speedDelete(machineDetailBean.getId(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("刪除成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void initEvent() {
......@@ -160,16 +185,25 @@ public class MesSpeedModifyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(from, "1")) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
}else{
getMenuInflater().inflate(R.menu.menu_finish_delete, menu);
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
case R.id.delete:
delete();
break;
}
return super.onOptionsItemSelected(item);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesStockModifyActivity.java
浏览文件 @ 52acac03
......@@ -90,7 +90,12 @@ public class MesStockModifyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(from, "1")) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
}else{
getMenuInflater().inflate(R.menu.menu_finish_delete, menu);
}
return super.onCreateOptionsMenu(menu);
}
......@@ -100,6 +105,9 @@ public class MesStockModifyActivity extends WorkToolBarActivity {
case R.id.finish:
submit();
break;
case R.id.delete:
delete();
break;
}
return super.onOptionsItemSelected(item);
}
......@@ -147,6 +155,32 @@ public class MesStockModifyActivity extends WorkToolBarActivity {
});
}
private void delete() {
RtfUtils.getMesRtf().stockDelete(dataBean.getId(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("刪除成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
......@@ -160,6 +194,6 @@ public class MesStockModifyActivity extends WorkToolBarActivity {
@OnClick(R.id.rl_pro)
public void onViewClicked() {
startActivityForResult(MesTicketProActivity.class, 10001);
startActivityForResult(MesUserProActivity.class, 10001, "id", getIntent().getStringExtra("id"));
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSupplierActivity.java
浏览文件 @ 52acac03
......@@ -41,7 +41,7 @@ public class MesSupplierActivity extends WorkToolBarActivity {
tvCode.setText(data.getProductsCode());
tvImgCode.setText(data.getFigureNumber ());
tvName.setText(data.getProductsName());
tvSendNum.setText(data.getDeliveryNumber());
tvSendNum.setText(data.getDeliveryNumber()+"");
tvSendTime.setText(TimeUtils.millis2String(data.getDeliveryDateTime()/1000));
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSupplierModifyActivity.java
浏览文件 @ 52acac03
package com.wd.workoffice.ui.activity.mes.user;
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.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -57,7 +57,7 @@ public class MesSupplierModifyActivity extends WorkToolBarActivity {
@BindView(R.id.rl_time)
RelativeLayout rlTime;
@BindView(R.id.tv_send_num)
EditText tvSendNum;
TextView tvSendNum;
private Map<String, Object> param;
private MesProBean.ListBean choosePro;
private String from;
......@@ -84,7 +84,7 @@ public class MesSupplierModifyActivity extends WorkToolBarActivity {
tvName.setText(choosePro.getProductName());
tvImgCode.setText(choosePro.getDrawingNumber());
}
tvSendNum.setText(dataBean.getDeliveryNumber());
tvSendNum.setText(dataBean.getDeliveryNumber()+"");
tvSendTime.setText(TimeUtils.millis2String(dataBean.getDeliveryDateTime() / 1000));
}
......@@ -126,6 +126,32 @@ public class MesSupplierModifyActivity extends WorkToolBarActivity {
});
}
private void delete() {
RtfUtils.getMesRtf().supplierDelete(dataBean.getId(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("刪除成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void initEvent() {
}
......@@ -138,16 +164,25 @@ public class MesSupplierModifyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(from, "1")) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
} else {
getMenuInflater().inflate(R.menu.menu_finish_delete, menu);
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
case R.id.delete:
delete();
break;
}
return super.onOptionsItemSelected(item);
}
......@@ -186,4 +221,5 @@ public class MesSupplierModifyActivity extends WorkToolBarActivity {
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesThreeModifyActivity.java
浏览文件 @ 52acac03
......@@ -257,6 +257,33 @@ public class MesThreeModifyActivity extends WorkToolBarActivity {
});
}
private void delete() {
RtfUtils.getMesRtf().threeDelete(dataBean.getId(), "1").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("刪除成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void initEvent() {
}
......@@ -269,16 +296,24 @@ public class MesThreeModifyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (TextUtils.equals(from, "1")) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
}else{
getMenuInflater().inflate(R.menu.menu_finish_delete, menu);
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
case R.id.delete:
delete();
break;
}
return super.onOptionsItemSelected(item);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ 52acac03
......@@ -19,6 +19,7 @@ import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.ModifyUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
......@@ -735,4 +736,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
getData();
}
@Subscribe
public void refresh(RefreshMachineEvent event) {
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailAddActivity.java
浏览文件 @ 52acac03
......@@ -435,44 +435,44 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
for (MachineDetailBean.ProductListBean productListBean : dataParam.getProductList()) {
data1List.add(productListBean.getProductsName());
}
data1Adapter.notifyDataSetChanged();
}
data1Adapter.notifyDataSetChanged();
if (dataParam.getSupplyList() != null) {
for (MachineDetailBean.SupplyListBean productListBean : dataParam.getSupplyList()) {
data2List.add(productListBean.getProductsName());
}
data2Adapter.notifyDataSetChanged();
}
data2Adapter.notifyDataSetChanged();
if (dataParam.getOtherSupList() != null) {
for (MachineDetailBean.OtherSupListBean productListBean : dataParam.getOtherSupList()) {
data3List.add(productListBean.getSupplierName());
}
data3Adapter.notifyDataSetChanged();
}
data3Adapter.notifyDataSetChanged();
if (dataParam.getOtherLadleList() != null) {
for (MachineDetailBean.OtherLadleListBean productListBean : dataParam.getOtherLadleList()) {
data4List.add(productListBean.getRefractoryName());
}
data4Adapter.notifyDataSetChanged();
}
data4Adapter.notifyDataSetChanged();
if (dataParam.getStockList() != null) {
for (MachineDetailBean.StockListBean productListBean : dataParam.getStockList()) {
data5List.add(productListBean.getProductsName());
}
data5Adapter.notifyDataSetChanged();
}
data5Adapter.notifyDataSetChanged();
if (dataParam.getSettleList() != null) {
for (MachineDetailBean.SettleListBean productListBean : dataParam.getSettleList()) {
data6List.add(productListBean.getSettlementMethod());
}
data6Adapter.notifyDataSetChanged();
}
data6Adapter.notifyDataSetChanged();
if (dataParam.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean speedsBean : dataParam.getSpeeds()) {
data7List.add(speedsBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
data7Adapter.notifyDataSetChanged();
}
@Override
......@@ -562,9 +562,14 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesStockModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getStockList().get(position)));
"position", position + "",
"from", "1",
"id",dataParam.getMainInfo().getCustomerUserCode(),
"data", JSON.toJSONString(dataParam.getStockList().get(position)));
} else {
startActivity(MesStockModifyActivity.class, "data", JSON.toJSONString(dataParam.getStockList().get(position)));
startActivity(MesStockModifyActivity.class,
"id",dataParam.getMainInfo().getCustomerUserCode(),
"data", JSON.toJSONString(dataParam.getStockList().get(position)));
}
}
});
......@@ -584,9 +589,9 @@ 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.getSettleList().get(position)));
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSpeeds().get(position)));
} else {
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(dataParam.getSettleList().get(position)));
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(dataParam.getSpeeds().get(position)));
}
}
});
......@@ -600,7 +605,7 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
@OnClick({R.id.tv_factory_add1, R.id.tv_factory_add2, R.id.tv_factory_add3,
R.id.rl_cover4, R.id.rl_protection4, R.id.iv_modify_client,
R.id.iv_modify_machine, R.id.iv_modify_steel,
R.id.tv_add7, R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add7, R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add2, R.id.tv_add3,
R.id.tv_add4, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection})
public void onViewClicked(View view) {
String from = getIntent().getStringExtra("from");//1 .多步骤新增（同时新增）
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @ 52acac03
......@@ -435,44 +435,44 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
}
data1Adapter.notifyDataSetChanged();
}
data1Adapter.notifyDataSetChanged();
if (machineDetailBean.getSupplyList() != null) {
for (MachineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
data2List.add(productListBean.getProductsName());
}
data2Adapter.notifyDataSetChanged();
}
data2Adapter.notifyDataSetChanged();
if (machineDetailBean.getOtherSupList() != null) {
for (MachineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
data3List.add(productListBean.getSupplierName());
}
data3Adapter.notifyDataSetChanged();
}
data3Adapter.notifyDataSetChanged();
if (machineDetailBean.getOtherLadleList() != null) {
for (MachineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
data4List.add(productListBean.getRefractoryName());
}
data4Adapter.notifyDataSetChanged();
}
data4Adapter.notifyDataSetChanged();
if (machineDetailBean.getStockList() != null) {
for (MachineDetailBean.StockListBean productListBean : machineDetailBean.getStockList()) {
data5List.add(productListBean.getProductsName());
}
data5Adapter.notifyDataSetChanged();
}
data5Adapter.notifyDataSetChanged();
if (machineDetailBean.getSettleList() != null) {
for (MachineDetailBean.SettleListBean productListBean : machineDetailBean.getSettleList()) {
data6List.add(productListBean.getSettlementMethod());
}
data6Adapter.notifyDataSetChanged();
}
data6Adapter.notifyDataSetChanged();
if (machineDetailBean.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
data7List.add(productListBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
data7Adapter.notifyDataSetChanged();
}
@Override
......@@ -541,7 +541,9 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesStockModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
startActivity(MesStockModifyActivity.class,
"id",userDataDetailBean.getMainInfo().getCustomerUserCode(),
"data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
}
});
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
......@@ -564,7 +566,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_factory_add1, R.id.tv_factory_add2, R.id.tv_factory_add3, R.id.rl_cover4, R.id.rl_protection4, R.id.iv_modify_client, R.id.iv_modify_machine, R.id.iv_modify_steel,
@OnClick({R.id.tv_add2,R.id.tv_factory_add1, R.id.tv_factory_add2, R.id.tv_factory_add3, R.id.rl_cover4, R.id.rl_protection4, R.id.iv_modify_client, R.id.iv_modify_machine, R.id.iv_modify_steel,
R.id.tv_add5,R.id.tv_add7, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection})
public void onViewClicked(View view) {
......
app/src/main/res/menu/menu_finish_delete.xml 0 → 100644
浏览文件 @ 52acac03
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/finish"
android:title="完成"
app:showAsAction="always" />
<item
android:id="@+id/delete"
android:title="删除"
app:showAsAction="always" />
</menu>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论