Skip to content

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

1.質量反饋搜索 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.
差两个产品关联，支数参数
上级 c347170a
隐藏空白字符变更
内嵌 并排
正在显示 包含 146 行增加 和 48 行删除
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityActivity.java
浏览文件 @ 6f4b9ea3
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -29,6 +32,7 @@ import java.util.List;
import java.util.Map;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
......@@ -92,7 +96,12 @@ public class MesQualityActivity extends WorkToolBarActivity {
toast(data.getMsg());
return;
}
List<FeedbackBean.ListBean> getList = JSON.parseObject(data.getData().toString(), FeedbackBean.class).getList();
List<FeedbackBean.ListBean> getList;
if (TextUtils.isEmpty(data.getData().toString())) {
getList = new ArrayList<>();
} else {
getList = JSON.parseObject(data.getData().toString(), FeedbackBean.class).getList();
}
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
......@@ -154,7 +163,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivityForResult(MesTicketConditionActivity.class, 10001);
startActivityForResult(MesQualityConditionActivity.class, 10001);
break;
}
return super.onOptionsItemSelected(item);
......@@ -184,4 +193,16 @@ public class MesQualityActivity extends WorkToolBarActivity {
param.put("pageNum", page);
getData();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String returnParam = data.getStringExtra("param");
param.put("paramMap", JSON.parseObject(returnParam, Map.class));
page = 1;
param.put("pageNum", page);
getData();
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityConditionActivity.java
浏览文件 @ 6f4b9ea3
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.RelativeLayout;
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.mesBean.ChooseMachineBean;
import com.wd.workoffice.util.WorkUtils;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.core.widget.NestedScrollView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* author : flexible
......@@ -11,69 +29,127 @@ import butterknife.ButterKnife;
* github: https://github.com/FlexibleXd
**/
public class MesQualityConditionActivity extends WorkToolBarActivity {
@BindView(R.id.et_no)
EditText etNo;
@BindView(R.id.et_name)
EditText etName;
@BindView(R.id.et_manager)
EditText etManager;
@BindView(R.id.et_phone)
EditText etPhone;
@BindView(R.id.et_pro_code)
EditText etProCode;
@BindView(R.id.et_pro_name)
EditText etProName;
@BindView(R.id.et_spec)
EditText etSpec;
@BindView(R.id.et_img_code)
EditText etImgCode;
@BindView(R.id.et_box)
EditText etBox;
@BindView(R.id.et_num)
EditText etNum;
@BindView(R.id.rl_machine)
RelativeLayout rlMachine;
@BindView(R.id.srl_refresh)
NestedScrollView srlRefresh;
@BindView(R.id.tv_machine)
TextView tvMachine;
@BindView(R.id.tv_steel)
TextView tvSteel;
private Map<String, Object> param;
@Override
protected void initView() {
ButterKnife.bind(this);
param = WorkUtils.simpleParam();
}
@Override
protected void initData() {
getData();
}
private void getData() {
// RtfUtils.getRtf().getProHistoryPrice(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.getMsg());
// return;
// }
// List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();
//
// if (page == 1) {
// srlRefresh.finishRefresh();
// dataList.clear();
// dataList.addAll(getList);
// dataAdapter.notifyDataSetChanged();
// dataAdapter.loadMoreComplete();
// } else {
// dataAdapter.loadMoreComplete();
// dataList.addAll(getList);
// dataAdapter.notifyDataSetChanged();
// }
// if (getList.size() == 0) {
// dataAdapter.loadMoreEnd();
// } else {
// page++;
// }
// }
// });
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_quality_cnd;
}
@Override
protected void initEvent() {
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
protected int layoutId() {
return R.layout.activity_mes_search_cnd;
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
if (!TextUtils.isEmpty(etNo.getText().toString())) {
param.put("feedbackCode", etNo.getText().toString());
}
if (!TextUtils.isEmpty(etName.getText().toString())) {
param.put("customerName", etName.getText().toString());
}
if (!TextUtils.isEmpty(etManager.getText().toString())) {
param.put("saleUserName", etManager.getText().toString());
}
if (!TextUtils.isEmpty(etPhone.getText().toString())) {
param.put("phoneNumber", etPhone.getText().toString());
}
if (!TextUtils.isEmpty(etProCode.getText().toString())) {
param.put("procedureCode", etProCode.getText().toString());
}
if (!TextUtils.isEmpty(etProName.getText().toString())) {
param.put("productName", etProName.getText().toString());
}
if (!TextUtils.isEmpty(etSpec.getText().toString())) {
param.put("specification", etSpec.getText().toString());
}
if (!TextUtils.isEmpty(etImgCode.getText().toString())) {
param.put("drawingNumber", etImgCode.getText().toString());
}
if (!TextUtils.isEmpty(etName.getText().toString())) {
param.put("salesCompanyName", etName.getText().toString());
}
if (!TextUtils.isEmpty(etNum.getText().toString())) {
param.put("verson", etNum.getText().toString());
}
if (!TextUtils.isEmpty(etBox.getText().toString())) {
param.put("boxCode", etBox.getText().toString());
}
Intent intent = new Intent();
intent.putExtra("param", JSON.toJSONString(param));
setResult(10001, intent);
finish();
break;
}
return super.onOptionsItemSelected(item);
}
@OnClick(R.id.rl_machine)
public void onViewClicked() {
startActivityForResult(MesChooseMachineActivity.class,
10002, "code", "");
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10002 && resultCode == 10001) {
ChooseMachineBean chooseMachine = JSON.parseObject(data.getStringExtra("data"), ChooseMachineBean.class);
tvMachine.setText(chooseMachine.getCasterName());
tvSteel.setText(chooseMachine.getSteelTypeId());
param.put("steelTypeId", chooseMachine.getSteelTypeId());
param.put("casterName", chooseMachine.getCasterName());
}
}
}
}
\ No newline at end of file
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java
浏览文件 @ 6f4b9ea3
......@@ -195,7 +195,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
tvName.setText(detailBean.getCustomerName());
tvManager.setText(detailBean.getSaleUserName());
tvPhone.setText(detailBean.getPhoneNumber());
tvCode.setText(detailBean.getProcedureCode());
tvCode.setText(detailBean.getProductCode());
tvProName.setText(detailBean.getProductName());
tvSpec.setText(detailBean.getSpecification());
tvImgCode.setText(detailBean.getDrawingNumber());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论