Skip to content

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

1.质量反馈问题 

2.//TODO 设备三个子菜单,坩埚下单，mes其他页面，质量反馈字段修改，mes新菜单，mes用户反馈空也展示，编辑任务担当无法修改.支数参数
上级 70aff204
隐藏空白字符变更
内嵌 并排
正在显示 包含 1848 行增加 和 397 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ e90fa317
...@@ -1553,7 +1553,7 @@ ...@@ -1553,7 +1553,7 @@
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.quality.MesQualityFactoryActivity" android:name=".ui.activity.mes.quality.MesQualityAboutDeptActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
android:label="质量反馈审核意见" android:label="质量反馈审核意见"
android:launchMode="singleTop" android:launchMode="singleTop"
...@@ -1561,7 +1561,7 @@ ...@@ -1561,7 +1561,7 @@
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.quality.MesQualityManagerActivity" android:name=".ui.activity.mes.quality.MesQualityDeptActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
android:label="质量反馈审核意见" android:label="质量反馈审核意见"
android:launchMode="singleTop" android:launchMode="singleTop"
...@@ -1953,7 +1953,14 @@ ...@@ -1953,7 +1953,14 @@
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.MesChooseQuestionDeptActivity"
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/ChooseDeptBean.java 0 → 100644
浏览文件 @ e90fa317
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 ChooseDeptBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 10
* startRow : 1
* endRow : 10
* total : 30
* pages : 3
* list : [{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS02","siteName":"销售二公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS03","siteName":"销售三公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS04","siteName":"销售四公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS05","siteName":"销售五公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS06","siteName":"销售六公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS07","siteName":"销售七公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS08","siteName":"销售锆碳公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS09","siteName":"销售坩埚公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWXS10","siteName":"销售铝碳公司（GK）","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null},{"id":null,"createDateTime":null,"updateDateTime":null,"feedbackCode":null,"productId":null,"productCode":null,"productName":null,"drawingNumber":null,"verson":null,"specification":null,"customerId":null,"customerName":null,"saleUserId":null,"saleUserCode":null,"saleUserName":null,"phoneNumber":null,"boxId":null,"boxCode":null,"serialNumber":null,"caster":null,"casterName":null,"defectId":null,"defectCode":null,"defectName":null,"mainCause":null,"defectCount":null,"defectCounts":null,"steelTypeId":null,"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,"orderId":null,"status":null,"attachments":[],"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,"procId":null,"approved":null,"responsibleUserId":null,"responsibleUserName":null,"responsibleQualityId":null,"responsibleQualityName":null,"responsibleQualityDate":null,"siteId":null,"siteCode":"ZWLT01","siteName":"铝碳生产部","analyCause":null,"closeUserId":null,"closeUserName":null,"closeUserDate":null,"releDepUserId":null,"releDepUserName":null,"releDepUserDate":null,"attachmentVO":null,"defectMudIds":null,"factoryTreatmentDateTime":null,"delete":null}]
* prePage : 0
* nextPage : 2
* isFirstPage : true
* isLastPage : false
* hasPreviousPage : false
* hasNextPage : true
* navigatePages : 8
* navigatepageNums : [1,2,3]
* navigateFirstPage : 1
* navigateLastPage : 3
* firstPage : 1
* lastPage : 3
*/
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/**
* id : null
* createDateTime : null
* updateDateTime : null
* feedbackCode : null
* productId : null
* productCode : null
* productName : null
* drawingNumber : null
* verson : null
* specification : null
* customerId : null
* customerName : null
* saleUserId : null
* saleUserCode : null
* saleUserName : null
* phoneNumber : null
* boxId : null
* boxCode : null
* serialNumber : null
* caster : null
* casterName : null
* defectId : null
* defectCode : null
* defectName : null
* mainCause : null
* defectCount : null
* defectCounts : null
* steelTypeId : null
* 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
* orderId : null
* status : null
* attachments : []
* 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
* procId : null
* approved : null
* responsibleUserId : null
* responsibleUserName : null
* responsibleQualityId : null
* responsibleQualityName : null
* responsibleQualityDate : null
* siteId : null
* siteCode : ZWXS02
* siteName : 销售二公司（GK）
* analyCause : null
* closeUserId : null
* closeUserName : null
* closeUserDate : null
* releDepUserId : null
* releDepUserName : null
* releDepUserDate : null
* attachmentVO : null
* defectMudIds : null
* factoryTreatmentDateTime : 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 verson;
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 Object caster;
private Object casterName;
private Object defectId;
private Object defectCode;
private Object defectName;
private Object mainCause;
private Object defectCount;
private Object defectCounts;
private Object 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 orderId;
private Object status;
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 procId;
private Object approved;
private Object responsibleUserId;
private Object responsibleUserName;
private Object responsibleQualityId;
private Object responsibleQualityName;
private Object responsibleQualityDate;
private String siteId;
private String siteCode;
private String siteName;
private Object analyCause;
private Object closeUserId;
private Object closeUserName;
private Object closeUserDate;
private Object releDepUserId;
private Object releDepUserName;
private Object releDepUserDate;
private Object attachmentVO;
private Object defectMudIds;
private Object factoryTreatmentDateTime;
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 getVerson() {
return verson;
}
public void setVerson(Object verson) {
this.verson = verson;
}
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 Object getCaster() {
return caster;
}
public void setCaster(Object caster) {
this.caster = caster;
}
public Object getCasterName() {
return casterName;
}
public void setCasterName(Object casterName) {
this.casterName = casterName;
}
public Object getDefectId() {
return defectId;
}
public void setDefectId(Object defectId) {
this.defectId = defectId;
}
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 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 getSteelTypeId() {
return steelTypeId;
}
public void setSteelTypeId(Object 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 getOrderId() {
return orderId;
}
public void setOrderId(Object orderId) {
this.orderId = orderId;
}
public Object getStatus() {
return status;
}
public void setStatus(Object status) {
this.status = status;
}
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 getProcId() {
return procId;
}
public void setProcId(Object procId) {
this.procId = procId;
}
public Object getApproved() {
return approved;
}
public void setApproved(Object approved) {
this.approved = approved;
}
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 getResponsibleQualityId() {
return responsibleQualityId;
}
public void setResponsibleQualityId(Object responsibleQualityId) {
this.responsibleQualityId = responsibleQualityId;
}
public Object getResponsibleQualityName() {
return responsibleQualityName;
}
public void setResponsibleQualityName(Object responsibleQualityName) {
this.responsibleQualityName = responsibleQualityName;
}
public Object getResponsibleQualityDate() {
return responsibleQualityDate;
}
public void setResponsibleQualityDate(Object responsibleQualityDate) {
this.responsibleQualityDate = responsibleQualityDate;
}
public String getSiteId() {
return siteId;
}
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public Object getAnalyCause() {
return analyCause;
}
public void setAnalyCause(Object analyCause) {
this.analyCause = analyCause;
}
public Object getCloseUserId() {
return closeUserId;
}
public void setCloseUserId(Object closeUserId) {
this.closeUserId = closeUserId;
}
public Object getCloseUserName() {
return closeUserName;
}
public void setCloseUserName(Object closeUserName) {
this.closeUserName = closeUserName;
}
public Object getCloseUserDate() {
return closeUserDate;
}
public void setCloseUserDate(Object closeUserDate) {
this.closeUserDate = closeUserDate;
}
public Object getReleDepUserId() {
return releDepUserId;
}
public void setReleDepUserId(Object releDepUserId) {
this.releDepUserId = releDepUserId;
}
public Object getReleDepUserName() {
return releDepUserName;
}
public void setReleDepUserName(Object releDepUserName) {
this.releDepUserName = releDepUserName;
}
public Object getReleDepUserDate() {
return releDepUserDate;
}
public void setReleDepUserDate(Object releDepUserDate) {
this.releDepUserDate = releDepUserDate;
}
public Object getAttachmentVO() {
return attachmentVO;
}
public void setAttachmentVO(Object attachmentVO) {
this.attachmentVO = attachmentVO;
}
public Object getDefectMudIds() {
return defectMudIds;
}
public void setDefectMudIds(Object defectMudIds) {
this.defectMudIds = defectMudIds;
}
public Object getFactoryTreatmentDateTime() {
return factoryTreatmentDateTime;
}
public void setFactoryTreatmentDateTime(Object factoryTreatmentDateTime) {
this.factoryTreatmentDateTime = factoryTreatmentDateTime;
}
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/FeedbackDetailBean.java
浏览文件 @ e90fa317
...@@ -107,7 +107,7 @@ public class FeedbackDetailBean { ...@@ -107,7 +107,7 @@ public class FeedbackDetailBean {
private Object boxId; private Object boxId;
private String boxCode; private String boxCode;
private String serialNumber; private String serialNumber;
private Object caster; private String caster;
private String casterName; private String casterName;
private Object defectId; private Object defectId;
private Object defectCode; private Object defectCode;
...@@ -126,7 +126,7 @@ public class FeedbackDetailBean { ...@@ -126,7 +126,7 @@ public class FeedbackDetailBean {
private String factoryImplement; private String factoryImplement;
private Object procedureId; private Object procedureId;
private String procedureCode; private String procedureCode;
private Object procedureName; private String procedureName;
private Object defectMudId; private Object defectMudId;
private Object defectMudCode; private Object defectMudCode;
private String defectMudName; private String defectMudName;
...@@ -138,7 +138,7 @@ public class FeedbackDetailBean { ...@@ -138,7 +138,7 @@ public class FeedbackDetailBean {
private Object severity; private Object severity;
private String treatRectPlan; private String treatRectPlan;
private String status; private String status;
private List<ImageBean> attachments; private List<ImageBean> attachments;
private Object responsibleUserId; private Object responsibleUserId;
private String responsibleUserName; private String responsibleUserName;
private String factoryTreatmentDateTime; private String factoryTreatmentDateTime;
...@@ -165,6 +165,69 @@ public class FeedbackDetailBean { ...@@ -165,6 +165,69 @@ public class FeedbackDetailBean {
private AttachmentVOBean attachmentVO; private AttachmentVOBean attachmentVO;
private Object defectMudIds; private Object defectMudIds;
private boolean delete; private boolean delete;
private String responsibleQualityDate;
private String responsibleQualityName;
private String closeUserId;
private String closeUserDate;
private String closeUserName;
private String siteName;
private String analyCause;
public String getAnalyCause() {
return analyCause;
}
public void setAnalyCause(String analyCause) {
this.analyCause = analyCause;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public String getCloseUserName() {
return closeUserName;
}
public void setCloseUserName(String closeUserName) {
this.closeUserName = closeUserName;
}
public String getCloseUserId() {
return closeUserId;
}
public void setCloseUserId(String closeUserId) {
this.closeUserId = closeUserId;
}
public String getCloseUserDate() {
return closeUserDate;
}
public void setCloseUserDate(String closeUserDate) {
this.closeUserDate = closeUserDate;
}
public String getResponsibleQualityDate() {
return responsibleQualityDate;
}
public void setResponsibleQualityDate(String responsibleQualityDate) {
this.responsibleQualityDate = responsibleQualityDate;
}
public String getResponsibleQualityName() {
return responsibleQualityName;
}
public void setResponsibleQualityName(String responsibleQualityName) {
this.responsibleQualityName = responsibleQualityName;
}
public String getProcId() { public String getProcId() {
return procId; return procId;
...@@ -326,11 +389,11 @@ public class FeedbackDetailBean { ...@@ -326,11 +389,11 @@ public class FeedbackDetailBean {
this.serialNumber = serialNumber; this.serialNumber = serialNumber;
} }
public Object getCaster() { public String getCaster() {
return caster; return caster;
} }
public void setCaster(Object caster) { public void setCaster(String caster) {
this.caster = caster; this.caster = caster;
} }
...@@ -478,11 +541,11 @@ public class FeedbackDetailBean { ...@@ -478,11 +541,11 @@ public class FeedbackDetailBean {
this.procedureCode = procedureCode; this.procedureCode = procedureCode;
} }
public Object getProcedureName() { public String getProcedureName() {
return procedureName; return procedureName;
} }
public void setProcedureName(Object procedureName) { public void setProcedureName(String procedureName) {
this.procedureName = procedureName; this.procedureName = procedureName;
} }
...@@ -574,11 +637,11 @@ public class FeedbackDetailBean { ...@@ -574,11 +637,11 @@ public class FeedbackDetailBean {
this.status = status; this.status = status;
} }
public List<ImageBean> getAttachments() { public List<ImageBean> getAttachments() {
return attachments; return attachments;
} }
public void setAttachments( List<ImageBean> attachments) { public void setAttachments(List<ImageBean> attachments) {
this.attachments = attachments; this.attachments = attachments;
} }
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ e90fa317
...@@ -456,6 +456,11 @@ public interface MesApiService { ...@@ -456,6 +456,11 @@ public interface MesApiService {
*/ */
@POST("/himes/api/feedback/show/bom/page.json") @POST("/himes/api/feedback/show/bom/page.json")
Observable<BaseMesBean> questionList(@Query("functionId") String functionId, @Body RequestBody requestBody); Observable<BaseMesBean> questionList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/feedback/show/siteList.json")
Observable<BaseMesBean> questionDeptList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/** /**
* @return * @return
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesChooseQuestionDeptActivity.java 0 → 100644
浏览文件 @ e90fa317
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.ChooseDeptBean;
import com.wd.workoffice.bean.mesBean.QuestionBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesQuestionAdapter;
import com.wd.workoffice.ui.adapter.MesQuestionDeptAdapter;
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 MesChooseQuestionDeptActivity 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<ChooseDeptBean.ListBean> clientList;
private MesQuestionDeptAdapter 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 MesQuestionDeptAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
param.put("paramMap", paramMap);
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().questionDeptList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
List<ChooseDeptBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ChooseDeptBean.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("siteName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityFactoryActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAboutDeptActivity.java
浏览文件 @ e90fa317
...@@ -22,7 +22,6 @@ import com.wd.workoffice.retrofit.RtfUtils; ...@@ -22,7 +22,6 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.DataKeeper; import com.wd.workoffice.util.DataKeeper;
import com.wd.workoffice.util.PickTimeUtils; import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -44,7 +43,7 @@ import io.reactivex.disposables.Disposable; ...@@ -44,7 +43,7 @@ import io.reactivex.disposables.Disposable;
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class MesQualityFactoryActivity extends WorkToolBarActivity { public class MesQualityAboutDeptActivity extends WorkToolBarActivity {
@BindView(R.id.tv_factory_reason) @BindView(R.id.tv_factory_reason)
EditText tvFactoryReason; EditText tvFactoryReason;
@BindView(R.id.tv_factory_suggest) @BindView(R.id.tv_factory_suggest)
...@@ -86,7 +85,6 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity { ...@@ -86,7 +85,6 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class); data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
param.put("id", data.getId()); param.put("id", data.getId());
param.put("procId", data.getProcId()); param.put("procId", data.getProcId());
// param.put("status",3);
} }
private void submit() { private void submit() {
...@@ -95,9 +93,10 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity { ...@@ -95,9 +93,10 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
// tvVerifyPerson.setText(detailBean.getApprovalUserName()); // tvVerifyPerson.setText(detailBean.getApprovalUserName());
// tvQuestion.setText(detailBean.getDefectMudName()); // tvQuestion.setText(detailBean.getDefectMudName());
// tvTime.setText(detailBean.getFactoryTreatmentDateTime()); // tvTime.setText(detailBean.getFactoryTreatmentDateTime());
param.put("factoryAnalysis",tvFactoryReason.getText().toString()); param.put("analyCause",tvFactoryReason.getText().toString());
param.put("factoryImplement",tvFactoryStatus.getText().toString()); param.put("factoryImplement",tvFactoryStatus.getText().toString());
param.put("factoryLeaderOpinion",tvFactorySuggest.getText().toString()); param.put("treatRectPlan",tvFactorySuggest.getText().toString());
param.put("verifyUserDate",TimeUtils.getNowString());
RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
...@@ -117,7 +116,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity { ...@@ -117,7 +116,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
return; return;
} }
EventBus.getDefault().post(new CheckFeedbackEvent()); EventBus.getDefault().post(new CheckFeedbackEvent());
toast("审核成功"); toast("提交成功");
finish(); finish();
} }
}); });
...@@ -129,7 +128,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity { ...@@ -129,7 +128,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_quality_factory; return R.layout.activity_mes_quality_other_dept;
} }
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java
浏览文件 @ e90fa317
package com.wd.workoffice.ui.activity.mes.quality; package com.wd.workoffice.ui.activity.mes.quality;
import android.Manifest;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.tbruyelle.rxpermissions2.RxPermissions;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
...@@ -20,23 +26,38 @@ import com.wd.workoffice.bean.mesBean.BoxBean; ...@@ -20,23 +26,38 @@ import com.wd.workoffice.bean.mesBean.BoxBean;
import com.wd.workoffice.bean.mesBean.ChooseMachineBean; import com.wd.workoffice.bean.mesBean.ChooseMachineBean;
import com.wd.workoffice.bean.mesBean.DefectBean; import com.wd.workoffice.bean.mesBean.DefectBean;
import com.wd.workoffice.bean.mesBean.FeedbackBean; import com.wd.workoffice.bean.mesBean.FeedbackBean;
import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.MesClientBean; 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.activity.mes.ticket.MesTicketClientActivity; import com.wd.workoffice.ui.activity.mes.ticket.MesTicketClientActivity;
import com.wd.workoffice.ui.adapter.ImgAddAdapter;
import com.wd.workoffice.util.Glide4Engine;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import com.zhihu.matisse.Matisse;
import com.zhihu.matisse.MimeType;
import com.zhihu.matisse.internal.entity.CaptureStrategy;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.FileUtils;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
/** /**
* author : flexible * author : flexible
...@@ -68,7 +89,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -68,7 +89,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_img_code) @BindView(R.id.tv_img_code)
TextView tvImgCode; TextView tvImgCode;
@BindView(R.id.et_num) @BindView(R.id.et_num)
TextView etNum; EditText etNum;
@BindView(R.id.tv_mark_code) @BindView(R.id.tv_mark_code)
TextView tvMarkCode; TextView tvMarkCode;
@BindView(R.id.tv_machine) @BindView(R.id.tv_machine)
...@@ -89,25 +110,45 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -89,25 +110,45 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
LinearLayout llBottom; LinearLayout llBottom;
@BindView(R.id.rl_machine) @BindView(R.id.rl_machine)
RelativeLayout rlMachine; RelativeLayout rlMachine;
@BindView(R.id.tv_feedback_desc)
EditText tvFeedbackDesc;
@BindView(R.id.tv_other_supplier)
EditText tvOtherSupplier;
@BindView(R.id.tv_feedback_suggest)
EditText tvFeedbackSuggest;
@BindView(R.id.rv_img)
RecyclerView rvImg;
private MesClientBean.ListBean chooseClient; private MesClientBean.ListBean chooseClient;
private ChooseMachineBean chooseMachine; private ChooseMachineBean chooseMachine;
private Map<String, Object> param; private Map<String, Object> param;
private BoxBean chooseBox; private BoxBean chooseBox;
private DefectBean.ListBean chooseDefect; private DefectBean.ListBean chooseDefect;
private List<ImageBean> imgList;
private ImgAddAdapter imgAddAdapter;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
rvImg.setLayoutManager( new GridLayoutManager(this,3,RecyclerView.VERTICAL,false));
} }
@Override @Override
protected void initData() { protected void initData() {
imgList=new ArrayList<>();
ImageBean imageBean = new ImageBean();
imageBean.setUri(null);
imgList.add(imageBean);
imgAddAdapter = new ImgAddAdapter(R.layout.item_mes_ticket_img, imgList);
imgAddAdapter.bindToRecyclerView(rvImg);
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
String data = getIntent().getStringExtra("data"); String data = getIntent().getStringExtra("data");
if (!TextUtils.isEmpty(data)) { if (!TextUtils.isEmpty(data)) {
FeedbackBean.ListBean ticketBean = JSON.parseObject(data, FeedbackBean.ListBean.class); FeedbackBean.ListBean ticketBean = JSON.parseObject(data, FeedbackBean.ListBean.class);
param.put("id",ticketBean.getId()); tvFeedbackDesc.setText(ticketBean.getFeedbackDescription());
tvOtherSupplier.setText(ticketBean.getOtherProviderBehavior());
tvFeedbackSuggest.setText(ticketBean.getSalerOpinion());
param.put("id", ticketBean.getId());
chooseClient = new MesClientBean.ListBean(); chooseClient = new MesClientBean.ListBean();
chooseClient.setCustomerCode(ticketBean.getCustomerId()); chooseClient.setCustomerCode(ticketBean.getCustomerId());
chooseClient.setCustomerName(ticketBean.getCustomerName()); chooseClient.setCustomerName(ticketBean.getCustomerName());
...@@ -125,14 +166,15 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -125,14 +166,15 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
chooseMachine = new ChooseMachineBean(); chooseMachine = new ChooseMachineBean();
chooseMachine.setSteelTypeId(ticketBean.getSteelTypeId()); chooseMachine.setSteelTypeId(ticketBean.getSteelTypeId());
chooseMachine.setCasterName(ticketBean.getCasterName()); chooseMachine.setCasterName(ticketBean.getCasterName());
chooseMachine.setCaster(ticketBean.getCaster());
chooseMachine.setDefectCount(ticketBean.getDefectCount() + ""); chooseMachine.setDefectCount(ticketBean.getDefectCount() + "");
tvMachine.setText(chooseMachine.getCasterName()); tvMachine.setText(chooseMachine.getCaster());
tvSteel.setText(chooseMachine.getSteelTypeId()); tvSteel.setText(chooseMachine.getSteelTypeId());
etNum.setText(chooseMachine.getDefectCount()); etNum.setText(chooseMachine.getDefectCount());
param.put("steelTypeId", chooseMachine.getSteelTypeId()); param.put("steelTypeId", chooseMachine.getSteelTypeId());
param.put("casterName", chooseMachine.getCasterName()); param.put("casterName", chooseMachine.getCasterName());
param.put("defectCount", chooseMachine.getDefectCount()); param.put("defectCount", chooseMachine.getDefectCount());
param.put("caster", chooseMachine.getCaster());
chooseBox = new BoxBean(); chooseBox = new BoxBean();
chooseBox.setSerialNumber(ticketBean.getSerialNumber()); chooseBox.setSerialNumber(ticketBean.getSerialNumber());
chooseBox.setDrawingNumber(ticketBean.getDrawingNumber()); chooseBox.setDrawingNumber(ticketBean.getDrawingNumber());
...@@ -177,6 +219,21 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -177,6 +219,21 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
@Override @Override
protected void initEvent() { protected void initEvent() {
imgAddAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
imgList.remove(position);
imgAddAdapter.notifyDataSetChanged();
}
});
imgAddAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (position == imgList.size() - 1) {
addImg();
}
}
});
} }
@Override @Override
...@@ -185,7 +242,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -185,7 +242,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.btn_add, R.id.btn_submit,R.id.rl_machine, R.id.rl_client, R.id.rl_box, R.id.rl_defect}) @OnClick({R.id.btn_add, R.id.btn_submit, R.id.rl_machine, R.id.rl_client, R.id.rl_box, R.id.rl_defect})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.btn_add: case R.id.btn_add:
...@@ -256,12 +313,13 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -256,12 +313,13 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
param.put("saleUserName", chooseClient.getSalesManagerName()); param.put("saleUserName", chooseClient.getSalesManagerName());
} else if (requestCode == 10002 && resultCode == 10001) { } else if (requestCode == 10002 && resultCode == 10001) {
chooseMachine = JSON.parseObject(data.getStringExtra("data"), ChooseMachineBean.class); chooseMachine = JSON.parseObject(data.getStringExtra("data"), ChooseMachineBean.class);
tvMachine.setText(chooseMachine.getCasterName()); tvMachine.setText(chooseMachine.getCaster());
tvSteel.setText(chooseMachine.getSteelTypeId()); tvSteel.setText(chooseMachine.getSteelTypeId());
etNum.setText(chooseMachine.getDefectCount()); // etNum.setText(chooseMachine.getDefectCount());
param.put("steelTypeId", chooseMachine.getSteelTypeId()); param.put("steelTypeId", chooseMachine.getSteelTypeId());
param.put("casterName", chooseMachine.getCasterName()); param.put("casterName", chooseMachine.getCasterName());
param.put("defectCount", chooseMachine.getDefectCount()); param.put("defectCount", chooseMachine.getDefectCount());
param.put("caster", chooseMachine.getCaster());
} else if (requestCode == 10003 && resultCode == 10001) { } else if (requestCode == 10003 && resultCode == 10001) {
chooseBox = JSON.parseObject(data.getStringExtra("data"), BoxBean.class); chooseBox = JSON.parseObject(data.getStringExtra("data"), BoxBean.class);
tvProCode.setText(chooseBox.getProductCode()); tvProCode.setText(chooseBox.getProductCode());
...@@ -284,45 +342,59 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -284,45 +342,59 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
param.put("mainCause", chooseDefect.getRemark()); param.put("mainCause", chooseDefect.getRemark());
param.put("defectCode", chooseDefect.getDefectCode()); param.put("defectCode", chooseDefect.getDefectCode());
param.put("defectName", chooseDefect.getDefectName()); param.put("defectName", chooseDefect.getDefectName());
} else if (requestCode == 10002 && resultCode == RESULT_OK) {
List<Uri> dataUri = Matisse.obtainResult(data);
for (Uri uri : dataUri) {
upload(uri);
}
} }
} }
@Override // @Override
public boolean onCreateOptionsMenu(Menu menu) { // public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish_save, menu); // getMenuInflater().inflate(R.menu.menu_finish_save, menu);
return super.onCreateOptionsMenu(menu); // return super.onCreateOptionsMenu(menu);
} // }
//
@Override // @Override
public boolean onOptionsItemSelected(MenuItem item) { // public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { // switch (item.getItemId()) {
case R.id.finish: // case R.id.finish:
if (chooseClient == null) { // if (chooseClient == null) {
toast("请先选择客户"); // toast("请先选择客户");
break; // break;
} // }
if (chooseMachine == null) { // if (chooseMachine == null) {
toast("请先选择连铸机"); // toast("请先选择连铸机");
break; // break;
} // }
if (chooseBox == null) { // if (chooseBox == null) {
toast("请先选择箱号"); // toast("请先选择箱号");
break; // break;
} // }
if (chooseDefect == null) { // if (chooseDefect == null) {
toast("请先选择缺陷"); // toast("请先选择缺陷");
break; // break;
} // }
submit(); // submit();
break; // break;
case R.id.save: // case R.id.save:
submit(); // submit();
break; // break;
} // }
return super.onOptionsItemSelected(item); // return super.onOptionsItemSelected(item);
} // }
private void submit() { private void submit() {
param.put("feedbackDescription", tvFeedbackDesc.getText().toString());
param.put("otherProviderBehavior", tvOtherSupplier.getText().toString());
param.put("salerOpinion", tvFeedbackSuggest.getText().toString());
param.put("defectCount", etNum.getText().toString());
List<ImageBean> uploadImg =new ArrayList<>();
for (int i = 0; i < imgList.size()-1; i++) {
uploadImg.add(imgList.get(i));
}
param.put("attachments",uploadImg);
Observable<BaseMesBean> observable; Observable<BaseMesBean> observable;
if (TextUtils.isEmpty(getIntent().getStringExtra("data"))) { if (TextUtils.isEmpty(getIntent().getStringExtra("data"))) {
param.put("status", "1"); param.put("status", "1");
...@@ -354,4 +426,79 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -354,4 +426,79 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
} }
}); });
} }
private void addImg() {
RxPermissions rxPermissions = new RxPermissions(this);
rxPermissions
.request(Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE)
.subscribe(granted -> {
if (granted) {
// All requested permissions are granted
Matisse.from(MesQualityAddActivity.this)
.choose(MimeType.ofImage())
.countable(true)
.maxSelectable(3).capture(true).
captureStrategy(new CaptureStrategy(true, "com.wd.workoffice.fileprovider"))
// .addFilter(new GifSizeFilter(320, 320, 5 * Filter.K * Filter.K))
// .gridExpectedSize(getResources().getDimensionPixelSize(R.dimen.grid_expected_size))
.restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
.thumbnailScale(0.85f)
.imageEngine(new Glide4Engine())
.forResult(10002);
} else {
// At least one permission is denied
toast("您需要开启拍照、存储权限！");
}
});
}
/**
* @param uri
*/
private void upload(Object uri) {
showLoading();
File file;
if (uri instanceof Uri) {
file = WorkUtils.uriToFile((Uri) uri, this);
} else {
file = new File(uri.toString());
}
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
RtfUtils.getMesRtf().
upload(MultipartBody.Part.createFormData("file", file.getName(), requestFile)).
compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
toast("上传成功");
ImageBean imageBean = new ImageBean();
imageBean.setPath(data.getData().toString());
imageBean.setName(file.getName());
imageBean.setSize(FileUtils.getFileLength(file));
imageBean.setType(data.getData().toString().split("\\.")[1]);
imgList.add(imgList.size() - 1, imageBean);
imgAddAdapter.notifyDataSetChanged();
imageBean.setUri((Uri) uri);
}
});
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityClientActivity.java
浏览文件 @ e90fa317
package com.wd.workoffice.ui.activity.mes.quality; package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.EditText; import android.widget.EditText;
...@@ -17,7 +18,6 @@ import com.wd.workoffice.bean.mesBean.ManagerUserBean; ...@@ -17,7 +18,6 @@ import com.wd.workoffice.bean.mesBean.ManagerUserBean;
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.util.DataKeeper; import com.wd.workoffice.util.DataKeeper;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -43,13 +43,12 @@ public class MesQualityClientActivity extends WorkToolBarActivity { ...@@ -43,13 +43,12 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
EditText tvClientStatus; EditText tvClientStatus;
@BindView(R.id.tv_client_reply) @BindView(R.id.tv_client_reply)
EditText tvClientReply; EditText tvClientReply;
@BindView(R.id.tv_client_record)
EditText tvClientRecord;
@BindView(R.id.tv_client_person) @BindView(R.id.tv_client_person)
TextView tvClientPerson; TextView tvClientPerson;
@BindView(R.id.rl_client_person) @BindView(R.id.rl_client_person)
RelativeLayout rlClientPerson; RelativeLayout rlClientPerson;
private Map<String, Object> param; private Map<String, Object> param;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -60,14 +59,14 @@ public class MesQualityClientActivity extends WorkToolBarActivity { ...@@ -60,14 +59,14 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
protected void initData() { protected void initData() {
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class); FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
param.put("id",data.getId()); param.put("id", data.getId());
param.put("procId",data.getProcId()); param.put("procId", data.getProcId());
} }
private void submit() { private void submit() {
param.put("rapidResponse",tvClientStatus.getText().toString()); param.put("rapidResponse", tvClientStatus.getText().toString());
param.put("customerResponse",tvClientReply.getText().toString()); param.put("customerResponse", tvClientReply.getText().toString());
param.put("relatedRecord",tvClientRecord.getText().toString()); // param.put("relatedRecord",tvClientRecord.getText().toString());
RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
...@@ -88,7 +87,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity { ...@@ -88,7 +87,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
return; return;
} }
EventBus.getDefault().post(new CheckFeedbackEvent()); EventBus.getDefault().post(new CheckFeedbackEvent());
toast("审核成功"); toast("提交成功");
finish(); finish();
} }
}); });
...@@ -109,6 +108,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity { ...@@ -109,6 +108,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override @Override
protected void initEvent() { protected void initEvent() {
} }
...@@ -119,10 +119,9 @@ public class MesQualityClientActivity extends WorkToolBarActivity { ...@@ -119,10 +119,9 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
} }
@OnClick(R.id.rl_client_person) @OnClick(R.id.rl_client_person)
public void onViewClicked() { public void onViewClicked() {
startActivityForResult(MesChooseMangerActivity.class,10001); startActivityForResult(MesChooseMangerActivity.class, 10001);
} }
@Override @Override
...@@ -132,11 +131,12 @@ public class MesQualityClientActivity extends WorkToolBarActivity { ...@@ -132,11 +131,12 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
case 10001: case 10001:
if (resultCode == 10001) { if (resultCode == 10001) {
ManagerUserBean.ListBean manager = JSON.parseObject(data.getStringExtra("data"), ManagerUserBean.ListBean.class); ManagerUserBean.ListBean manager = JSON.parseObject(data.getStringExtra("data"), ManagerUserBean.ListBean.class);
param.put("recordUserId",manager.getId()); param.put("closeUserId", manager.getId());
param.put("recorUserName",manager.getName()); param.put("closeUserDate", manager.getName());
tvClientPerson.setText(manager.getName()); tvClientPerson.setText(manager.getName());
} }
break; break;
} }
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityManagerActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDeptActivity.java
浏览文件 @ e90fa317
package com.wd.workoffice.ui.activity.mes.quality; package com.wd.workoffice.ui.activity.mes.quality;
import android.Manifest;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.net.Uri;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import android.widget.EditText; 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.tbruyelle.rxpermissions2.RxPermissions;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.CheckFeedbackEvent; import com.wd.workoffice.bean.event.CheckFeedbackEvent;
import com.wd.workoffice.bean.mesBean.ChooseDeptBean;
import com.wd.workoffice.bean.mesBean.FeedbackDetailBean; import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
import com.wd.workoffice.bean.mesBean.ImageBean;
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.ImgAddAdapter;
import com.wd.workoffice.util.DataKeeper; import com.wd.workoffice.util.DataKeeper;
import com.wd.workoffice.util.Glide4Engine; import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import com.zhihu.matisse.Matisse;
import com.zhihu.matisse.MimeType;
import com.zhihu.matisse.internal.entity.CaptureStrategy;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager;
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 flexible.xd.android_base.utils.FileUtils; import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
/** /**
* 二、质量部信息详情
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class MesQualityManagerActivity extends WorkToolBarActivity { public class MesQualityDeptActivity extends WorkToolBarActivity {
@BindView(R.id.tv_desc) @BindView(R.id.tv_desc)
EditText tvDesc; EditText tvDesc;
@BindView(R.id.tv_use_status) @BindView(R.id.tv_dept)
EditText tvUseStatus; TextView tvDept;
@BindView(R.id.tv_suggest) @BindView(R.id.rl_dept)
EditText tvSuggest; RelativeLayout rlDept;
@BindView(R.id.rv_img)
RecyclerView rvImg;
private Map<String, Object> param; private Map<String, Object> param;
private List<ImageBean> imgList;
private ImgAddAdapter imgAddAdapter;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
rvImg.setLayoutManager( new GridLayoutManager(this,3,RecyclerView.VERTICAL,false));
} }
@Override @Override
protected void initData() { protected void initData() {
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class); FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
param.put("id",data.getId()); param.put("id", data.getId());
param.put("procId",data.getProcId()); param.put("procId", data.getProcId());
imgList=new ArrayList<>();
ImageBean imageBean = new ImageBean();
imageBean.setUri(null);
imgList.add(imageBean);
imgAddAdapter = new ImgAddAdapter(R.layout.item_mes_ticket_img, imgList);
imgAddAdapter.bindToRecyclerView(rvImg);
} }
private void submit() { private void submit() {
param.put("feedbackDescription",tvDesc.getText().toString()); param.put("factoryAnalysis", tvDesc.getText().toString());
param.put("otherProviderBehavior",tvUseStatus.getText().toString()); param.put("responsibleQualityId", UserKeeper.getInstance().getMesUid());
param.put("salerOpinion",tvSuggest.getText().toString()); param.put("responsibleQualityDate", TimeUtils.getNowString());
List<ImageBean> uploadImg =new ArrayList<>();
for (int i = 0; i < imgList.size()-1; i++) {
uploadImg.add(imgList.get(i));
}
param.put("attachments",uploadImg);
RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
...@@ -115,7 +85,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity { ...@@ -115,7 +85,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
return; return;
} }
EventBus.getDefault().post(new CheckFeedbackEvent()); EventBus.getDefault().post(new CheckFeedbackEvent());
toast("审核成功"); toast("提交成功");
finish(); finish();
} }
}); });
...@@ -139,110 +109,33 @@ public class MesQualityManagerActivity extends WorkToolBarActivity { ...@@ -139,110 +109,33 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
@Override @Override
protected void initEvent() { protected void initEvent() {
imgAddAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
imgList.remove(position);
imgAddAdapter.notifyDataSetChanged();
}
});
imgAddAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (position==imgList.size()-1){
addImg();
}
}
});
} }
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_quality_manager; return R.layout.activity_mes_quality_dept;
} }
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10002 && resultCode == RESULT_OK) { switch (requestCode) {
List<Uri> dataUri = Matisse.obtainResult(data); case 10001:
for (Uri uri : dataUri) { if (resultCode == 10001) {
upload( uri); ChooseDeptBean.ListBean manager = JSON.parseObject(data.getStringExtra("data"), ChooseDeptBean.ListBean.class);
} param.put("siteId",manager.getSiteId());
param.put("siteCode", manager.getSiteCode());
param.put("siteName", manager.getSiteName());
tvDept.setText(manager.getSiteName());
}
break;
} }
} }
private void addImg() {
RxPermissions rxPermissions = new RxPermissions(this);
rxPermissions
.request(Manifest.permission.CAMERA,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE)
.subscribe(granted -> {
if (granted) {
// All requested permissions are granted
Matisse.from(MesQualityManagerActivity.this)
.choose(MimeType.ofImage())
.countable(true)
.maxSelectable(3).capture(true).
captureStrategy(new CaptureStrategy(true, "com.wd.workoffice.fileprovider"))
// .addFilter(new GifSizeFilter(320, 320, 5 * Filter.K * Filter.K))
// .gridExpectedSize(getResources().getDimensionPixelSize(R.dimen.grid_expected_size))
.restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
.thumbnailScale(0.85f)
.imageEngine(new Glide4Engine())
.forResult(10002);
} else {
// At least one permission is denied
toast("您需要开启拍照、存储权限！");
}
});
}
/**
*
* @param uri
*/
private void upload( Object uri) {
showLoading();
File file;
if (uri instanceof Uri){
file = WorkUtils.uriToFile((Uri) uri, this);
}
else {
file =new File(uri.toString());
}
RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
RtfUtils.getMesRtf().
upload(MultipartBody.Part.createFormData("file", file.getName(), requestFile)).
compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override @OnClick(R.id.rl_dept)
public void onSuccess(BaseMesBean data) { public void onViewClicked() {
hideLoading(); startActivityForResult(MesChooseQuestionDeptActivity.class,10001);
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
toast("上传成功");
ImageBean imageBean = new ImageBean();
imageBean.setPath(data.getData().toString());
imageBean.setName(file.getName());
imageBean.setSize(FileUtils.getFileLength(file));
imageBean.setType(data.getData().toString().split("\\.")[1]);
imgList.add(imgList.size()-1, imageBean);
imgAddAdapter.notifyDataSetChanged();
imageBean.setUri((Uri) uri);
}
});
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java
浏览文件 @ e90fa317
...@@ -3,7 +3,9 @@ package com.wd.workoffice.ui.activity.mes.quality; ...@@ -3,7 +3,9 @@ package com.wd.workoffice.ui.activity.mes.quality;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -40,6 +42,8 @@ import io.reactivex.disposables.Disposable; ...@@ -40,6 +42,8 @@ import io.reactivex.disposables.Disposable;
**/ **/
public class MesQualityDetailActivity extends WorkToolBarActivity { public class MesQualityDetailActivity extends WorkToolBarActivity {
@BindView(R.id.btn_refuse)
Button btnRefuse;
@BindView(R.id.btn_reviews) @BindView(R.id.btn_reviews)
Button btnReviews; Button btnReviews;
@BindView(R.id.ll_bottom) @BindView(R.id.ll_bottom)
...@@ -74,14 +78,24 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -74,14 +78,24 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
TextView tvDefect; TextView tvDefect;
@BindView(R.id.tv_defect_reason) @BindView(R.id.tv_defect_reason)
TextView tvDefectReason; TextView tvDefectReason;
@BindView(R.id.tv_desc) @BindView(R.id.tv_feedback_desc)
TextView tvDesc; TextView tvFeedbackDesc;
@BindView(R.id.tv_use_status) @BindView(R.id.tv_other_supplier)
TextView tvUseStatus; TextView tvOtherSupplier;
@BindView(R.id.tv_suggest) @BindView(R.id.tv_feedback_suggest)
TextView tvSuggest; TextView tvFeedbackSuggest;
@BindView(R.id.rv_img) @BindView(R.id.rv_img)
RecyclerView rvImg; RecyclerView rvImg;
@BindView(R.id.tv_desc)
EditText tvDesc;
@BindView(R.id.tv_dept)
TextView tvDept;
@BindView(R.id.rl_dept)
RelativeLayout rlDept;
@BindView(R.id.tv_quality_person)
TextView tvQualityPerson;
@BindView(R.id.tv_quality_time)
TextView tvQualityTime;
@BindView(R.id.ll_manager) @BindView(R.id.ll_manager)
LinearLayout llManager; LinearLayout llManager;
@BindView(R.id.tv_factory_reason) @BindView(R.id.tv_factory_reason)
...@@ -106,14 +120,12 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -106,14 +120,12 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
TextView tvClientStatus; TextView tvClientStatus;
@BindView(R.id.tv_client_reply) @BindView(R.id.tv_client_reply)
TextView tvClientReply; TextView tvClientReply;
@BindView(R.id.tv_client_record)
TextView tvClientRecord;
@BindView(R.id.tv_client_person) @BindView(R.id.tv_client_person)
TextView tvClientPerson; TextView tvClientPerson;
@BindView(R.id.ll_client) @BindView(R.id.ll_client)
LinearLayout llClient; LinearLayout llClient;
@BindView(R.id.btn_refuse) @BindView(R.id.tv_client_time)
Button btnRefuse; TextView tvClientTime;
private FeedbackDetailBean detailBean; private FeedbackDetailBean detailBean;
private List<ImageBean> imgList; private List<ImageBean> imgList;
private ImgAdapter imgAdapter; private ImgAdapter imgAdapter;
...@@ -224,28 +236,34 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -224,28 +236,34 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
tvBox.setText(detailBean.getBoxCode()); tvBox.setText(detailBean.getBoxCode());
tvNum.setText(detailBean.getDefectCount()); tvNum.setText(detailBean.getDefectCount());
tvMarkCode.setText(detailBean.getSerialNumber()); tvMarkCode.setText(detailBean.getSerialNumber());
tvMachine.setText(detailBean.getCasterName()); tvMachine.setText(detailBean.getCaster());
tvSteelType.setText(detailBean.getSteelTypeId()); tvSteelType.setText(detailBean.getSteelTypeId());
tvDefect.setText(detailBean.getDefectName()); tvDefect.setText(detailBean.getDefectName());
tvDefectReason.setText(detailBean.getMainCause()); tvDefectReason.setText(detailBean.getMainCause());
//二、销售经理反馈信息
tvDesc.setText(detailBean.getFeedbackDescription()); tvFeedbackDesc.setText(detailBean.getFeedbackDescription());
tvUseStatus.setText(detailBean.getOtherProviderBehavior()); tvOtherSupplier.setText(detailBean.getOtherProviderBehavior());
tvSuggest.setText(detailBean.getSalerOpinion()); tvFeedbackSuggest.setText(detailBean.getSalerOpinion());
//三、公司本部反馈信息 ///二、质量部信息详情
tvFactoryReason.setText(detailBean.getFactoryAnalysis()); tvDesc.setText(detailBean.getFactoryAnalysis());
tvDept.setText(detailBean.getSiteName());
tvQualityPerson.setText(detailBean.getResponsibleQualityName());
tvQualityTime.setText(detailBean.getResponsibleQualityDate());
//三、相关部门反馈信息
tvFactoryReason.setText(detailBean.getAnalyCause());
tvFactoryStatus.setText(detailBean.getFactoryImplement()); tvFactoryStatus.setText(detailBean.getFactoryImplement());
tvFactorySuggest.setText(detailBean.getFactoryLeaderOpinion()); tvFactorySuggest.setText(detailBean.getTreatRectPlan());
tvProcess.setText(detailBean.getTreatRectPlan()); tvProcess.setText(detailBean.getProcedureName());
tvDutyPerson.setText(detailBean.getResponsibleUserName()); tvDutyPerson.setText(detailBean.getResponsibleUserName());
tvVerifyPerson.setText(detailBean.getVerifyUserName()); tvVerifyPerson.setText(detailBean.getVerifyUserName());
tvQuestion.setText(detailBean.getDefectMudName()); tvQuestion.setText(detailBean.getDefectMudName());
tvTime.setText(detailBean.getFactoryTreatmentDateTime()); tvTime.setText(detailBean.getFactoryTreatmentDateTime());
//四、客户回馈信息 //四、客户回馈信息
tvClientStatus.setText(detailBean.getRapidResponse()); tvClientStatus.setText(detailBean.getRapidResponse());
tvClientReply.setText(detailBean.getCustomerResponse()); tvClientReply.setText(detailBean.getCustomerResponse());
tvClientRecord.setText(detailBean.getRelatedRecord()); tvClientPerson.setText(detailBean.getCloseUserName());
tvClientPerson.setText(detailBean.getRecorUserName()); tvClientTime.setText(detailBean.getCloseUserDate());
} }
@Override @Override
...@@ -258,7 +276,6 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -258,7 +276,6 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
} }
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
...@@ -277,7 +294,6 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -277,7 +294,6 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.btn_refuse, R.id.btn_reviews}) @OnClick({R.id.btn_refuse, R.id.btn_reviews})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
...@@ -291,10 +307,10 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -291,10 +307,10 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
check(0); check(0);
break; break;
case "4": case "4":
startActivity(MesQualityManagerActivity.class, "data", JSON.toJSONString(detailBean)); startActivity(MesQualityDeptActivity.class, "data", JSON.toJSONString(detailBean));
break; break;
case "5": case "5":
startActivity(MesQualityFactoryActivity.class, "data", JSON.toJSONString(detailBean)); startActivity(MesQualityAboutDeptActivity.class, "data", JSON.toJSONString(detailBean));
break; break;
case "6": case "6":
startActivity(MesQualityClientActivity.class, "data", JSON.toJSONString(detailBean)); startActivity(MesQualityClientActivity.class, "data", JSON.toJSONString(detailBean));
...@@ -308,10 +324,10 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -308,10 +324,10 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
private void check(int status) {// 0 同意 1 拒绝 private void check(int status) {// 0 同意 1 拒绝
Map<String, Object> param = WorkUtils.simpleParam(); Map<String, Object> param = WorkUtils.simpleParam();
param.put("approved",status); param.put("approved", status);
param.put("id",detailBean.getId()); param.put("id", detailBean.getId());
param.put("procId",detailBean.getProcId()); param.put("procId", detailBean.getProcId());
RtfUtils.getMesRtf().feedbackApproved( "1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().feedbackApproved("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -334,4 +350,11 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -334,4 +350,11 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
} }
app/src/main/java/com/wd/workoffice/ui/adapter/MesQuestionDeptAdapter.java 0 → 100644
浏览文件 @ e90fa317
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.ChooseDeptBean;
import com.wd.workoffice.bean.mesBean.QuestionBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesQuestionDeptAdapter extends BaseQuickAdapter<ChooseDeptBean.ListBean, BaseViewHolder> {
public MesQuestionDeptAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ChooseDeptBean.ListBean item) {
helper.setText(R.id.tv_name, item.getSiteName());
}
}
app/src/main/res/layout/activity_mes_quality_add.xml
浏览文件 @ e90fa317
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
android:text="支数" android:text="支数"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <EditText
android:id="@+id/et_num" android:id="@+id/et_num"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -395,6 +395,7 @@ ...@@ -395,6 +395,7 @@
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" />
...@@ -580,6 +581,100 @@ ...@@ -580,6 +581,100 @@
android:minLines="4" android:minLines="4"
android:padding="5mm" android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/flexible_background"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="反馈信息"
android:textSize="18sp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="反馈信息详细描述"
android:textSize="14sp" />
<EditText
android:id="@+id/tv_feedback_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:hint="请输入"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="其他供货厂家及使用情况"
android:textSize="14sp" />
<EditText
android:id="@+id/tv_other_supplier"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="分析及建议"
android:textSize="14sp" />
<EditText
android:id="@+id/tv_feedback_suggest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="4"
android:hint="请输入"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="10mm"
android:text="上传现场照片"
android:textSize="15sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/activity_mes_quality_client.xml
浏览文件 @ e90fa317
...@@ -69,29 +69,6 @@ ...@@ -69,29 +69,6 @@
android:padding="5mm" android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="相关记录"
android:textSize="14sp" />
<EditText
android:id="@+id/tv_client_record"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<RelativeLayout <RelativeLayout
android:id="@+id/rl_client_person" android:id="@+id/rl_client_person"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/activity_mes_quality_manager.xml → app/src/main/res/layout/activity_mes_quality_dept.xml
浏览文件 @ e90fa317
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="反馈信息" android:text="质量部信息详情"
android:textSize="18sp" /> android:textSize="18sp" />
</RelativeLayout> </RelativeLayout>
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="反馈信息详情描述" android:text="分析问题原因"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
...@@ -39,7 +40,6 @@ ...@@ -39,7 +40,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm" android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:gravity="top" android:gravity="top"
android:hint="请输入" android:hint="请输入"
...@@ -47,63 +47,45 @@ ...@@ -47,63 +47,45 @@
android:padding="5mm" android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <RelativeLayout
android:id="@+id/rl_dept"
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="13mm" android:paddingVertical="9mm">
android:text="其它供货厂家及使用情况"
android:textSize="14sp" />
<EditText <TextView
android:id="@+id/tv_use_status" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_alignParentLeft="true"
android:layout_marginHorizontal="20mm" android:layout_centerVertical="true"
android:layout_marginTop="3mm" android:text="问题部门"
android:layout_marginBottom="30mm" android:textSize="14sp" />
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView <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="13mm" android:gravity="center_vertical">
android:text="分析及建议"
android:textSize="14sp" />
<EditText <TextView
android:id="@+id/tv_suggest" android:id="@+id/tv_dept"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm" android:layout_alignParentLeft="true"
android:layout_marginTop="3mm" android:layout_marginRight="3mm"
android:layout_marginBottom="30mm" android:text="请选择"
android:background="@drawable/shape_input_white" android:textColor="@color/flexible_text_gray"
android:gravity="top" android:textSize="14sp" />
android:hint="请输入"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView <ImageView
android:layout_width="wrap_content" android:layout_width="15mm"
android:layout_height="wrap_content" android:layout_height="20mm"
android:layout_marginHorizontal="20mm" android:src="@mipmap/arrow_right_gray" />
android:layout_marginTop="10mm" </LinearLayout>
android:text="上传现场照片"
android:textSize="15sp" /> </RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/activity_mes_quality_detail.xml
浏览文件 @ e90fa317
...@@ -417,7 +417,6 @@ ...@@ -417,7 +417,6 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_defect_reason" android:id="@+id/tv_defect_reason"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -430,12 +429,106 @@ ...@@ -430,12 +429,106 @@
android:padding="5mm" android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/flexible_background"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="反馈信息"
android:textSize="18sp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="反馈信息详细描述"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_feedback_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="其他供货厂家及使用情况"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_other_supplier"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="分析及建议"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_feedback_suggest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="10mm"
android:text="照片"
android:textColor="#ff131415"
android:textSize="15sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm" />
<LinearLayout <LinearLayout
android:id="@+id/ll_manager" android:id="@+id/ll_manager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -446,89 +539,116 @@ ...@@ -446,89 +539,116 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="销售经理反馈信息" android:text="质量部信息详情"
android:textSize="18sp" /> android:textSize="18sp" />
</RelativeLayout> </RelativeLayout>
<TextView <TextView
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="13mm" android:paddingVertical="13mm"
android:text="反馈信息详情描述" android:text="分析问题原因"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <EditText
android:id="@+id/tv_desc" android:id="@+id/tv_desc"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm" android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:gravity="top" android:gravity="top"
android:hint="请输入"
android:minLines="4" android:minLines="4"
android:padding="5mm" android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <RelativeLayout
android:id="@+id/rl_dept"
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="13mm" android:paddingVertical="9mm">
android:text="其它供货厂家及使用情况"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_use_status" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_alignParentLeft="true"
android:layout_marginHorizontal="20mm" android:layout_centerVertical="true"
android:layout_marginTop="3mm" android:text="问题部门"
android:layout_marginBottom="30mm" android:textSize="14sp" />
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_dept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
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="13mm" android:paddingVertical="9mm">
android:text="分析及建议"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_suggest" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_alignParentLeft="true"
android:layout_marginHorizontal="20mm" android:layout_centerVertical="true"
android:layout_marginTop="3mm" android:text="填报人"
android:layout_marginBottom="30mm" android:textSize="14sp" />
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="10mm"
android:text="照片"
android:textColor="#ff131415"
android:textSize="15sp" />
<androidx.recyclerview.widget.RecyclerView <TextView
android:id="@+id/rv_img" android:id="@+id/tv_quality_person"
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10mm" /> android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="填报时间"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_quality_time"
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -547,7 +667,7 @@ ...@@ -547,7 +667,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="公司本部反馈信息" android:text="相关部门反馈信息"
android:textSize="18sp" /> android:textSize="18sp" />
</RelativeLayout> </RelativeLayout>
...@@ -557,7 +677,7 @@ ...@@ -557,7 +677,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="生产厂分析原因" android:text="分析问题原因"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
...@@ -578,7 +698,7 @@ ...@@ -578,7 +698,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="领导意见及建议" android:text="处理及整改方案"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
...@@ -700,7 +820,7 @@ ...@@ -700,7 +820,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="9mm" android:paddingVertical="9mm"
android:visibility="gone"> >
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -811,49 +931,45 @@ ...@@ -811,49 +931,45 @@
android:padding="5mm" android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <RelativeLayout
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="13mm" android:paddingVertical="9mm">
android:text="相关记录"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_client_record"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:minLines="4"
android:padding="5mm"
android:textSize="14sp" />
<View style="@style/ViewX" /> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="关闭人"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_client_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="11111" />
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="40mm"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="记录者" android:text="关闭时间"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_client_person" android:id="@+id/tv_client_time"
android:layout_width="wrap_content" 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_marginRight="3mm" android:layout_marginRight="3mm"
android:text="11111" /> />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_mes_quality_factory.xml → app/src/main/res/layout/activity_mes_quality_other_dept.xml
浏览文件 @ e90fa317
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="反馈信息" android:text="相关部门反馈信息"
android:textSize="18sp" /> android:textSize="18sp" />
</RelativeLayout> </RelativeLayout>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="生产厂分析原因" android:text="分析问题原因"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="13mm" android:paddingVertical="13mm"
android:text="领导意见及建议" android:text="处理及整改方案"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论