Skip to content

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

1.質量反饋新增 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.
差两个产品关联，支数参数
上级 7ef0710f
显示空白字符变更
内嵌 并排
正在显示 包含 2363 行增加 和 126 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ c347170a
...@@ -1716,6 +1716,30 @@ ...@@ -1716,6 +1716,30 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.quality.MesChooseMachineActivity"
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.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"
android:configChanges="keyboardHidden|orientation"
android:label="选择缺陷"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider" android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/mesBean/BoxBean.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.bean.mesBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class BoxBean {
/**
* id : 123
* serialNumber : null
* basketId : ASDAS
* basketCode : null
* productId : 7101010688L
* productCode : 7101010688L
* productName : 塞棒(高碱）加套B354-2
* drawingNumber : xxxxx
* specification : null
* orderId : cf185b11382311ea8334fa163e1166bd
* orderNumber : SOGK19112800012
* manufactureOrderNumber : LSL1111
* seriesName : null
* siteId : GK10
* siteName : 生产部（GK）
* siteCode : GK10
* verson : null
* boxId : 123
* boxNumber : BOX001
* innerBoxCode : INNERBOX0001
* outerBoxCode : OUTBOX0001
* mpsProductDetailVOS : [{"id":"1","serialNumber":"SERIAL0002","basketId":"ASDAS","basketCode":"LONGK0001","productId":"219afc9011b211eae334fa163e1166bd","productCode":"","productName":"","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":null,"siteName":null,"siteCode":"ZWGT","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"2","serialNumber":"SERIAL0001","basketId":"ASDAS","basketCode":"LONGK0002","productId":"63cf3fffb2a511e99593fa163e1166bd","productCode":"7301050001B","productName":"","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"1c37c889ffa211e98334fa163e1166bd","siteName":"铝碳厂","siteCode":"ZWGT","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"4161a2a9854711ea8334fa163e1166bd","serialNumber":"SERIAL0001","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"4187849b854711ea8334fa163e1166bd","serialNumber":"cccc","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"7329933085fb11ea8334fa163e1166bd","serialNumber":"SERIAL0001","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"7348154c85fb11ea8334fa163e1166bd","serialNumber":"cccc","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"adb3876a854611ea8334fa163e1166bd","serialNumber":"SERIAL0001","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"yyy","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"adcf1d91854611ea8334fa163e1166bd","serialNumber":"SERIAL0002","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"yyy","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"be79cf79854611ea8334fa163e1166bd","serialNumber":"SERIAL0001","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"qqqq","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"cccb17bd854611ea8334fa163e1166bd","serialNumber":"SERIAL0001","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"cce4506d854611ea8334fa163e1166bd","serialNumber":"cccc","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"d64dc8a9854711ea8334fa163e1166bd","serialNumber":"SERIAL0001","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"d6a6f5b4854711ea8334fa163e1166bd","serialNumber":"cccc","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"d84f179d854711ea8334fa163e1166bd","serialNumber":"SERIAL0001","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"d8bf7229854711ea8334fa163e1166bd","serialNumber":"cccc","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"db4027e7854711ea8334fa163e1166bd","serialNumber":"SERIAL0001","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null},{"id":"dba35849854711ea8334fa163e1166bd","serialNumber":"cccc","basketId":null,"basketCode":null,"productId":"219afc9011b211eae334fa163e1166bd","productCode":"vvv","productName":"bbbbbb","drawingNumber":null,"specification":null,"orderId":"cf185b11382311ea8334fa163e1166bd","orderNumber":null,"manufactureOrderNumber":null,"seriesName":null,"siteId":"GK10","siteName":"生产部（GK）","siteCode":"GK10","verson":null,"boxId":null,"boxNumber":null,"innerBoxCode":null,"outerBoxCode":null,"mpsProductDetailVOS":null,"seriesType":null,"custCode":null,"steelTypeId":null,"steelTypeName":null}]
* seriesType : 0
* custCode : null
* steelTypeId : 1
* steelTypeName : null
*/
private String id;
private String serialNumber;
private String basketId;
private Object basketCode;
private String productId;
private String productCode;
private String productName;
private String drawingNumber;
private String specification;
private String orderId;
private String orderNumber;
private String manufactureOrderNumber;
private Object seriesName;
private String siteId;
private String siteName;
private String siteCode;
private Object verson;
private String boxId;
private String boxNumber;
private String innerBoxCode;
private String outerBoxCode;
private String seriesType;
private Object custCode;
private String steelTypeId;
private Object steelTypeName;
private List<MpsProductDetailVOSBean> mpsProductDetailVOS;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getSerialNumber() {
return serialNumber;
}
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber;
}
public String getBasketId() {
return basketId;
}
public void setBasketId(String basketId) {
this.basketId = basketId;
}
public Object getBasketCode() {
return basketCode;
}
public void setBasketCode(Object basketCode) {
this.basketCode = basketCode;
}
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getDrawingNumber() {
return drawingNumber;
}
public void setDrawingNumber(String drawingNumber) {
this.drawingNumber = drawingNumber;
}
public String getSpecification() {
return specification;
}
public void setSpecification(String specification) {
this.specification = specification;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public String getManufactureOrderNumber() {
return manufactureOrderNumber;
}
public void setManufactureOrderNumber(String manufactureOrderNumber) {
this.manufactureOrderNumber = manufactureOrderNumber;
}
public Object getSeriesName() {
return seriesName;
}
public void setSeriesName(Object seriesName) {
this.seriesName = seriesName;
}
public String getSiteId() {
return siteId;
}
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public Object getVerson() {
return verson;
}
public void setVerson(Object verson) {
this.verson = verson;
}
public String getBoxId() {
return boxId;
}
public void setBoxId(String boxId) {
this.boxId = boxId;
}
public String getBoxNumber() {
return boxNumber;
}
public void setBoxNumber(String boxNumber) {
this.boxNumber = boxNumber;
}
public String getInnerBoxCode() {
return innerBoxCode;
}
public void setInnerBoxCode(String innerBoxCode) {
this.innerBoxCode = innerBoxCode;
}
public String getOuterBoxCode() {
return outerBoxCode;
}
public void setOuterBoxCode(String outerBoxCode) {
this.outerBoxCode = outerBoxCode;
}
public String getSeriesType() {
return seriesType;
}
public void setSeriesType(String seriesType) {
this.seriesType = seriesType;
}
public Object getCustCode() {
return custCode;
}
public void setCustCode(Object custCode) {
this.custCode = custCode;
}
public String getSteelTypeId() {
return steelTypeId;
}
public void setSteelTypeId(String steelTypeId) {
this.steelTypeId = steelTypeId;
}
public Object getSteelTypeName() {
return steelTypeName;
}
public void setSteelTypeName(Object steelTypeName) {
this.steelTypeName = steelTypeName;
}
public List<MpsProductDetailVOSBean> getMpsProductDetailVOS() {
return mpsProductDetailVOS;
}
public void setMpsProductDetailVOS(List<MpsProductDetailVOSBean> mpsProductDetailVOS) {
this.mpsProductDetailVOS = mpsProductDetailVOS;
}
public static class MpsProductDetailVOSBean {
/**
* id : 1
* serialNumber : SERIAL0002
* basketId : ASDAS
* basketCode : LONGK0001
* productId : 219afc9011b211eae334fa163e1166bd
* productCode :
* productName :
* drawingNumber : null
* specification : null
* orderId : cf185b11382311ea8334fa163e1166bd
* orderNumber : null
* manufactureOrderNumber : null
* seriesName : null
* siteId : null
* siteName : null
* siteCode : ZWGT
* verson : null
* boxId : null
* boxNumber : null
* innerBoxCode : null
* outerBoxCode : null
* mpsProductDetailVOS : null
* seriesType : null
* custCode : null
* steelTypeId : null
* steelTypeName : null
*/
private String id;
private String serialNumber;
private String basketId;
private String basketCode;
private String productId;
private String productCode;
private String productName;
private Object drawingNumber;
private Object specification;
private String orderId;
private Object orderNumber;
private Object manufactureOrderNumber;
private Object seriesName;
private Object siteId;
private Object siteName;
private String siteCode;
private Object verson;
private Object boxId;
private Object boxNumber;
private Object innerBoxCode;
private Object outerBoxCode;
private Object mpsProductDetailVOS;
private Object seriesType;
private Object custCode;
private Object steelTypeId;
private Object steelTypeName;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getSerialNumber() {
return serialNumber;
}
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber;
}
public String getBasketId() {
return basketId;
}
public void setBasketId(String basketId) {
this.basketId = basketId;
}
public String getBasketCode() {
return basketCode;
}
public void setBasketCode(String basketCode) {
this.basketCode = basketCode;
}
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public Object getDrawingNumber() {
return drawingNumber;
}
public void setDrawingNumber(Object drawingNumber) {
this.drawingNumber = drawingNumber;
}
public Object getSpecification() {
return specification;
}
public void setSpecification(Object specification) {
this.specification = specification;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public Object getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(Object orderNumber) {
this.orderNumber = orderNumber;
}
public Object getManufactureOrderNumber() {
return manufactureOrderNumber;
}
public void setManufactureOrderNumber(Object manufactureOrderNumber) {
this.manufactureOrderNumber = manufactureOrderNumber;
}
public Object getSeriesName() {
return seriesName;
}
public void setSeriesName(Object seriesName) {
this.seriesName = seriesName;
}
public Object getSiteId() {
return siteId;
}
public void setSiteId(Object siteId) {
this.siteId = siteId;
}
public Object getSiteName() {
return siteName;
}
public void setSiteName(Object siteName) {
this.siteName = siteName;
}
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public Object getVerson() {
return verson;
}
public void setVerson(Object verson) {
this.verson = verson;
}
public Object getBoxId() {
return boxId;
}
public void setBoxId(Object boxId) {
this.boxId = boxId;
}
public Object getBoxNumber() {
return boxNumber;
}
public void setBoxNumber(Object boxNumber) {
this.boxNumber = boxNumber;
}
public Object getInnerBoxCode() {
return innerBoxCode;
}
public void setInnerBoxCode(Object innerBoxCode) {
this.innerBoxCode = innerBoxCode;
}
public Object getOuterBoxCode() {
return outerBoxCode;
}
public void setOuterBoxCode(Object outerBoxCode) {
this.outerBoxCode = outerBoxCode;
}
public Object getMpsProductDetailVOS() {
return mpsProductDetailVOS;
}
public void setMpsProductDetailVOS(Object mpsProductDetailVOS) {
this.mpsProductDetailVOS = mpsProductDetailVOS;
}
public Object getSeriesType() {
return seriesType;
}
public void setSeriesType(Object seriesType) {
this.seriesType = seriesType;
}
public Object getCustCode() {
return custCode;
}
public void setCustCode(Object custCode) {
this.custCode = custCode;
}
public Object getSteelTypeId() {
return steelTypeId;
}
public void setSteelTypeId(Object steelTypeId) {
this.steelTypeId = steelTypeId;
}
public Object getSteelTypeName() {
return steelTypeName;
}
public void setSteelTypeName(Object steelTypeName) {
this.steelTypeName = steelTypeName;
}
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/ChooseMachineBean.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.bean.mesBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class ChooseMachineBean {
/**
* id : null
* createDateTime : null
* updateDateTime : null
* feedbackCode : null
* productId : null
* productCode : null
* productName : null
* drawingNumber : null
* version : null
* specification : null
* customerId : null
* customerName : null
* saleUserId : null
* saleUserCode : null
* saleUserName : null
* phoneNumber : null
* boxId : null
* boxCode : null
* serialNumber : null
* caster : lzj111
* casterName : 连铸机01
* defectId : null
* defectCount : null
* defectCounts : null
* defectCode : null
* defectName : null
* mainCause : null
* steelTypeId : 钢种1
* steelTypeName : null
* feedbackDescription : null
* otherProviderBehavior : null
* salerOpinion : null
* attachmentId : null
* factoryAnalysis : null
* factoryLeaderOpinion : null
* factoryImplement : null
* procedureId : null
* procedureCode : null
* procedureName : null
* defectMudId : null
* defectMudCode : null
* defectMudName : null
* rapidResponse : null
* customerResponse : null
* relatedRecord : null
* seriesName : null
* seriesType : null
* severity : null
* treatRectPlan : null
* status : null
* attachments : []
* responsibleUserId : null
* responsibleUserName : null
* factoryTreatmentDateTime : null
* verifyUserId : null
* verifyUserName : null
* verifyUserDate : null
* recordUserId : null
* recorUserName : null
* recorUserDate : null
* responsibleDealId : null
* responsibleDealName : null
* responsibleDealDate : null
* responsibleCustId : null
* responsibleCustName : null
* responsibleCustDate : null
* approvalUserId : null
* approvalUserName : null
* approvalUserDate : null
* createUserId : null
* createUserName : null
* updateUserId : null
* updateUserName : null
* defectMudIds : null
* attachment : null
* delete : null
*/
private Object id;
private Object createDateTime;
private Object updateDateTime;
private Object feedbackCode;
private Object productId;
private Object productCode;
private Object productName;
private Object drawingNumber;
private Object version;
private Object specification;
private Object customerId;
private Object customerName;
private Object saleUserId;
private Object saleUserCode;
private Object saleUserName;
private Object phoneNumber;
private Object boxId;
private Object boxCode;
private Object serialNumber;
private String caster;
private String casterName;
private Object defectId;
private Object defectCount;
private Object defectCounts;
private Object defectCode;
private Object defectName;
private Object mainCause;
private String steelTypeId;
private Object steelTypeName;
private Object feedbackDescription;
private Object otherProviderBehavior;
private Object salerOpinion;
private Object attachmentId;
private Object factoryAnalysis;
private Object factoryLeaderOpinion;
private Object factoryImplement;
private Object procedureId;
private Object procedureCode;
private Object procedureName;
private Object defectMudId;
private Object defectMudCode;
private Object defectMudName;
private Object rapidResponse;
private Object customerResponse;
private Object relatedRecord;
private Object seriesName;
private Object seriesType;
private Object severity;
private Object treatRectPlan;
private Object status;
private Object responsibleUserId;
private Object responsibleUserName;
private Object factoryTreatmentDateTime;
private Object verifyUserId;
private Object verifyUserName;
private Object verifyUserDate;
private Object recordUserId;
private Object recorUserName;
private Object recorUserDate;
private Object responsibleDealId;
private Object responsibleDealName;
private Object responsibleDealDate;
private Object responsibleCustId;
private Object responsibleCustName;
private Object responsibleCustDate;
private Object approvalUserId;
private Object approvalUserName;
private Object approvalUserDate;
private Object createUserId;
private Object createUserName;
private Object updateUserId;
private Object updateUserName;
private Object defectMudIds;
private Object attachment;
private Object delete;
private List<?> attachments;
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 Object getFeedbackCode() {
return feedbackCode;
}
public void setFeedbackCode(Object feedbackCode) {
this.feedbackCode = feedbackCode;
}
public Object getProductId() {
return productId;
}
public void setProductId(Object productId) {
this.productId = productId;
}
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 getDrawingNumber() {
return drawingNumber;
}
public void setDrawingNumber(Object drawingNumber) {
this.drawingNumber = drawingNumber;
}
public Object getVersion() {
return version;
}
public void setVersion(Object version) {
this.version = version;
}
public Object getSpecification() {
return specification;
}
public void setSpecification(Object specification) {
this.specification = specification;
}
public Object getCustomerId() {
return customerId;
}
public void setCustomerId(Object customerId) {
this.customerId = customerId;
}
public Object getCustomerName() {
return customerName;
}
public void setCustomerName(Object customerName) {
this.customerName = customerName;
}
public Object getSaleUserId() {
return saleUserId;
}
public void setSaleUserId(Object saleUserId) {
this.saleUserId = saleUserId;
}
public Object getSaleUserCode() {
return saleUserCode;
}
public void setSaleUserCode(Object saleUserCode) {
this.saleUserCode = saleUserCode;
}
public Object getSaleUserName() {
return saleUserName;
}
public void setSaleUserName(Object saleUserName) {
this.saleUserName = saleUserName;
}
public Object getPhoneNumber() {
return phoneNumber;
}
public void setPhoneNumber(Object phoneNumber) {
this.phoneNumber = phoneNumber;
}
public Object getBoxId() {
return boxId;
}
public void setBoxId(Object boxId) {
this.boxId = boxId;
}
public Object getBoxCode() {
return boxCode;
}
public void setBoxCode(Object boxCode) {
this.boxCode = boxCode;
}
public Object getSerialNumber() {
return serialNumber;
}
public void setSerialNumber(Object serialNumber) {
this.serialNumber = serialNumber;
}
public String getCaster() {
return caster;
}
public void setCaster(String caster) {
this.caster = caster;
}
public String getCasterName() {
return casterName;
}
public void setCasterName(String casterName) {
this.casterName = casterName;
}
public Object getDefectId() {
return defectId;
}
public void setDefectId(Object defectId) {
this.defectId = defectId;
}
public Object getDefectCount() {
return defectCount;
}
public void setDefectCount(Object defectCount) {
this.defectCount = defectCount;
}
public Object getDefectCounts() {
return defectCounts;
}
public void setDefectCounts(Object defectCounts) {
this.defectCounts = defectCounts;
}
public Object getDefectCode() {
return defectCode;
}
public void setDefectCode(Object defectCode) {
this.defectCode = defectCode;
}
public Object getDefectName() {
return defectName;
}
public void setDefectName(Object defectName) {
this.defectName = defectName;
}
public Object getMainCause() {
return mainCause;
}
public void setMainCause(Object mainCause) {
this.mainCause = mainCause;
}
public String getSteelTypeId() {
return steelTypeId;
}
public void setSteelTypeId(String steelTypeId) {
this.steelTypeId = steelTypeId;
}
public Object getSteelTypeName() {
return steelTypeName;
}
public void setSteelTypeName(Object steelTypeName) {
this.steelTypeName = steelTypeName;
}
public Object getFeedbackDescription() {
return feedbackDescription;
}
public void setFeedbackDescription(Object feedbackDescription) {
this.feedbackDescription = feedbackDescription;
}
public Object getOtherProviderBehavior() {
return otherProviderBehavior;
}
public void setOtherProviderBehavior(Object otherProviderBehavior) {
this.otherProviderBehavior = otherProviderBehavior;
}
public Object getSalerOpinion() {
return salerOpinion;
}
public void setSalerOpinion(Object salerOpinion) {
this.salerOpinion = salerOpinion;
}
public Object getAttachmentId() {
return attachmentId;
}
public void setAttachmentId(Object attachmentId) {
this.attachmentId = attachmentId;
}
public Object getFactoryAnalysis() {
return factoryAnalysis;
}
public void setFactoryAnalysis(Object factoryAnalysis) {
this.factoryAnalysis = factoryAnalysis;
}
public Object getFactoryLeaderOpinion() {
return factoryLeaderOpinion;
}
public void setFactoryLeaderOpinion(Object factoryLeaderOpinion) {
this.factoryLeaderOpinion = factoryLeaderOpinion;
}
public Object getFactoryImplement() {
return factoryImplement;
}
public void setFactoryImplement(Object factoryImplement) {
this.factoryImplement = factoryImplement;
}
public Object getProcedureId() {
return procedureId;
}
public void setProcedureId(Object procedureId) {
this.procedureId = procedureId;
}
public Object getProcedureCode() {
return procedureCode;
}
public void setProcedureCode(Object procedureCode) {
this.procedureCode = procedureCode;
}
public Object getProcedureName() {
return procedureName;
}
public void setProcedureName(Object procedureName) {
this.procedureName = procedureName;
}
public Object getDefectMudId() {
return defectMudId;
}
public void setDefectMudId(Object defectMudId) {
this.defectMudId = defectMudId;
}
public Object getDefectMudCode() {
return defectMudCode;
}
public void setDefectMudCode(Object defectMudCode) {
this.defectMudCode = defectMudCode;
}
public Object getDefectMudName() {
return defectMudName;
}
public void setDefectMudName(Object defectMudName) {
this.defectMudName = defectMudName;
}
public Object getRapidResponse() {
return rapidResponse;
}
public void setRapidResponse(Object rapidResponse) {
this.rapidResponse = rapidResponse;
}
public Object getCustomerResponse() {
return customerResponse;
}
public void setCustomerResponse(Object customerResponse) {
this.customerResponse = customerResponse;
}
public Object getRelatedRecord() {
return relatedRecord;
}
public void setRelatedRecord(Object relatedRecord) {
this.relatedRecord = relatedRecord;
}
public Object getSeriesName() {
return seriesName;
}
public void setSeriesName(Object seriesName) {
this.seriesName = seriesName;
}
public Object getSeriesType() {
return seriesType;
}
public void setSeriesType(Object seriesType) {
this.seriesType = seriesType;
}
public Object getSeverity() {
return severity;
}
public void setSeverity(Object severity) {
this.severity = severity;
}
public Object getTreatRectPlan() {
return treatRectPlan;
}
public void setTreatRectPlan(Object treatRectPlan) {
this.treatRectPlan = treatRectPlan;
}
public Object getStatus() {
return status;
}
public void setStatus(Object status) {
this.status = status;
}
public Object getResponsibleUserId() {
return responsibleUserId;
}
public void setResponsibleUserId(Object responsibleUserId) {
this.responsibleUserId = responsibleUserId;
}
public Object getResponsibleUserName() {
return responsibleUserName;
}
public void setResponsibleUserName(Object responsibleUserName) {
this.responsibleUserName = responsibleUserName;
}
public Object getFactoryTreatmentDateTime() {
return factoryTreatmentDateTime;
}
public void setFactoryTreatmentDateTime(Object factoryTreatmentDateTime) {
this.factoryTreatmentDateTime = factoryTreatmentDateTime;
}
public Object getVerifyUserId() {
return verifyUserId;
}
public void setVerifyUserId(Object verifyUserId) {
this.verifyUserId = verifyUserId;
}
public Object getVerifyUserName() {
return verifyUserName;
}
public void setVerifyUserName(Object verifyUserName) {
this.verifyUserName = verifyUserName;
}
public Object getVerifyUserDate() {
return verifyUserDate;
}
public void setVerifyUserDate(Object verifyUserDate) {
this.verifyUserDate = verifyUserDate;
}
public Object getRecordUserId() {
return recordUserId;
}
public void setRecordUserId(Object recordUserId) {
this.recordUserId = recordUserId;
}
public Object getRecorUserName() {
return recorUserName;
}
public void setRecorUserName(Object recorUserName) {
this.recorUserName = recorUserName;
}
public Object getRecorUserDate() {
return recorUserDate;
}
public void setRecorUserDate(Object recorUserDate) {
this.recorUserDate = recorUserDate;
}
public Object getResponsibleDealId() {
return responsibleDealId;
}
public void setResponsibleDealId(Object responsibleDealId) {
this.responsibleDealId = responsibleDealId;
}
public Object getResponsibleDealName() {
return responsibleDealName;
}
public void setResponsibleDealName(Object responsibleDealName) {
this.responsibleDealName = responsibleDealName;
}
public Object getResponsibleDealDate() {
return responsibleDealDate;
}
public void setResponsibleDealDate(Object responsibleDealDate) {
this.responsibleDealDate = responsibleDealDate;
}
public Object getResponsibleCustId() {
return responsibleCustId;
}
public void setResponsibleCustId(Object responsibleCustId) {
this.responsibleCustId = responsibleCustId;
}
public Object getResponsibleCustName() {
return responsibleCustName;
}
public void setResponsibleCustName(Object responsibleCustName) {
this.responsibleCustName = responsibleCustName;
}
public Object getResponsibleCustDate() {
return responsibleCustDate;
}
public void setResponsibleCustDate(Object responsibleCustDate) {
this.responsibleCustDate = responsibleCustDate;
}
public Object getApprovalUserId() {
return approvalUserId;
}
public void setApprovalUserId(Object approvalUserId) {
this.approvalUserId = approvalUserId;
}
public Object getApprovalUserName() {
return approvalUserName;
}
public void setApprovalUserName(Object approvalUserName) {
this.approvalUserName = approvalUserName;
}
public Object getApprovalUserDate() {
return approvalUserDate;
}
public void setApprovalUserDate(Object approvalUserDate) {
this.approvalUserDate = approvalUserDate;
}
public Object getCreateUserId() {
return createUserId;
}
public void setCreateUserId(Object createUserId) {
this.createUserId = createUserId;
}
public Object getCreateUserName() {
return createUserName;
}
public void setCreateUserName(Object createUserName) {
this.createUserName = createUserName;
}
public Object getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(Object updateUserId) {
this.updateUserId = updateUserId;
}
public Object getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(Object updateUserName) {
this.updateUserName = updateUserName;
}
public Object getDefectMudIds() {
return defectMudIds;
}
public void setDefectMudIds(Object defectMudIds) {
this.defectMudIds = defectMudIds;
}
public Object getAttachment() {
return attachment;
}
public void setAttachment(Object attachment) {
this.attachment = attachment;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
public List<?> getAttachments() {
return attachments;
}
public void setAttachments(List<?> attachments) {
this.attachments = attachments;
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/DefectBean.java 0 → 100644
浏览文件 @ c347170a
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 DefectBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 10
* startRow : 1
* endRow : 10
* total : 32
* pages : 4
* list : [{"id":"214a5a0e8d1211ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1588491959000,"updateDateTime":1588491959000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2005001","defectName":"3333333","productClassType":"1","mainCause":"3333333333333333333333","severity":6,"detectionValue":9,"enable":true,"remark":"3333333333333333333333"},{"id":"2c7b57a2755211ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585880638000,"updateDateTime":1585880638000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2004004","defectName":"1111","productClassType":"1","mainCause":null,"severity":2,"detectionValue":null,"enable":true,"remark":null},{"id":"03d8070d755111ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585880140000,"updateDateTime":1585880140000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2004003","defectName":"111","productClassType":"1","mainCause":null,"severity":3,"detectionValue":2,"enable":true,"remark":null},{"id":"428d5da6725911ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585553828000,"updateDateTime":1585553828000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003012","defectName":"测试数据","productClassType":"0","mainCause":"测试","severity":1,"detectionValue":1,"enable":true,"remark":"测试"},{"id":"b57923256f3311ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585207846000,"updateDateTime":1585207846000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003011","defectName":"33","productClassType":"0","mainCause":"33","severity":6,"detectionValue":1,"enable":true,"remark":"33"},{"id":"9f09994d6f3311ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585207809000,"updateDateTime":1585207809000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003010","defectName":"20","productClassType":"2","mainCause":null,"severity":5,"detectionValue":null,"enable":true,"remark":null},{"id":"8d9c16136f3311ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585207779000,"updateDateTime":1585207779000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003009","defectName":"11","productClassType":"0","mainCause":null,"severity":1,"detectionValue":null,"enable":true,"remark":null},{"id":"bb6ef9e26f3111ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585206997000,"updateDateTime":1585206997000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003008","defectName":"444","productClassType":"1","mainCause":"44","severity":2,"detectionValue":2,"enable":true,"remark":"77"},{"id":"a99c9a616f3111ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585206967000,"updateDateTime":1585206967000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003002","defectName":"444","productClassType":"1","mainCause":"44","severity":2,"detectionValue":2,"enable":true,"remark":"77"},{"id":"8b6ea59d6f3111ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585206917000,"updateDateTime":1585206917000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003001","defectName":"123","productClassType":"1","mainCause":"1","severity":2,"detectionValue":2,"enable":true,"remark":"1"}]
* prePage : 0
* nextPage : 2
* isFirstPage : true
* isLastPage : false
* hasPreviousPage : false
* hasNextPage : true
* navigatePages : 8
* navigatepageNums : [1,2,3,4]
* navigateFirstPage : 1
* navigateLastPage : 4
* firstPage : 1
* lastPage : 4
*/
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/**
* id : 214a5a0e8d1211ea8334fa163e1166bd
* delete : false
* createUserId : 398c852b38e911ea8334fa163e1166bd
* updateUserId : 398c852b38e911ea8334fa163e1166bd
* createDateTime : 1588491959000
* updateDateTime : 1588491959000
* createbyName : hello
* updateByName : hello
* defectCode : QX2005001
* defectName : 3333333
* productClassType : 1
* mainCause : 3333333333333333333333
* severity : 6
* detectionValue : 9
* enable : true
* remark : 3333333333333333333333
*/
private String id;
private boolean delete;
private String createUserId;
private String updateUserId;
private long createDateTime;
private long updateDateTime;
private String createbyName;
private String updateByName;
private String defectCode;
private String defectName;
private String productClassType;
private String mainCause;
private int severity;
private int detectionValue;
private boolean enable;
private String remark;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
}
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 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 String getCreatebyName() {
return createbyName;
}
public void setCreatebyName(String createbyName) {
this.createbyName = createbyName;
}
public String getUpdateByName() {
return updateByName;
}
public void setUpdateByName(String updateByName) {
this.updateByName = updateByName;
}
public String getDefectCode() {
return defectCode;
}
public void setDefectCode(String defectCode) {
this.defectCode = defectCode;
}
public String getDefectName() {
return defectName;
}
public void setDefectName(String defectName) {
this.defectName = defectName;
}
public String getProductClassType() {
return productClassType;
}
public void setProductClassType(String productClassType) {
this.productClassType = productClassType;
}
public String getMainCause() {
return mainCause;
}
public void setMainCause(String mainCause) {
this.mainCause = mainCause;
}
public int getSeverity() {
return severity;
}
public void setSeverity(int severity) {
this.severity = severity;
}
public int getDetectionValue() {
return detectionValue;
}
public void setDetectionValue(int detectionValue) {
this.detectionValue = detectionValue;
}
public boolean isEnable() {
return enable;
}
public void setEnable(boolean enable) {
this.enable = enable;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/FeedbackDetailBean.java
浏览文件 @ c347170a
...@@ -115,7 +115,7 @@ public class FeedbackDetailBean { ...@@ -115,7 +115,7 @@ public class FeedbackDetailBean {
private String mainCause; private String mainCause;
private Object defectCount; private Object defectCount;
private Object defectCounts; private Object defectCounts;
private Object steelTypeId; private String steelTypeId;
private String steelTypeName; private String steelTypeName;
private String feedbackDescription; private String feedbackDescription;
private String otherProviderBehavior; private String otherProviderBehavior;
...@@ -381,11 +381,11 @@ public class FeedbackDetailBean { ...@@ -381,11 +381,11 @@ public class FeedbackDetailBean {
this.defectCounts = defectCounts; this.defectCounts = defectCounts;
} }
public Object getSteelTypeId() { public String getSteelTypeId() {
return steelTypeId; return steelTypeId;
} }
public void setSteelTypeId(Object steelTypeId) { public void setSteelTypeId(String steelTypeId) {
this.steelTypeId = steelTypeId; this.steelTypeId = steelTypeId;
} }
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ c347170a
...@@ -336,4 +336,35 @@ public interface MesApiService { ...@@ -336,4 +336,35 @@ public interface MesApiService {
@POST("/himes/api/user/show/page.json") @POST("/himes/api/user/show/page.json")
Observable<BaseMesBean> managerList( @Query("functionId") String functionId, @Body RequestBody requestBody); Observable<BaseMesBean> managerList( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 销售经理查询
*
* @return
*/
@POST("/himes/api/feedback/show/conster/list.json")
Observable<BaseMesBean> machineByUser( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 获取箱码接口
*
* @return
*/
@POST("/himes/api/mpsProduct/show/getMpsProduct/list.json")
Observable<BaseMesBean> boxNum( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 获取箱码接口
*
* @return
*/
@POST("/himes/api/defectdict/show/page.json")
Observable<BaseMesBean> defectList( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
*
* @return
*/
@POST("/himes/api/feedback/add/save.json")
Observable<BaseMesBean> feedbackAdd( @Query("functionId") String functionId, @Body RequestBody requestBody);
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesChooseBoxActivity.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.text.TextUtils;
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.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.BoxBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataAdd2Activity;
import com.wd.workoffice.ui.adapter.ChooseBoxAdapter;
import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
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 MesChooseBoxActivity 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<BoxBean> clientList;
private ChooseBoxAdapter clientAdapter;
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 ChooseBoxAdapter(R.layout.item_user_data_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.simpleParam();
paramMap = WorkUtils.simpleParam();
paramMap.put("custCode", getIntent().getStringExtra("code"));
param.put("paramMap", paramMap);
getData();
}
private void getData() {
RtfUtils.getMesRtf().boxNum("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<BoxBean> getList = JSON.parseArray(data.getData().toString(), BoxBean.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_bat_sale_client;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("productName", etKey.getText().toString());
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesChooseDefectActivity.java 0 → 100644
浏览文件 @ c347170a
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.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesDefectAdapter;
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 MesChooseDefectActivity 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<DefectBean.ListBean> clientList;
private MesDefectAdapter 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 MesDefectAdapter(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("productClassType", "");
param.put("paramMap", paramMap);
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().defectList("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<DefectBean.ListBean> getList = JSON.parseObject(data.getData().toString(), DefectBean.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("defectName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesChooseMachineActivity.java 0 → 100644
浏览文件 @ c347170a
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.ChooseMachineBean;
import com.wd.workoffice.bean.mesBean.ManagerUserBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesChooseMachinerAdapter;
import com.wd.workoffice.ui.adapter.MesManagerAdapter;
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 MesChooseMachineActivity extends WorkToolBarActivity {
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<ChooseMachineBean> clientList;
private MesChooseMachinerAdapter clientAdapter;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new MesChooseMachinerAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.simpleParam();
paramMap = WorkUtils.simpleParam();
paramMap.put("custCode",getIntent().getStringExtra("code"));
param.put("paramMap", paramMap);
getData();
}
private void getData() {
RtfUtils.getMesRtf().machineByUser("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<ChooseMachineBean> getList = JSON.parseArray(data.getData().toString(), ChooseMachineBean.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;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java
浏览文件 @ c347170a
package com.wd.workoffice.ui.activity.mes.quality; package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
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.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ProPriceBean; import com.wd.workoffice.bean.event.CheckFeedbackEvent;
import com.wd.workoffice.bean.mesBean.BoxBean;
import com.wd.workoffice.bean.mesBean.ChooseMachineBean;
import com.wd.workoffice.bean.mesBean.DefectBean;
import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
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.MesQualityAdapter; import com.wd.workoffice.ui.activity.mes.ticket.MesTicketClientActivity;
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.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
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.disposables.Disposable; import io.reactivex.disposables.Disposable;
...@@ -33,10 +43,47 @@ import io.reactivex.disposables.Disposable; ...@@ -33,10 +43,47 @@ import io.reactivex.disposables.Disposable;
**/ **/
public class MesQualityAddActivity extends WorkToolBarActivity { public class MesQualityAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
@BindView(R.id.tv_manager)
TextView tvManager;
@BindView(R.id.tv_phone)
TextView tvPhone;
@BindView(R.id.tv_box)
TextView tvBox;
@BindView(R.id.rl_box)
RelativeLayout rlBox;
@BindView(R.id.tv_pro_code)
TextView tvProCode;
@BindView(R.id.rl_pro)
RelativeLayout rlPro;
@BindView(R.id.tv_pro_name)
TextView tvProName;
@BindView(R.id.tv_spec)
TextView tvSpec;
@BindView(R.id.tv_img_code)
TextView tvImgCode;
@BindView(R.id.et_num)
EditText etNum;
@BindView(R.id.tv_mark_code)
TextView tvMarkCode;
@BindView(R.id.tv_machine)
TextView tvMachine;
@BindView(R.id.tv_steel)
TextView tvSteel;
@BindView(R.id.tv_defect)
TextView tvDefect;
@BindView(R.id.rl_defect)
RelativeLayout rlDefect;
@BindView(R.id.et_desc)
EditText etDesc;
private MesClientBean.ListBean chooseClient;
private ChooseMachineBean chooseMachine;
private Map<String, Object> param; private Map<String, Object> param;
private List<ProPriceBean.RecordsBean> dataList; private BoxBean chooseBox;
private MesQualityAdapter dataAdapter; private DefectBean.ListBean chooseDefect;
private int page = 1;
@Override @Override
protected void initView() { protected void initView() {
...@@ -46,49 +93,9 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -46,49 +93,9 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
// getData(); param = WorkUtils.simpleParam();
}
}
// private void getData() {
// RtfUtils.getRtf().getProHistoryPrice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
// @Override
// public void doOnSubscribe(Disposable d) {
// }
//
// @Override
// public void onFail(String errorMsg) {
// hideLoading();
// toast(errorMsg);
// }
//
// @Override
// public void onSuccess(BaseBean data) {
// hideLoading();
// if (data.getCode() != 0) {
// toast(data.getMsg());
// return;
// }
// List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();
//
// if (page == 1) {
// srlRefresh.finishRefresh();
// dataList.clear();
// dataList.addAll(getList);
// dataAdapter.notifyDataSetChanged();
// dataAdapter.loadMoreComplete();
// } else {
// dataAdapter.loadMoreComplete();
// dataList.addAll(getList);
// dataAdapter.notifyDataSetChanged();
// }
// if (getList.size() == 0) {
// dataAdapter.loadMoreEnd();
// } else {
// page++;
// }
// }
// });
// }
@Override @Override
...@@ -101,4 +108,139 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -101,4 +108,139 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.rl_machine, R.id.rl_client, R.id.rl_box, R.id.rl_defect})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_client:
startActivityForResult(MesTicketClientActivity.class,
10001);
break;
case R.id.rl_machine:
if (chooseClient == null) {
toast("请先选择客户");
return;
}
startActivityForResult(MesChooseMachineActivity.class,
10002, "code", chooseClient.getCustomerCode());
break;
case R.id.rl_box:
if (chooseClient == null) {
toast("请先选择客户");
return;
}
startActivityForResult(MesChooseBoxActivity.class,
10003, "code", chooseClient.getCustomerCode());
break;
case R.id.rl_defect:
if (chooseBox == null) {
toast("请先选择箱号");
return;
}
startActivityForResult(MesChooseDefectActivity.class,
10004, "code", chooseBox.getBasketId());
break;
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
chooseClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
tvClient.setText(chooseClient.getCustomerName());
// tvPhone.setText(chooseClient.get());
tvManager.setText(chooseClient.getSalesManagerName());
param.put("customerId", chooseClient.getCustomerCode());
param.put("customerName", chooseClient.getCustomerName());
param.put("saleUserCode", chooseClient.getSalesManagerCode());
param.put("saleUserName", chooseClient.getSalesManagerName());
} else if (requestCode == 10002 && resultCode == 10001) {
chooseMachine = JSON.parseObject(data.getStringExtra("data"), ChooseMachineBean.class);
tvMachine.setText(chooseMachine.getCasterName());
tvSteel.setText(chooseMachine.getSteelTypeId());
param.put("steelTypeId", chooseMachine.getSteelTypeId());
param.put("casterName", chooseMachine.getCasterName());
} else if (requestCode == 10003 && resultCode == 10001) {
chooseBox = JSON.parseObject(data.getStringExtra("data"), BoxBean.class);
tvProCode.setText(chooseBox.getProductCode());
tvProName.setText(chooseBox.getProductName());
tvSpec.setText(chooseBox.getSpecification());
tvImgCode.setText(chooseBox.getDrawingNumber());
tvMarkCode.setText(chooseBox.getSerialNumber());
tvBox.setText(chooseBox.getBoxId());
param.put("serialNumber", chooseBox.getSerialNumber());
param.put("drawingNumber", chooseBox.getDrawingNumber());
param.put("specification", chooseBox.getSpecification());
param.put("productCode", chooseBox.getProductCode());
param.put("productName", chooseBox.getProductName());
param.put("boxCode", chooseBox.getBoxNumber());
param.put("boxId", chooseBox.getBoxId());
} else if (requestCode == 10004 && resultCode == 10001) {
chooseDefect = JSON.parseObject(data.getStringExtra("data"), DefectBean.ListBean.class);
tvDefect.setText(chooseDefect.getDefectName());
etDesc.setText(chooseDefect.getRemark());
param.put("mainCause", chooseDefect.getRemark());
param.put("defectCode", chooseDefect.getDefectCode());
param.put("defectName", chooseDefect.getDefectName());
}
}
@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 (chooseClient == null) {
toast("请先选择客户");
break;
}
if (chooseMachine == null) {
toast("请先选择连铸机");
break;
}
if (chooseBox == null) {
toast("请先选择箱号");
break;
}
if (chooseDefect == null) {
toast("请先选择缺陷");
break;
}
// param.put("", "");
submit();
break;
}
return super.onOptionsItemSelected(item);
}
private void submit() {
RtfUtils.getMesRtf().feedbackAdd("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;
}
EventBus.getDefault().post(new CheckFeedbackEvent());
toast("新增成功");
finish();
}
});
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java
浏览文件 @ c347170a
...@@ -203,7 +203,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -203,7 +203,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
tvNum.setText(detailBean.getVerson()); tvNum.setText(detailBean.getVerson());
tvMarkCode.setText(detailBean.getSerialNumber()); tvMarkCode.setText(detailBean.getSerialNumber());
tvMachine.setText(detailBean.getCasterName()); tvMachine.setText(detailBean.getCasterName());
tvSteelType.setText(detailBean.getSteelTypeName()); tvSteelType.setText(detailBean.getSteelTypeId());
tvDefect.setText(detailBean.getDefectName()); tvDefect.setText(detailBean.getDefectName());
tvDefectReason.setText(detailBean.getMainCause()); tvDefectReason.setText(detailBean.getMainCause());
//二、销售经理反馈信息 //二、销售经理反馈信息
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketClientActivity.java
浏览文件 @ c347170a
...@@ -47,6 +47,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity { ...@@ -47,6 +47,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
private List<MesClientBean.ListBean> clientList; private List<MesClientBean.ListBean> clientList;
private MesClientAdapter clientAdapter; private MesClientAdapter clientAdapter;
private int page = 1; private int page = 1;
private Map<String, Object> paramMap;
@Override @Override
protected void initView() { protected void initView() {
...@@ -64,8 +65,10 @@ public class MesTicketClientActivity extends WorkToolBarActivity { ...@@ -64,8 +65,10 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
clientAdapter = new MesClientAdapter(R.layout.item_store_client, clientList); clientAdapter = new MesClientAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient); clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient); clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
paramMap = WorkUtils.simpleParam();
param = WorkUtils.pageMesKey(); param = WorkUtils.pageMesKey();
param.put("pageNum", 1); param.put("pageNum", 1);
param.put("paramMap",paramMap);
getData(); getData();
} }
...@@ -137,7 +140,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity { ...@@ -137,7 +140,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search) @OnClick(R.id.btn_search)
public void onViewClicked() { public void onViewClicked() {
param.put("name", etKey.getText().toString()); paramMap.put("customerName", etKey.getText().toString());
param.put("pageNum", 1); param.put("pageNum", 1);
page = 1; page = 1;
getData(); getData();
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java
浏览文件 @ c347170a
...@@ -60,6 +60,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity { ...@@ -60,6 +60,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
private List<FactoryBean> clientList; private List<FactoryBean> clientList;
private UserDataFactorytAdapter clientAdapter; private UserDataFactorytAdapter clientAdapter;
private UserDataBean.ListBean data; private UserDataBean.ListBean data;
private Map<String, Object> paramMap;
@Override @Override
protected void initView() { protected void initView() {
...@@ -76,7 +77,9 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity { ...@@ -76,7 +77,9 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
clientAdapter = new UserDataFactorytAdapter(R.layout.item_store_client, clientList); clientAdapter = new UserDataFactorytAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient); clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient); clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
paramMap = WorkUtils.simpleParam();
param = WorkUtils.pageKey(); param = WorkUtils.pageKey();
param.put("paramMap", paramMap);
getData(); getData();
} }
...@@ -140,7 +143,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity { ...@@ -140,7 +143,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search) @OnClick(R.id.btn_search)
public void onViewClicked() { public void onViewClicked() {
param.put("steelmakingWorksName", etKey.getText().toString()); paramMap.put("steelmakingWorksName", etKey.getText().toString());
getData(); getData();
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.java
浏览文件 @ c347170a
...@@ -60,7 +60,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity { ...@@ -60,7 +60,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
private List<MachineBean> clientList; private List<MachineBean> clientList;
private UserDataChooseMachineAdapter clientAdapter; private UserDataChooseMachineAdapter clientAdapter;
private UserDataBean.ListBean data; private UserDataBean.ListBean data;
private Map<String, Object> paramMap;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -75,7 +75,9 @@ public class MesChooseMachineActivity extends WorkToolBarActivity { ...@@ -75,7 +75,9 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
clientAdapter = new UserDataChooseMachineAdapter(R.layout.item_store_client, clientList); clientAdapter = new UserDataChooseMachineAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient); clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient); clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
paramMap = WorkUtils.simpleParam();
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
param.put("paramMap", paramMap);
param.put("steelmakingWorksCode", data.getSteelmakingWorksCode()); param.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
getData(); getData();
} }
...@@ -136,7 +138,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity { ...@@ -136,7 +138,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search) @OnClick(R.id.btn_search)
public void onViewClicked() { public void onViewClicked() {
param.put("continuousCasterName", etKey.getText().toString()); paramMap.put("continuousCasterName", etKey.getText().toString());
getData(); getData();
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/ChooseBoxAdapter.java 0 → 100644
浏览文件 @ c347170a
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.MesClientBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class ChooseBoxAdapter extends BaseQuickAdapter<BoxBean, BaseViewHolder> {
public ChooseBoxAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, BoxBean item) {
helper.setText(R.id.tv_name, item.getBoxId());
helper.setText(R.id.tv_person, item.getProductCode());
helper.setText(R.id.tv_sale, item.getProductName());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesChooseMachinerAdapter.java 0 → 100644
浏览文件 @ c347170a
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.ChooseMachineBean;
import com.wd.workoffice.bean.mesBean.ManagerUserBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesChooseMachinerAdapter extends BaseQuickAdapter<ChooseMachineBean, BaseViewHolder> {
public MesChooseMachinerAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ChooseMachineBean item) {
helper.setText(R.id.tv_name, item.getCasterName());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesDefectAdapter.java 0 → 100644
浏览文件 @ c347170a
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 java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesDefectAdapter extends BaseQuickAdapter<DefectBean.ListBean, BaseViewHolder> {
public MesDefectAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, DefectBean.ListBean item) {
helper.setText(R.id.tv_name, item.getDefectName());
}
}
app/src/main/res/layout/activity_mes_choose_machine.xml 0 → 100644
浏览文件 @ c347170a
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_client"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="4mm">
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_mes_quality_add.xml
浏览文件 @ c347170a
...@@ -23,55 +23,46 @@ ...@@ -23,55 +23,46 @@
</RelativeLayout> </RelativeLayout>
<LinearLayout <RelativeLayout
android:id="@+id/rl_client"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="反馈单号"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10mm" android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="客户名称"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout>
<View style="@style/dividerX" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:layout_alignParentRight="true"
android:paddingVertical="9mm"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_client"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="客户名称" android:layout_alignParentLeft="true"
android:textSize="14sp" /> android:layout_marginRight="3mm"
android:text="请选择"
<EditText
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginLeft="10mm"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:hint="请输入"
android:padding="3mm"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout <RelativeLayout
...@@ -95,18 +86,19 @@ ...@@ -95,18 +86,19 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_manager"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView <ImageView
android:layout_width="15mm" android:layout_width="15mm"
android:layout_height="20mm" android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" /> android:src="@mipmap/arrow_right_gray"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -125,7 +117,8 @@ ...@@ -125,7 +117,8 @@
android:text="联系电话" android:text="联系电话"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <TextView
android:id="@+id/tv_phone"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -133,7 +126,6 @@ ...@@ -133,7 +126,6 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入"
android:padding="3mm" android:padding="3mm"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -142,6 +134,7 @@ ...@@ -142,6 +134,7 @@
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout <RelativeLayout
android:id="@+id/rl_box"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
...@@ -152,7 +145,7 @@ ...@@ -152,7 +145,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="产品编码" android:text="箱码"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
...@@ -162,6 +155,7 @@ ...@@ -162,6 +155,7 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_box"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
...@@ -181,6 +175,7 @@ ...@@ -181,6 +175,7 @@
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout <RelativeLayout
android:id="@+id/rl_pro"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
...@@ -191,7 +186,7 @@ ...@@ -191,7 +186,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="产品名称" android:text="产品编码"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
...@@ -201,18 +196,19 @@ ...@@ -201,18 +196,19 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_pro_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView <ImageView
android:layout_width="15mm" android:layout_width="15mm"
android:layout_height="20mm" android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" /> android:src="@mipmap/arrow_right_gray"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -230,7 +226,7 @@ ...@@ -230,7 +226,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="规格型号" android:text="产品名称"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
...@@ -240,18 +236,19 @@ ...@@ -240,18 +236,19 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_pro_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView <ImageView
android:layout_width="15mm" android:layout_width="15mm"
android:layout_height="20mm" android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" /> android:src="@mipmap/arrow_right_gray"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -269,7 +266,7 @@ ...@@ -269,7 +266,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="图号" android:text="规格型号"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
...@@ -279,18 +276,19 @@ ...@@ -279,18 +276,19 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_spec"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView <ImageView
android:layout_width="15mm" android:layout_width="15mm"
android:layout_height="20mm" android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" /> android:src="@mipmap/arrow_right_gray"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -308,7 +306,7 @@ ...@@ -308,7 +306,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="箱码" android:text="图号"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
...@@ -318,24 +316,26 @@ ...@@ -318,24 +316,26 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_img_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView <ImageView
android:layout_width="15mm" android:layout_width="15mm"
android:layout_height="20mm" android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" /> android:src="@mipmap/arrow_right_gray"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -349,6 +349,7 @@ ...@@ -349,6 +349,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
android:id="@+id/et_num"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -385,25 +386,28 @@ ...@@ -385,25 +386,28 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_mark_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView <ImageView
android:layout_width="15mm" android:layout_width="15mm"
android:layout_height="20mm" android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" /> android:src="@mipmap/arrow_right_gray"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<LinearLayout
<RelativeLayout
android:id="@+id/rl_machine"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
...@@ -412,23 +416,36 @@ ...@@ -412,23 +416,36 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="对应连铸机" android:text="对应连铸机"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <LinearLayout
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginLeft="10mm" android:gravity="center_vertical">
android:layout_weight="1"
android:background="@null" <TextView
android:gravity="right" android:id="@+id/tv_machine"
android:hint="请输入" android:layout_width="wrap_content"
android:padding="3mm" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout <RelativeLayout
...@@ -452,18 +469,14 @@ ...@@ -452,18 +469,14 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_steel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -471,6 +484,7 @@ ...@@ -471,6 +484,7 @@
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout <RelativeLayout
android:id="@+id/rl_defect"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
...@@ -491,6 +505,7 @@ ...@@ -491,6 +505,7 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_defect"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论