提交 5f826bcc authored 作者: lgd's avatar lgd

1.选择泥料,选择流程

2.//TODO ,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,mes质量反馈,编辑任务担当无法修改.支数参数
上级 983b5427
......@@ -1723,14 +1723,15 @@
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> <activity
android:name=".ui.activity.mes.quality.MesChooseBoxActivity"
android:configChanges="keyboardHidden|orientation"
android:label="选择箱号"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.quality.MesChooseBoxActivity"
android:configChanges="keyboardHidden|orientation"
android:label="选择箱号"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.quality.MesChooseDefectActivity"
......@@ -1740,6 +1741,25 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.quality.MesChooseQuestionActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.quality.MesChooseProcessActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
......@@ -8,14 +8,6 @@ package com.wd.workoffice.bean;
**/
public class ProcessBean {
/**
* EXT : mollit aliquip pariatur occae
* path : ullamco Excepteur elit cillum
* code : 6608450
* data : [{"deptName":"pariatur incididunt Excepteur exercitation","sendStockTypeName":"","returnStockName":"nulla ipsum voluptate","createdByName":"Excepteur ","code":"aute non culpa ut","transitPartId":3921422,"delFlag":"officia non eu qui culpa","current":-94678683,"processName":"sed consequat qui fugiat","usedStockTypeName":"molli","inStockId":-57542933,"createdTime":"cupidatat cillum nulla","ofDefault":"sunt do reprehender","id":87463060,"sendStockTypeId":89960897,"updatedTime":"ea reprehenderit","createByName":"officia magna","transitPartName":"nostrud ullamco","updatedBy":90341068,"searchStartTime":"sed","updatedByName":"aute cupidatat","deptId":4088783,"searchKey":"quis ex Ut","searchEndTime":"consectetur voluptate","usedStockTypeId":-12015595,"size":-16268998,"createdBy":49110675,"processCode":"voluptate nulla dolore ea","name":"pariatur dolore","returnStockId":-65204182,"inStockName":"fugiat est esse","searchValue":"ut in","status":"aute in ipsum laborum"}]
* httpStatus : -37386300
* message : et sed quis
*/
/**
......
package com.wd.workoffice.bean.mesBean;
import com.wd.workoffice.app.BaseMesPageBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class QuestionBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 2
* startRow : 1
* endRow : 2
* total : 2
* pages : 1
* list : [{"id":"2","createDateTime":1577808000000,"updateDateTime":1577808000000,"productId":null,"productName":"PROJECT02","productCode":"7301050001B","bomId":"2","bomType":"2","parentBomId":"1","materialName":"泥料1","materialCode":"3061325","materialStd":"规格型号2","materialTypeName":"物料类别2","useAmount":2,"unitPrice":10,"unit":"个","createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","delete":false,"createUserName":null,"updateUserName":null,"children":null},{"id":"3","createDateTime":1582078508000,"updateDateTime":1582078508000,"productId":null,"productName":"PROJECT02","productCode":"7301050001B","bomId":"3","bomType":"2","parentBomId":"1","materialName":"物料名称2","materialCode":"meterialCode2","materialStd":"规格型号2","materialTypeName":"物料类别2","useAmount":2,"unitPrice":2,"unit":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","delete":false,"createUserName":null,"updateUserName":null,"children":null}]
* prePage : 0
* nextPage : 0
* isFirstPage : true
* isLastPage : true
* hasPreviousPage : false
* hasNextPage : false
* navigatePages : 8
* navigatepageNums : [1]
* navigateFirstPage : 1
* navigateLastPage : 1
* firstPage : 1
* lastPage : 1
*/
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/**
* id : 2
* createDateTime : 1577808000000
* updateDateTime : 1577808000000
* productId : null
* productName : PROJECT02
* productCode : 7301050001B
* bomId : 2
* bomType : 2
* parentBomId : 1
* materialName : 泥料1
* materialCode : 3061325
* materialStd : 规格型号2
* materialTypeName : 物料类别2
* useAmount : 2
* unitPrice : 10
* unit : 个
* createUserId : 398c852b38e911ea8334fa163e1166bd
* updateUserId : 398c852b38e911ea8334fa163e1166bd
* delete : false
* createUserName : null
* updateUserName : null
* children : null
*/
private String id;
private long createDateTime;
private long updateDateTime;
private Object productId;
private String productName;
private String productCode;
private String bomId;
private String bomType;
private String parentBomId;
private String materialName;
private String materialCode;
private String materialStd;
private String materialTypeName;
private int useAmount;
private int unitPrice;
private String unit;
private String createUserId;
private String updateUserId;
private boolean delete;
private Object createUserName;
private Object updateUserName;
private Object children;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
this.createDateTime = createDateTime;
}
public long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(long updateDateTime) {
this.updateDateTime = updateDateTime;
}
public Object getProductId() {
return productId;
}
public void setProductId(Object productId) {
this.productId = productId;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getBomId() {
return bomId;
}
public void setBomId(String bomId) {
this.bomId = bomId;
}
public String getBomType() {
return bomType;
}
public void setBomType(String bomType) {
this.bomType = bomType;
}
public String getParentBomId() {
return parentBomId;
}
public void setParentBomId(String parentBomId) {
this.parentBomId = parentBomId;
}
public String getMaterialName() {
return materialName;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialStd() {
return materialStd;
}
public void setMaterialStd(String materialStd) {
this.materialStd = materialStd;
}
public String getMaterialTypeName() {
return materialTypeName;
}
public void setMaterialTypeName(String materialTypeName) {
this.materialTypeName = materialTypeName;
}
public int getUseAmount() {
return useAmount;
}
public void setUseAmount(int useAmount) {
this.useAmount = useAmount;
}
public int getUnitPrice() {
return unitPrice;
}
public void setUnitPrice(int unitPrice) {
this.unitPrice = unitPrice;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
}
public Object getCreateUserName() {
return createUserName;
}
public void setCreateUserName(Object createUserName) {
this.createUserName = createUserName;
}
public Object getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(Object updateUserName) {
this.updateUserName = updateUserName;
}
public Object getChildren() {
return children;
}
public void setChildren(Object children) {
this.children = children;
}
}
}
......@@ -367,4 +367,17 @@ public interface MesApiService {
@POST("/himes/api/feedback/add/save.json")
Observable<BaseMesBean> feedbackAdd( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
*
* @return
*/
@POST("/himes/api/feedback/show/geteProcedureList.json")
Observable<BaseMesBean> processList( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
*
* @return
*/
@POST("/himes/api/feedback/show/bom/page.json")
Observable<BaseMesBean> questionList( @Query("functionId") String functionId, @Body RequestBody requestBody);
}
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.BoxBean;
import com.wd.workoffice.bean.mesBean.MesProcessBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ChooseBoxAdapter;
import com.wd.workoffice.ui.adapter.ChooseProcessAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesChooseProcessActivity extends WorkToolBarActivity {
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<MesProcessBean> clientList;
private ChooseProcessAdapter clientAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new ChooseProcessAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.simpleParam();
param.put("productId", getIntent().getStringExtra("id"));
getData();
}
private void getData() {
RtfUtils.getMesRtf().processList("1", WorkUtils.convertMapToBody(param)).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.getMsg());
return;
}
List<MesProcessBean> getList = JSON.parseArray(data.getData().toString(), MesProcessBean.class);
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_choose_machine;
}
}
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.DefectBean;
import com.wd.workoffice.bean.mesBean.QuestionBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesDefectAdapter;
import com.wd.workoffice.ui.adapter.MesQuestionAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 选择泥料问题
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesChooseQuestionActivity extends WorkToolBarActivity {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<QuestionBean.ListBean> clientList;
private MesQuestionAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
etKey.setHint("搜索问题泥料");
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new MesQuestionAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
paramMap.put("productId", getIntent().getStringExtra("id"));
param.put("paramMap", paramMap);
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().questionList("1", WorkUtils.convertMapToBody(param)).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.getMsg());
return;
}
List<QuestionBean.ListBean> getList = JSON.parseObject(data.getData().toString(), QuestionBean.class).getList();
if (page == 1) {
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
clientAdapter.loadMoreComplete();
} else {
clientAdapter.loadMoreComplete();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
clientAdapter.loadMoreEnd();
} else {
page++;
}
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("pageNum", page);
getData();
}
}, rvClient);
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_ticket_take_on;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("materialName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
......@@ -14,12 +14,15 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.event.CheckFeedbackEvent;
import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.ManagerUserBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.MesProcessBean;
import com.wd.workoffice.bean.mesBean.QuestionBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.PickTimeUtils;
......@@ -76,6 +79,8 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
@BindView(R.id.rl_time)
RelativeLayout rlTime;
private Map<String, Object> param;
private FeedbackDetailBean data;
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -85,8 +90,8 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
@Override
protected void initData() {
param = WorkUtils.simpleParam();
FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
param.put("id",data.getId());
data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
param.put("id", data.getId());
param.put("status",2);
}
......@@ -155,6 +160,8 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_process:
data.getProductId();
startActivityForResult(MesChooseProcessActivity.class,10003,"id","000d85e9-8628-4fb3-ae01-51c58340caf0");
break;
case R.id.rl_duty_person:
startActivityForResult(MesChooseMangerActivity.class,10001);
......@@ -163,6 +170,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
startActivityForResult(MesChooseMangerActivity.class,10002);
break;
case R.id.rl_question:
startActivityForResult(MesChooseQuestionActivity.class,10004,"id","000d85e9-8628-4fb3-ae01-51c58340caf0");
break;
case R.id.rl_time:
PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
......@@ -195,6 +203,24 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
tvVerifyPerson.setText(manager.getName());
}
break;
case 10003:
if (resultCode == 10001) {
MesProcessBean process = JSON.parseObject(data.getStringExtra("data"), MesProcessBean.class);
param.put("procedureId",process.getId());
param.put("procedureCode",process.getProcedureCode());
param.put("procedureName",process.getProcedureName());
tvProcess.setText(process.getProcedureName());
}
break;
case 10004:
if (resultCode == 10001) {
QuestionBean.ListBean manager = JSON.parseObject(data.getStringExtra("data"), QuestionBean.ListBean.class);
param.put("defectMudId",manager.getId());
param.put("defectMudCode",manager.getMaterialCode());
param.put("defectMudName",manager.getMaterialName());
tvQuestion.setText(manager.getMaterialName());
}
break;
}
}
}
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.mesBean.BoxBean;
import com.wd.workoffice.bean.mesBean.MesProcessBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class ChooseProcessAdapter extends BaseQuickAdapter<MesProcessBean, BaseViewHolder> {
public ChooseProcessAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, MesProcessBean item) {
helper.setText(R.id.tv_name, item.getProcedureName());
}
}
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.mesBean.DefectBean;
import com.wd.workoffice.bean.mesBean.QuestionBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesQuestionAdapter extends BaseQuickAdapter<QuestionBean.ListBean, BaseViewHolder> {
public MesQuestionAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, QuestionBean.ListBean item) {
helper.setText(R.id.tv_name, item.getMaterialName());
}
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论