Skip to content

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

1.检维修记录 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 3ed1b922
隐藏空白字符变更
内嵌 并排
正在显示 包含 1160 行增加 和 149 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/ServiceBean.java 0 → 100644
浏览文件 @ 78c1a8ec
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 ServiceBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 6
* startRow : 1
* endRow : 6
* total : 6
* pages : 1
* list : [{"id":"b2016a5ca3b611ea8334fa163e1166bd","planId":"b1ecae09a3b611ea8334fa163e1166bd","inspoCode":"JXB2006011001","description":null,"remark":null,"inspoType":null,"appType":1,"principal":"398c852b38e911ea8334fa163e1166bd","principalCode":"hello","principalName":"hello","status":1,"stopWork":1,"planStartDateTime":"2020-06-01","planEndDateTime":"2020-06-01","actualStartDateTime":"2020-06-01 15:25:15","actualEndDateTime":"2020-06-01 15:25:15","weather":null,"temperature":null,"workorderId":null,"workorderCode":null,"workorderDesc":null,"createby":"398c852b38e911ea8334fa163e1166bd","createDateTime":"2020-06-01","orgId":"5ac6962d9ed911e8b81100163e049447","siteId":"1c37c889ffa211e98334fa163e1166bd","siteCode":null,"siteDesc":"铝碳厂","departDesc":null,"adjustBeginTime":"2020-06-01 15:25:15","adjustEndTime":"2020-06-01 15:25:15","assetCode":"02010003","assetDesc":"630压机","planCode":"JXP2006011001","planDesc":"111","locationCode":"HWLT02002","locationName":"630压机","locationId":"97a0ded2311011ea8334fa163e1166bd","inspoTime":"2020-06-01"},{"id":"7170e1149ff311ea8334fa163e1166bd","planId":"6fdc0cdf9ff311ea8334fa163e1166bd","inspoCode":"JXB2005271001","description":null,"remark":null,"inspoType":null,"appType":1,"principal":"398c852b38e911ea8334fa163e1166bd","principalCode":"hello","principalName":"hello","status":1,"stopWork":1,"planStartDateTime":"2020-06-01","planEndDateTime":"2020-06-01","actualStartDateTime":"2020-05-27 17:55:11","actualEndDateTime":"2020-05-27 17:55:11","weather":null,"temperature":null,"workorderId":null,"workorderCode":null,"workorderDesc":null,"createby":"398c852b38e911ea8334fa163e1166bd","createDateTime":"2020-06-01","orgId":"5ac6962d9ed911e8b81100163e049447","siteId":"1c37c889ffa211e98334fa163e1166bd","siteCode":null,"siteDesc":"铝碳厂","departDesc":null,"adjustBeginTime":"2020-05-27 17:55:11","adjustEndTime":"2020-05-27 17:55:11","assetCode":"02010003","assetDesc":"630压机","planCode":"JXP2005271001","planDesc":"检修计划的测试","locationCode":"HWLT02002","locationName":"630压机","locationId":"97a0ded2311011ea8334fa163e1166bd","inspoTime":"2020-06-01"},{"id":"c97e0c39a0bb11ea8334fa163e1166bd","planId":"c7f57881a0bb11ea8334fa163e1166bd","inspoCode":"JXB2005281002","description":"检修单最终测试","remark":null,"inspoType":null,"appType":1,"principal":"398c852b38e911ea8334fa163e1166bd","principalCode":"hello","principalName":"hello","status":2,"stopWork":1,"planStartDateTime":"2020-06-01","planEndDateTime":"2020-06-01","actualStartDateTime":"2020-05-28 16:34:22","actualEndDateTime":"2020-05-28 16:34:23","weather":null,"temperature":null,"workorderId":null,"workorderCode":null,"workorderDesc":null,"createby":"398c852b38e911ea8334fa163e1166bd","createDateTime":"2020-06-01","orgId":"5ac6962d9ed911e8b81100163e049447","siteId":"1c37c889ffa211e98334fa163e1166bd","siteCode":null,"siteDesc":"铝碳厂","departDesc":null,"adjustBeginTime":"2020-05-28 16:34:19","adjustEndTime":"2020-05-28 16:34:21","assetCode":"02050002","assetDesc":"01号料仓","planCode":"JXP2005281002","planDesc":"检修计划最终测试","locationCode":"HWLT01001001","locationName":"01号料仓","locationId":"9f63b8cc311011ea8334fa163e1166bd","inspoTime":"2020-06-01"},{"id":"4e2be46ba0a411ea8334fa163e1166bd","planId":"4e13ea4fa0a411ea8334fa163e1166bd","inspoCode":"JXB2005281001","description":"测试的检修单","remark":null,"inspoType":null,"appType":1,"principal":"398c852b38e911ea8334fa163e1166bd","principalCode":"hello","principalName":"hello","status":1,"stopWork":null,"planStartDateTime":"2020-05-28","planEndDateTime":"2020-05-28","actualStartDateTime":"2020-05-28 13:45:44","actualEndDateTime":"2020-05-28 13:45:48","weather":null,"temperature":null,"workorderId":null,"workorderCode":null,"workorderDesc":null,"createby":"398c852b38e911ea8334fa163e1166bd","createDateTime":"2020-05-28","orgId":"5ac6962d9ed911e8b81100163e049447","siteId":"1c37c889ffa211e98334fa163e1166bd","siteCode":null,"siteDesc":"铝碳厂","departDesc":null,"adjustBeginTime":"2020-05-28 13:45:33","adjustEndTime":"2020-05-28 13:45:35","assetCode":"02010003","assetDesc":"630压机","planCode":"JXP2005281001","planDesc":"测试一下检修模板","locationCode":"HWLT02002","locationName":"630压机","locationId":"97a0ded2311011ea8334fa163e1166bd","inspoTime":"2020-05-28"},{"id":"255b870152cc11ea8334fa163e1166bd","planId":"255867df52cc11ea8334fa163e1166bd","inspoCode":"JXB2002191003","description":"dddd","remark":null,"inspoType":null,"appType":1,"principal":"398c852b38e911ea8334fa163e1166bd","principalCode":"hello","principalName":"hello","status":1,"stopWork":null,"planStartDateTime":"2020-04-03","planEndDateTime":"2020-04-03","actualStartDateTime":"2020-05-23 00:00:00","actualEndDateTime":"2020-05-25 00:00:00","weather":null,"temperature":null,"workorderId":null,"workorderCode":null,"workorderDesc":null,"createby":"398c852b38e911ea8334fa163e1166bd","createDateTime":"2020-05-25","orgId":"5ac6962d9ed911e8b81100163e049447","siteId":"1c37c889ffa211e98334fa163e1166bd","siteCode":null,"siteDesc":"铝碳厂","departDesc":null,"adjustBeginTime":"2020-05-13 00:00:00","adjustEndTime":"2020-05-28 00:00:00","assetCode":"02050001","assetDesc":"配料线","planCode":"JXP2002191005","planDesc":"钉钉","locationCode":"HWLT01001","locationName":"配料线","locationId":"97565989311011ea8334fa163e1166bd","inspoTime":"2020-05-25"},{"id":"385e51369e5511ea8334fa163e1166bd","planId":"35662a429e5511ea8334fa163e1166bd","inspoCode":"JXB2005251001","description":null,"remark":null,"inspoType":null,"appType":1,"principal":null,"principalCode":null,"principalName":null,"status":1,"stopWork":null,"planStartDateTime":null,"planEndDateTime":null,"actualStartDateTime":null,"actualEndDateTime":null,"weather":null,"temperature":null,"workorderId":null,"workorderCode":null,"workorderDesc":null,"createby":"398c852b38e911ea8334fa163e1166bd","createDateTime":"2020-05-25","orgId":"5ac6962d9ed911e8b81100163e049447","siteId":"076068cfffa211e98334fa163e1166bd","siteCode":null,"siteDesc":"正望钢水集团","departDesc":null,"adjustBeginTime":null,"adjustEndTime":null,"assetCode":"0909031001","assetDesc":"测试数据","planCode":"JXP2005251003","planDesc":"测试测试啊","locationCode":"HWHZ","locationName":"hihihihihihi","locationId":"f4a55b8591a411ea8334fa163e1166bd","inspoTime":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 : b2016a5ca3b611ea8334fa163e1166bd
* planId : b1ecae09a3b611ea8334fa163e1166bd
* inspoCode : JXB2006011001
* description : null
* remark : null
* inspoType : null
* appType : 1
* principal : 398c852b38e911ea8334fa163e1166bd
* principalCode : hello
* principalName : hello
* status : 1
* stopWork : 1
* planStartDateTime : 2020-06-01
* planEndDateTime : 2020-06-01
* actualStartDateTime : 2020-06-01 15:25:15
* actualEndDateTime : 2020-06-01 15:25:15
* weather : null
* temperature : null
* workorderId : null
* workorderCode : null
* workorderDesc : null
* createby : 398c852b38e911ea8334fa163e1166bd
* createDateTime : 2020-06-01
* orgId : 5ac6962d9ed911e8b81100163e049447
* siteId : 1c37c889ffa211e98334fa163e1166bd
* siteCode : null
* siteDesc : 铝碳厂
* departDesc : null
* adjustBeginTime : 2020-06-01 15:25:15
* adjustEndTime : 2020-06-01 15:25:15
* assetCode : 02010003
* assetDesc : 630压机
* planCode : JXP2006011001
* planDesc : 111
* locationCode : HWLT02002
* locationName : 630压机
* locationId : 97a0ded2311011ea8334fa163e1166bd
* inspoTime : 2020-06-01
*/
private String id;
private String planId;
private String inspoCode;
private Object description;
private Object remark;
private Object inspoType;
private int appType;
private String principal;
private String principalCode;
private String principalName;
private int status;
private int stopWork;
private String planStartDateTime;
private String planEndDateTime;
private String actualStartDateTime;
private String actualEndDateTime;
private Object weather;
private Object temperature;
private Object workorderId;
private Object workorderCode;
private Object workorderDesc;
private String createby;
private String createDateTime;
private String orgId;
private String siteId;
private Object siteCode;
private String siteDesc;
private Object departDesc;
private String adjustBeginTime;
private String adjustEndTime;
private String assetCode;
private String assetDesc;
private String planCode;
private String planDesc;
private String locationCode;
private String locationName;
private String locationId;
private String inspoTime;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getPlanId() {
return planId;
}
public void setPlanId(String planId) {
this.planId = planId;
}
public String getInspoCode() {
return inspoCode;
}
public void setInspoCode(String inspoCode) {
this.inspoCode = inspoCode;
}
public Object getDescription() {
return description;
}
public void setDescription(Object description) {
this.description = description;
}
public Object getRemark() {
return remark;
}
public void setRemark(Object remark) {
this.remark = remark;
}
public Object getInspoType() {
return inspoType;
}
public void setInspoType(Object inspoType) {
this.inspoType = inspoType;
}
public int getAppType() {
return appType;
}
public void setAppType(int appType) {
this.appType = appType;
}
public String getPrincipal() {
return principal;
}
public void setPrincipal(String principal) {
this.principal = principal;
}
public String getPrincipalCode() {
return principalCode;
}
public void setPrincipalCode(String principalCode) {
this.principalCode = principalCode;
}
public String getPrincipalName() {
return principalName;
}
public void setPrincipalName(String principalName) {
this.principalName = principalName;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getStopWork() {
return stopWork;
}
public void setStopWork(int stopWork) {
this.stopWork = stopWork;
}
public String getPlanStartDateTime() {
return planStartDateTime;
}
public void setPlanStartDateTime(String planStartDateTime) {
this.planStartDateTime = planStartDateTime;
}
public String getPlanEndDateTime() {
return planEndDateTime;
}
public void setPlanEndDateTime(String planEndDateTime) {
this.planEndDateTime = planEndDateTime;
}
public String getActualStartDateTime() {
return actualStartDateTime;
}
public void setActualStartDateTime(String actualStartDateTime) {
this.actualStartDateTime = actualStartDateTime;
}
public String getActualEndDateTime() {
return actualEndDateTime;
}
public void setActualEndDateTime(String actualEndDateTime) {
this.actualEndDateTime = actualEndDateTime;
}
public Object getWeather() {
return weather;
}
public void setWeather(Object weather) {
this.weather = weather;
}
public Object getTemperature() {
return temperature;
}
public void setTemperature(Object temperature) {
this.temperature = temperature;
}
public Object getWorkorderId() {
return workorderId;
}
public void setWorkorderId(Object workorderId) {
this.workorderId = workorderId;
}
public Object getWorkorderCode() {
return workorderCode;
}
public void setWorkorderCode(Object workorderCode) {
this.workorderCode = workorderCode;
}
public Object getWorkorderDesc() {
return workorderDesc;
}
public void setWorkorderDesc(Object workorderDesc) {
this.workorderDesc = workorderDesc;
}
public String getCreateby() {
return createby;
}
public void setCreateby(String createby) {
this.createby = createby;
}
public String getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(String createDateTime) {
this.createDateTime = createDateTime;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getSiteId() {
return siteId;
}
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public Object getSiteCode() {
return siteCode;
}
public void setSiteCode(Object siteCode) {
this.siteCode = siteCode;
}
public String getSiteDesc() {
return siteDesc;
}
public void setSiteDesc(String siteDesc) {
this.siteDesc = siteDesc;
}
public Object getDepartDesc() {
return departDesc;
}
public void setDepartDesc(Object departDesc) {
this.departDesc = departDesc;
}
public String getAdjustBeginTime() {
return adjustBeginTime;
}
public void setAdjustBeginTime(String adjustBeginTime) {
this.adjustBeginTime = adjustBeginTime;
}
public String getAdjustEndTime() {
return adjustEndTime;
}
public void setAdjustEndTime(String adjustEndTime) {
this.adjustEndTime = adjustEndTime;
}
public String getAssetCode() {
return assetCode;
}
public void setAssetCode(String assetCode) {
this.assetCode = assetCode;
}
public String getAssetDesc() {
return assetDesc;
}
public void setAssetDesc(String assetDesc) {
this.assetDesc = assetDesc;
}
public String getPlanCode() {
return planCode;
}
public void setPlanCode(String planCode) {
this.planCode = planCode;
}
public String getPlanDesc() {
return planDesc;
}
public void setPlanDesc(String planDesc) {
this.planDesc = planDesc;
}
public String getLocationCode() {
return locationCode;
}
public void setLocationCode(String locationCode) {
this.locationCode = locationCode;
}
public String getLocationName() {
return locationName;
}
public void setLocationName(String locationName) {
this.locationName = locationName;
}
public String getLocationId() {
return locationId;
}
public void setLocationId(String locationId) {
this.locationId = locationId;
}
public String getInspoTime() {
return inspoTime;
}
public void setInspoTime(String inspoTime) {
this.inspoTime = inspoTime;
}
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/ServiceCheckBean.java 0 → 100644
浏览文件 @ 78c1a8ec
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 ServiceCheckBean extends BaseMesPageBean {
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/**
* id : 697eccdb9e5f11ea8334fa163e1166bd
* createDateTime : 2020-05-25
* updateDateTime : null
* billNum : DJB2005251003
* billDescription : 2233
* planId : 686a53ca9e5f11ea8334fa163e1166bd
* assetId : null
* spotCheckPersonId : null
* acceptancePsersionId : null
* locationId : null
* description : null
* planBeginTime : null
* planEndTime : null
* beginTimePlan : null
* endTimePlan : null
* beginTimeAdjust : null
* endTimeAdjust : null
* beginTimeActual : 14:00:00
* endTimeActual : null
* adjustBeginTime : null
* adjustEndTime : null
* actualBeginTime : 2020-06-02 14:00:00
* actualEndTime : null
* createby : null
* changeby : null
* delete : null
* status : 0
* siteId : null
* orgId : null
* astAssetCode : null
* astAssetName : null
* createUserCode : null
* createUserName : null
* spotCheckPersonCode : null
* spotCheckPersonName : 测试部门3
* locationName : null
* siteName : 销售七公司（GK）
* templateId : null
* procId : null
* approved : null
*/
private String id;
private String createDateTime;
private Object updateDateTime;
private String billNum;
private String billDescription;
private String planId;
private Object assetId;
private Object spotCheckPersonId;
private Object acceptancePsersionId;
private Object locationId;
private Object description;
private Object planBeginTime;
private Object planEndTime;
private Object beginTimePlan;
private Object endTimePlan;
private Object beginTimeAdjust;
private Object endTimeAdjust;
private String beginTimeActual;
private Object endTimeActual;
private Object adjustBeginTime;
private Object adjustEndTime;
private String actualBeginTime;
private Object actualEndTime;
private Object createby;
private Object changeby;
private Object delete;
private int status;
private Object siteId;
private Object orgId;
private Object astAssetCode;
private Object astAssetName;
private Object createUserCode;
private Object createUserName;
private Object spotCheckPersonCode;
private String spotCheckPersonName;
private Object locationName;
private String siteName;
private Object templateId;
private Object procId;
private Object approved;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(String createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getBillNum() {
return billNum;
}
public void setBillNum(String billNum) {
this.billNum = billNum;
}
public String getBillDescription() {
return billDescription;
}
public void setBillDescription(String billDescription) {
this.billDescription = billDescription;
}
public String getPlanId() {
return planId;
}
public void setPlanId(String planId) {
this.planId = planId;
}
public Object getAssetId() {
return assetId;
}
public void setAssetId(Object assetId) {
this.assetId = assetId;
}
public Object getSpotCheckPersonId() {
return spotCheckPersonId;
}
public void setSpotCheckPersonId(Object spotCheckPersonId) {
this.spotCheckPersonId = spotCheckPersonId;
}
public Object getAcceptancePsersionId() {
return acceptancePsersionId;
}
public void setAcceptancePsersionId(Object acceptancePsersionId) {
this.acceptancePsersionId = acceptancePsersionId;
}
public Object getLocationId() {
return locationId;
}
public void setLocationId(Object locationId) {
this.locationId = locationId;
}
public Object getDescription() {
return description;
}
public void setDescription(Object description) {
this.description = description;
}
public Object getPlanBeginTime() {
return planBeginTime;
}
public void setPlanBeginTime(Object planBeginTime) {
this.planBeginTime = planBeginTime;
}
public Object getPlanEndTime() {
return planEndTime;
}
public void setPlanEndTime(Object planEndTime) {
this.planEndTime = planEndTime;
}
public Object getBeginTimePlan() {
return beginTimePlan;
}
public void setBeginTimePlan(Object beginTimePlan) {
this.beginTimePlan = beginTimePlan;
}
public Object getEndTimePlan() {
return endTimePlan;
}
public void setEndTimePlan(Object endTimePlan) {
this.endTimePlan = endTimePlan;
}
public Object getBeginTimeAdjust() {
return beginTimeAdjust;
}
public void setBeginTimeAdjust(Object beginTimeAdjust) {
this.beginTimeAdjust = beginTimeAdjust;
}
public Object getEndTimeAdjust() {
return endTimeAdjust;
}
public void setEndTimeAdjust(Object endTimeAdjust) {
this.endTimeAdjust = endTimeAdjust;
}
public String getBeginTimeActual() {
return beginTimeActual;
}
public void setBeginTimeActual(String beginTimeActual) {
this.beginTimeActual = beginTimeActual;
}
public Object getEndTimeActual() {
return endTimeActual;
}
public void setEndTimeActual(Object endTimeActual) {
this.endTimeActual = endTimeActual;
}
public Object getAdjustBeginTime() {
return adjustBeginTime;
}
public void setAdjustBeginTime(Object adjustBeginTime) {
this.adjustBeginTime = adjustBeginTime;
}
public Object getAdjustEndTime() {
return adjustEndTime;
}
public void setAdjustEndTime(Object adjustEndTime) {
this.adjustEndTime = adjustEndTime;
}
public String getActualBeginTime() {
return actualBeginTime;
}
public void setActualBeginTime(String actualBeginTime) {
this.actualBeginTime = actualBeginTime;
}
public Object getActualEndTime() {
return actualEndTime;
}
public void setActualEndTime(Object actualEndTime) {
this.actualEndTime = actualEndTime;
}
public Object getCreateby() {
return createby;
}
public void setCreateby(Object createby) {
this.createby = createby;
}
public Object getChangeby() {
return changeby;
}
public void setChangeby(Object changeby) {
this.changeby = changeby;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public Object getSiteId() {
return siteId;
}
public void setSiteId(Object siteId) {
this.siteId = siteId;
}
public Object getOrgId() {
return orgId;
}
public void setOrgId(Object orgId) {
this.orgId = orgId;
}
public Object getAstAssetCode() {
return astAssetCode;
}
public void setAstAssetCode(Object astAssetCode) {
this.astAssetCode = astAssetCode;
}
public Object getAstAssetName() {
return astAssetName;
}
public void setAstAssetName(Object astAssetName) {
this.astAssetName = astAssetName;
}
public Object getCreateUserCode() {
return createUserCode;
}
public void setCreateUserCode(Object createUserCode) {
this.createUserCode = createUserCode;
}
public Object getCreateUserName() {
return createUserName;
}
public void setCreateUserName(Object createUserName) {
this.createUserName = createUserName;
}
public Object getSpotCheckPersonCode() {
return spotCheckPersonCode;
}
public void setSpotCheckPersonCode(Object spotCheckPersonCode) {
this.spotCheckPersonCode = spotCheckPersonCode;
}
public String getSpotCheckPersonName() {
return spotCheckPersonName;
}
public void setSpotCheckPersonName(String spotCheckPersonName) {
this.spotCheckPersonName = spotCheckPersonName;
}
public Object getLocationName() {
return locationName;
}
public void setLocationName(Object locationName) {
this.locationName = locationName;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public Object getTemplateId() {
return templateId;
}
public void setTemplateId(Object templateId) {
this.templateId = templateId;
}
public Object getProcId() {
return procId;
}
public void setProcId(Object procId) {
this.procId = procId;
}
public Object getApproved() {
return approved;
}
public void setApproved(Object approved) {
this.approved = approved;
}
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 78c1a8ec
...@@ -493,5 +493,15 @@ public interface MesApiService { ...@@ -493,5 +493,15 @@ public interface MesApiService {
@POST("/himes/api/defectdict/show/page.json") @POST("/himes/api/defectdict/show/page.json")
Observable<BaseMesBean> defectdictList(@Query("functionId") String functionId, @Body RequestBody requestBody); Observable<BaseMesBean> defectdictList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/modinspo/show/list.json")
Observable<BaseMesBean> modinspoList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("himes/api/spotCheckBill/show/page.json")
Observable<BaseMesBean> spotCheckBillList(@Query("functionId") String functionId, @Body RequestBody requestBody);
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/MesServiceActivity.java
浏览文件 @ 78c1a8ec
...@@ -6,6 +6,7 @@ import com.google.android.material.tabs.TabLayout; ...@@ -6,6 +6,7 @@ import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter; import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.MesCheckFragment;
import com.wd.workoffice.ui.fg.MesProcessFragment; import com.wd.workoffice.ui.fg.MesProcessFragment;
import com.wd.workoffice.ui.fg.MesServiceFragment; import com.wd.workoffice.ui.fg.MesServiceFragment;
...@@ -46,12 +47,12 @@ public class MesServiceActivity extends WorkToolBarActivity { ...@@ -46,12 +47,12 @@ public class MesServiceActivity extends WorkToolBarActivity {
protected void initData() { protected void initData() {
FragmentManager sfm = getSupportFragmentManager(); FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>(); List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) { MesCheckFragment checkFragment = new MesCheckFragment();
data.add(checkFragment);
for (int i = 0; i < tab.length-1; i++) {
MesServiceFragment saleFragment = new MesServiceFragment(); MesServiceFragment saleFragment = new MesServiceFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("state", order[i]); bundle.putString("state", order[i]);
bundle.putString("orderId", getIntent().getStringExtra("orderId"));
bundle.putString("orderType", getIntent().getStringExtra("orderType"));
saleFragment.setArguments(bundle); saleFragment.setArguments(bundle);
data.add(saleFragment); data.add(saleFragment);
......
app/src/main/java/com/wd/workoffice/ui/adapter/MesCheckAdapter.java 0 → 100644
浏览文件 @ 78c1a8ec
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.ServiceCheckBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesCheckAdapter extends BaseQuickAdapter<ServiceCheckBean.ListBean, BaseViewHolder> {
public MesCheckAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ServiceCheckBean.ListBean item) {
helper.setText(R.id.tv_first,item.getBillNum());
helper.setText(R.id.tv_second,item.getSpotCheckPersonName());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesServiceAdapter.java 0 → 100644
浏览文件 @ 78c1a8ec
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.ServiceBean;
import com.wd.workoffice.bean.mesBean.ServiceCheckBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesServiceAdapter extends BaseQuickAdapter<ServiceBean.ListBean, BaseViewHolder> {
public MesServiceAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ServiceBean.ListBean item) {
helper.setText(R.id.tv_first,item.getInspoCode());
helper.setText(R.id.tv_second,item.getPrincipalName());
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MesCheckFragment.java 0 → 100644
浏览文件 @ 78c1a8ec
package com.wd.workoffice.ui.fg;
import android.os.Bundle;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.mesBean.ServiceCheckBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesCheckAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
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 flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesCheckFragment extends WorkBaseFg {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
@BindView(R.id.tv_desc1)
TextView tvDesc1;
@BindView(R.id.tv_desc2)
TextView tvDesc2;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.ll_time)
LinearLayout llTime;
private int page = 1;
private Map<String, Object> param;
private MesCheckAdapter dataAdapter;
private List<ServiceCheckBean.ListBean> dataList;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
tvDesc1.setText("点检单号");
tvDesc2.setText("检查人");
rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
param = WorkUtils.pageMesKey();
page = 1;
param.put("pageNum", page);
paramMap = new HashMap<>();
param.put("paramMap", paramMap);
dataList = new ArrayList<>();
dataAdapter = new MesCheckAdapter(R.layout.item_mes_process, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
dataAdapter.notifyDataSetChanged();
getData();
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
}
}
private void getData() {
RtfUtils.getMesRtf().spotCheckBillList("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.getMessage());
return;
}
List<ServiceCheckBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ServiceCheckBean.class).getList();
if (page == 1) {
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() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("pageNum", page);
getData();
});
dataAdapter.setOnLoadMoreListener(() -> {
param.put("pageNum", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// startActivity(MesOrderDetailActivity.class);
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_mes_process;
}
@OnClick(R.id.ll_time)
public void onViewClicked() {
PickTimeUtils.showPickThree(getActivity(), new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
page = 1;
param.put("pageNum", page);
getData();
}
}, false).show();
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MesServiceFragment.java
浏览文件 @ 78c1a8ec
package com.wd.workoffice.ui.fg; package com.wd.workoffice.ui.fg;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
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.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.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SendApplyBean; import com.wd.workoffice.bean.mesBean.ServiceBean;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
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.adapter.MesProcessAdapter; import com.wd.workoffice.ui.adapter.MesServiceAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import java.text.SimpleDateFormat;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
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;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable; import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
...@@ -56,13 +52,15 @@ public class MesServiceFragment extends WorkBaseFg { ...@@ -56,13 +52,15 @@ public class MesServiceFragment extends WorkBaseFg {
TextView tvDesc1; TextView tvDesc1;
@BindView(R.id.tv_desc2) @BindView(R.id.tv_desc2)
TextView tvDesc2; TextView tvDesc2;
private String state; @BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.ll_time)
LinearLayout llTime;
private int page = 1; private int page = 1;
private Map<String, Object> param; private Map<String, Object> param;
private MesProcessAdapter dataAdapter; private MesServiceAdapter dataAdapter;
private List<Object> dataList; private List<ServiceBean.ListBean> dataList;
private String orderId; private Map<String, Object> paramMap;
private String orderType;
@Override @Override
protected void initView() { protected void initView() {
...@@ -75,20 +73,17 @@ public class MesServiceFragment extends WorkBaseFg { ...@@ -75,20 +73,17 @@ public class MesServiceFragment extends WorkBaseFg {
@Override @Override
protected void initData() { protected void initData() {
param = WorkUtils.pageKey(); param = WorkUtils.pageMesKey();
param.put("status", state);
param.put("orderId", orderId);
page = 1; page = 1;
param.put("current", page); param.put("pageNum", page);
paramMap = new HashMap<>();
param.put("paramMap", paramMap);
dataList = new ArrayList<>(); dataList = new ArrayList<>();
dataAdapter = new MesProcessAdapter(R.layout.item_mes_process, dataList); dataAdapter = new MesServiceAdapter(R.layout.item_mes_process, dataList);
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
dataList.add(null);
dataList.add(null);
dataList.add(null);
dataAdapter.notifyDataSetChanged(); dataAdapter.notifyDataSetChanged();
// getData(); getData();
} }
...@@ -97,24 +92,11 @@ public class MesServiceFragment extends WorkBaseFg { ...@@ -97,24 +92,11 @@ public class MesServiceFragment extends WorkBaseFg {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Bundle arguments = getArguments(); Bundle arguments = getArguments();
if (arguments != null) { if (arguments != null) {
state = arguments.getString("state");
orderId = arguments.getString("orderId");
orderType = arguments.getString("orderType");
} }
} }
private void getData() { private void getData() {
Observable<BaseBean> observable; RtfUtils.getMesRtf().modinspoList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().sendApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().sendPoApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().sendCoApplyList(param);
} else {
observable = RtfUtils.getRtf().sendApplyList(param);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -126,15 +108,14 @@ public class MesServiceFragment extends WorkBaseFg { ...@@ -126,15 +108,14 @@ public class MesServiceFragment extends WorkBaseFg {
} }
@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.getMessage());
return; return;
} }
List<SendApplyBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), SendApplyBean.class).getRecords(); List<ServiceBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ServiceBean.class).getList();
if (page == 1) { if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear(); dataList.clear();
dataList.addAll(getList); dataList.addAll(getList);
dataAdapter.notifyDataSetChanged(); dataAdapter.notifyDataSetChanged();
...@@ -157,11 +138,11 @@ public class MesServiceFragment extends WorkBaseFg { ...@@ -157,11 +138,11 @@ public class MesServiceFragment extends WorkBaseFg {
protected void initEvent() { protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> { srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1; page = 1;
param.put("current", page); param.put("pageNum", page);
getData(); getData();
}); });
dataAdapter.setOnLoadMoreListener(() -> { dataAdapter.setOnLoadMoreListener(() -> {
param.put("current", page); param.put("pageNum", page);
getData(); getData();
}, rvData); }, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
...@@ -172,100 +153,22 @@ public class MesServiceFragment extends WorkBaseFg { ...@@ -172,100 +153,22 @@ public class MesServiceFragment extends WorkBaseFg {
}); });
} }
private void checkDialog(int status, int id) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
View view = LayoutInflater.from(getActivity()).inflate(R.layout.view_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
tvDesc.setText(status == 1 ? "通过" : "拒绝");
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
check(status, etRemark.getText().toString(), id);
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void check(int status, String remark, int id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("status", status);
param.put("auditRemark", remark);
param.put("id", id);
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().sendPoApplyCheck(WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().sendCoApplyCheck(WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param));
}
observable.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.getMessage());
return;
}
toast("操作成功");
EventBus.getDefault().post(new CheckSendEvent());
}
});
}
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.fg_mes_process; return R.layout.fg_mes_process;
} }
@Override @OnClick(R.id.ll_time)
public void onStart() { public void onViewClicked() {
super.onStart(); PickTimeUtils.showPickThree(getActivity(), new OnTimeSelectListener() {
EventBus.getDefault().register(this); @Override
} public void onTimeSelect(Date date, View view) {
tvTime.setText(TimeUtils.date2String(date,new SimpleDateFormat("yyyy-MM-dd")));
@Override paramMap.put("createDateTime",TimeUtils.date2String(date,new SimpleDateFormat("yyyy-MM-dd")));
public void onStop() { page = 1;
super.onStop(); param.put("pageNum", page);
EventBus.getDefault().unregister(this); getData();
} }
},false).show();
@Subscribe
public void refresh(CheckSendEvent event) {
page = 1;
param.put("current", page);
getData();
} }
} }
app/src/main/res/layout/fg_mes_process.xml
浏览文件 @ 78c1a8ec
...@@ -12,25 +12,27 @@ ...@@ -12,25 +12,27 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/ll_time"
android:layout_width="100mm" android:layout_width="100mm"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="20mm" android:layout_marginTop="15mm"
android:background="@drawable/shape_mes_time" android:background="@drawable/shape_mes_time"
android:gravity="center" android:gravity="center"
android:paddingVertical="4mm"> android:paddingVertical="4mm">
<TextView <TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="4mm" android:layout_marginRight="4mm"
android:text="2019年7月" android:text="请选择时间"
android:textColor="#ff637298" android:textColor="#ff637298"
android:textSize="13sp" /> android:textSize="13sp" />
<ImageView <ImageView
android:layout_width="5mm" android:layout_width="20mm"
android:layout_height="2mm" android:layout_height="12mm"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@mipmap/mes_time_down" /> android:src="@mipmap/mes_time_down" />
</LinearLayout> </LinearLayout>
...@@ -39,7 +41,7 @@ ...@@ -39,7 +41,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="15mm" android:layout_marginHorizontal="15mm"
android:layout_marginTop="15mm"> android:layout_marginVertical="10mm">
<TextView <TextView
android:id="@+id/tv_desc1" android:id="@+id/tv_desc1"
...@@ -71,9 +73,10 @@ ...@@ -71,9 +73,10 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginHorizontal="15mm" android:layout_marginHorizontal="15mm"
android:layout_marginTop="10mm" android:layout_marginBottom="10mm"
android:paddingTop="10mm"
app:cardCornerRadius="3dp" app:cardCornerRadius="3dp"
app:cardElevation="5dp"> app:cardElevation="5dp">
......
app/src/main/res/layout/item_mes_process.xml
浏览文件 @ 78c1a8ec
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
android:paddingVertical="13mm"> android:paddingVertical="13mm">
<TextView <TextView
android:id="@+id/tv_first"
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"
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_second"
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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论