Skip to content

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

1.关联查询 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改.
上级 09ede8b3
隐藏空白字符变更
内嵌 并排
正在显示 包含 544 行增加 和 258 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/SearchBean.java 0 → 100644
浏览文件 @ a275e057
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 SearchBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 3
* startRow : 1
* endRow : 3
* total : 3
* pages : 1
* list : [{"id":null,"createDateTime":null,"updateDateTime":null,"customerUserCode":"KN00185","customerUserName":"客户1","steelmakingWorksCode":null,"steelmakingWorksName":"Liangan","continuousCasterCode":null,"continuousCasterName":"连铸机01","fractureSurface":null,"steelGrade":null,"productCode":null,"productName":null,"seriesId":null,"seriesName":null,"productType":null,"drawingNumberProd":null,"drawingNumberProc":null,"specification":null,"weight":null,"designedLife":null,"materialCode":null,"materialName":null,"materialStd":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","steelmakingWorksCode":null,"steelmakingWorksName":"Liangan","continuousCasterCode":null,"continuousCasterName":"连铸机01","fractureSurface":null,"steelGrade":null,"productCode":null,"productName":null,"seriesId":null,"seriesName":null,"productType":null,"drawingNumberProd":null,"drawingNumberProc":null,"specification":null,"weight":null,"designedLife":null,"materialCode":null,"materialName":null,"materialStd":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","steelmakingWorksCode":null,"steelmakingWorksName":null,"continuousCasterCode":null,"continuousCasterName":"连铸机01","fractureSurface":null,"steelGrade":null,"productCode":null,"productName":null,"seriesId":null,"seriesName":null,"productType":null,"drawingNumberProd":null,"drawingNumberProc":null,"specification":null,"weight":null,"designedLife":null,"materialCode":null,"materialName":null,"materialStd":null,"delete":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 : null
* createDateTime : null
* updateDateTime : null
* customerUserCode : KN00185
* customerUserName : 客户1
* steelmakingWorksCode : null
* steelmakingWorksName : Liangan
* continuousCasterCode : null
* continuousCasterName : 连铸机01
* fractureSurface : null
* steelGrade : null
* productCode : null
* productName : null
* seriesId : null
* seriesName : null
* productType : null
* drawingNumberProd : null
* drawingNumberProc : null
* specification : null
* weight : null
* designedLife : null
* materialCode : null
* materialName : null
* materialStd : null
* delete : null
*/
private Object id;
private Object createDateTime;
private Object updateDateTime;
private String customerUserCode;
private String customerUserName;
private Object steelmakingWorksCode;
private String steelmakingWorksName;
private Object continuousCasterCode;
private String continuousCasterName;
private Object fractureSurface;
private Object steelGrade;
private Object productCode;
private Object productName;
private Object seriesId;
private Object seriesName;
private Object productType;
private Object drawingNumberProd;
private Object drawingNumberProc;
private Object specification;
private Object weight;
private Object designedLife;
private Object materialCode;
private Object materialName;
private Object materialStd;
private Object delete;
public Object getId() {
return id;
}
public void setId(Object id) {
this.id = id;
}
public Object getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(Object createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getCustomerUserCode() {
return customerUserCode;
}
public void setCustomerUserCode(String customerUserCode) {
this.customerUserCode = customerUserCode;
}
public String getCustomerUserName() {
return customerUserName;
}
public void setCustomerUserName(String customerUserName) {
this.customerUserName = customerUserName;
}
public Object getSteelmakingWorksCode() {
return steelmakingWorksCode;
}
public void setSteelmakingWorksCode(Object steelmakingWorksCode) {
this.steelmakingWorksCode = steelmakingWorksCode;
}
public String getSteelmakingWorksName() {
return steelmakingWorksName;
}
public void setSteelmakingWorksName(String steelmakingWorksName) {
this.steelmakingWorksName = steelmakingWorksName;
}
public Object getContinuousCasterCode() {
return continuousCasterCode;
}
public void setContinuousCasterCode(Object continuousCasterCode) {
this.continuousCasterCode = continuousCasterCode;
}
public String getContinuousCasterName() {
return continuousCasterName;
}
public void setContinuousCasterName(String continuousCasterName) {
this.continuousCasterName = continuousCasterName;
}
public Object getFractureSurface() {
return fractureSurface;
}
public void setFractureSurface(Object fractureSurface) {
this.fractureSurface = fractureSurface;
}
public Object getSteelGrade() {
return steelGrade;
}
public void setSteelGrade(Object steelGrade) {
this.steelGrade = steelGrade;
}
public Object getProductCode() {
return productCode;
}
public void setProductCode(Object productCode) {
this.productCode = productCode;
}
public Object getProductName() {
return productName;
}
public void setProductName(Object productName) {
this.productName = productName;
}
public Object getSeriesId() {
return seriesId;
}
public void setSeriesId(Object seriesId) {
this.seriesId = seriesId;
}
public Object getSeriesName() {
return seriesName;
}
public void setSeriesName(Object seriesName) {
this.seriesName = seriesName;
}
public Object getProductType() {
return productType;
}
public void setProductType(Object productType) {
this.productType = productType;
}
public Object getDrawingNumberProd() {
return drawingNumberProd;
}
public void setDrawingNumberProd(Object drawingNumberProd) {
this.drawingNumberProd = drawingNumberProd;
}
public Object getDrawingNumberProc() {
return drawingNumberProc;
}
public void setDrawingNumberProc(Object drawingNumberProc) {
this.drawingNumberProc = drawingNumberProc;
}
public Object getSpecification() {
return specification;
}
public void setSpecification(Object specification) {
this.specification = specification;
}
public Object getWeight() {
return weight;
}
public void setWeight(Object weight) {
this.weight = weight;
}
public Object getDesignedLife() {
return designedLife;
}
public void setDesignedLife(Object designedLife) {
this.designedLife = designedLife;
}
public Object getMaterialCode() {
return materialCode;
}
public void setMaterialCode(Object materialCode) {
this.materialCode = materialCode;
}
public Object getMaterialName() {
return materialName;
}
public void setMaterialName(Object materialName) {
this.materialName = materialName;
}
public Object getMaterialStd() {
return materialStd;
}
public void setMaterialStd(Object materialStd) {
this.materialStd = materialStd;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ a275e057
...@@ -295,5 +295,13 @@ public interface MesApiService { ...@@ -295,5 +295,13 @@ public interface MesApiService {
@POST("/himes/api/msSteelmakingWorks/save.json") @POST("/himes/api/msSteelmakingWorks/save.json")
Observable<BaseMesBean> factoryAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody); Observable<BaseMesBean> factoryAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* 炼钢厂保存、更新
*
* @return
*/
@POST("/himes/api/msRelationQuery/show/page.json")
Observable<BaseMesBean> searchList(@Query("functionId") String functionId, @Body RequestBody requestBody);
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchActivity.java
浏览文件 @ a275e057
package com.wd.workoffice.ui.activity.mes.search; package com.wd.workoffice.ui.activity.mes.search;
import android.content.Intent;
import android.view.Menu;
import android.view.MenuItem;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ProPriceBean; import com.wd.workoffice.bean.mesBean.SearchBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.ticket.MesTicketConditionActivity;
import com.wd.workoffice.ui.adapter.MesSearchAdapter; import com.wd.workoffice.ui.adapter.MesSearchAdapter;
import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
...@@ -39,7 +45,7 @@ public class MesSearchActivity extends WorkToolBarActivity { ...@@ -39,7 +45,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
@BindView(R.id.srl_refresh) @BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh; SmartRefreshLayout srlRefresh;
private Map<String, Object> param; private Map<String, Object> param;
private List<ProPriceBean.RecordsBean> dataList; private List<SearchBean.ListBean> dataList;
private MesSearchAdapter dataAdapter; private MesSearchAdapter dataAdapter;
private int page = 1; private int page = 1;
...@@ -63,7 +69,7 @@ public class MesSearchActivity extends WorkToolBarActivity { ...@@ -63,7 +69,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
} }
private void getData() { private void getData() {
RtfUtils.getRtf().getProHistoryPrice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getMesRtf().searchList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -75,14 +81,13 @@ public class MesSearchActivity extends WorkToolBarActivity { ...@@ -75,14 +81,13 @@ public class MesSearchActivity extends WorkToolBarActivity {
} }
@Override @Override
public void onSuccess(BaseBean data) { public void onSuccess(BaseMesBean data) {
hideLoading(); hideLoading();
if (data.getCode() != 0) { if (!data.isSuccess()) {
toast(data.getMessage()); toast(data.getMsg());
return; return;
} }
List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords(); List<SearchBean.ListBean> getList = JSON.parseObject(data.getData().toString(), SearchBean.class).getList();
if (page == 1) { if (page == 1) {
srlRefresh.finishRefresh(); srlRefresh.finishRefresh();
dataList.clear(); dataList.clear();
...@@ -100,8 +105,7 @@ public class MesSearchActivity extends WorkToolBarActivity { ...@@ -100,8 +105,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
page++; page++;
} }
} }
}); }); }
}
@Override @Override
...@@ -128,5 +132,33 @@ public class MesSearchActivity extends WorkToolBarActivity { ...@@ -128,5 +132,33 @@ public class MesSearchActivity extends WorkToolBarActivity {
return R.layout.activity_mes_search; return R.layout.activity_mes_search;
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivityForResult(MesSearchConditionActivity.class, 10001);
break;
}
return super.onOptionsItemSelected(item);
}
@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/search/MesSearchConditionActivity.java
浏览文件 @ a275e057
package com.wd.workoffice.ui.activity.mes.search; package com.wd.workoffice.ui.activity.mes.search;
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 com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesSearchAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.NonNull; import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/** /**
* author : flexible * author : flexible
...@@ -32,58 +24,38 @@ import io.reactivex.disposables.Disposable; ...@@ -32,58 +24,38 @@ import io.reactivex.disposables.Disposable;
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class MesSearchConditionActivity extends WorkToolBarActivity { public class MesSearchConditionActivity extends WorkToolBarActivity {
@BindView(R.id.et_type)
EditText etType;
@BindView(R.id.et_name)
EditText etName;
@BindView(R.id.et_img_code)
EditText etImgCode;
@BindView(R.id.et_spec)
EditText etSpec;
@BindView(R.id.et_series)
EditText etSeries;
@BindView(R.id.et_weight)
EditText etWeight;
@BindView(R.id.et_client)
EditText etClient;
@BindView(R.id.et_years)
EditText etYears;
@BindView(R.id.et_drawing)
EditText etDrawing;
@BindView(R.id.et_section)
EditText etSection;
@BindView(R.id.et_steel)
EditText etSteel;
private Map<String, Object> param;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
param = WorkUtils.simpleParam();
} }
@Override @Override
protected void initData() { 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++;
// }
// }
// });
} }
...@@ -96,5 +68,57 @@ public class MesSearchConditionActivity extends WorkToolBarActivity { ...@@ -96,5 +68,57 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
return R.layout.activity_mes_search_cnd; return R.layout.activity_mes_search_cnd;
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
if (!TextUtils.isEmpty(etClient.getText().toString())) {
param.put("customerUserName", etClient.getText().toString());
}
if (!TextUtils.isEmpty(etDrawing.getText().toString())) {
param.put("drawingNumberProd", etDrawing.getText().toString());
}
if (!TextUtils.isEmpty(etImgCode.getText().toString())) {
param.put("drawingNumberProc", etImgCode.getText().toString());
}
if (!TextUtils.isEmpty(etName.getText().toString())) {
param.put("productName", etName.getText().toString());
}
if (!TextUtils.isEmpty(etSection.getText().toString())) {
param.put("fractureSurface", etSection.getText().toString());
}
if (!TextUtils.isEmpty(etSeries.getText().toString())) {
param.put("seriesName", etSeries.getText().toString());
}
if (!TextUtils.isEmpty(etSpec.getText().toString())) {
param.put("specification", etSpec.getText().toString());
}
if (!TextUtils.isEmpty(etSteel.getText().toString())) {
param.put("steelGrade", etSteel.getText().toString());
}
if (!TextUtils.isEmpty(etType.getText().toString())) {
param.put("productType", etType.getText().toString());
}
if (!TextUtils.isEmpty(etWeight.getText().toString())) {
param.put("weight", etWeight.getText().toString());
}
if (!TextUtils.isEmpty(etYears.getText().toString())) {
param.put("designedLife", etYears.getText().toString());
}
Intent intent = new Intent();
intent.putExtra("param", JSON.toJSONString(param));
setResult(10001, intent);
finish();
break;
}
return super.onOptionsItemSelected(item);
}
} }
app/src/main/java/com/wd/workoffice/ui/adapter/MesSearchAdapter.java
浏览文件 @ a275e057
...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProPriceBean; import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.mesBean.SearchBean;
import java.util.List; import java.util.List;
...@@ -12,7 +13,7 @@ import java.util.List; ...@@ -12,7 +13,7 @@ import java.util.List;
* Created by flexible on 2018/8/13. * Created by flexible on 2018/8/13.
*/ */
public class MesSearchAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean, BaseViewHolder> { public class MesSearchAdapter extends BaseQuickAdapter<SearchBean.ListBean, BaseViewHolder> {
public MesSearchAdapter(int layoutResId, List data) { public MesSearchAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
...@@ -20,7 +21,11 @@ public class MesSearchAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean, ...@@ -20,7 +21,11 @@ public class MesSearchAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean,
@Override @Override
protected void convert(BaseViewHolder helper, ProPriceBean.RecordsBean item) { protected void convert(BaseViewHolder helper, SearchBean.ListBean item) {
helper.setText(R.id.tv_code,item.getCustomerUserCode());
helper.setText(R.id.tv_machine,item.getContinuousCasterName());
helper.setText(R.id.tv_name,item.getCustomerUserName());
helper.setText(R.id.tv_factory,item.getSteelmakingWorksName());
} }
} }
app/src/main/res/layout/activity_mes_search_cnd.xml
浏览文件 @ a275e057
...@@ -24,26 +24,16 @@ ...@@ -24,26 +24,16 @@
android:text="产品类别" android:text="产品类别"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_height="wrap_content" android:textSize="14sp" />
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -62,26 +52,17 @@ ...@@ -62,26 +52,17 @@
android:text="产品名称" android:text="产品名称"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -100,26 +81,17 @@ ...@@ -100,26 +81,17 @@
android:text="产品图号" android:text="产品图号"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_img_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -138,26 +110,17 @@ ...@@ -138,26 +110,17 @@
android:text="产品规格" android:text="产品规格"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/et_spec"
android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -176,26 +139,17 @@ ...@@ -176,26 +139,17 @@
android:text="产品系列" android:text="产品系列"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_series"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -214,12 +168,15 @@ ...@@ -214,12 +168,15 @@
android:text="结算单重（千克）" android:text="结算单重（千克）"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <EditText
android:id="@+id/et_weight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="10mm" android:layout_marginRight="10mm"
android:hint="请输入" android:hint="请输入"
android:background="@null"
android:inputType="number"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -241,26 +198,17 @@ ...@@ -241,26 +198,17 @@
android:text="客户" android:text="客户"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_client"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -279,26 +227,17 @@ ...@@ -279,26 +227,17 @@
android:text="设计寿命" android:text="设计寿命"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_years"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -317,26 +256,17 @@ ...@@ -317,26 +256,17 @@
android:text="供需图纸" android:text="供需图纸"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_drawing"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -355,26 +285,17 @@ ...@@ -355,26 +285,17 @@
android:text="断面" android:text="断面"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_section"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
...@@ -393,27 +314,17 @@ ...@@ -393,27 +314,17 @@
android:text="钢种" android:text="钢种"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <EditText
android:id="@+id/et_steel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center_vertical"> android:layout_marginRight="10mm"
android:hint="请输入"
<TextView android:background="@null"
android:layout_width="wrap_content" android:inputType="number"
android:layout_height="wrap_content" android:textColor="@color/flexible_text_gray"
android:layout_alignParentLeft="true" android:textSize="14sp" />
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/item_mes_search.xml
浏览文件 @ a275e057
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<TextView <TextView
android:id="@+id/tv_code"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tv_name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -23,6 +25,7 @@ ...@@ -23,6 +25,7 @@
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tv_factory"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -31,6 +34,7 @@ ...@@ -31,6 +34,7 @@
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tv_machine"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论