Skip to content
项目
Groups
代码片段
帮助
正在加载...
Sign in / Register
Toggle navigation
W
workoffice
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图表
统计图
Create a new issue
作业
提交
议题看板
Open sidebar
冷广德
workoffice
Commits
e5f47cd3
提交
e5f47cd3
authored
5月 08, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.质量反馈,列表展示
2.//TODO ,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,mes质量反馈,编辑任务担当无法修改.
上级
d26ecb24
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
852 行增加
和
18 行删除
+852
-18
FeedbackBean.java
...ain/java/com/wd/workoffice/bean/mesBean/FeedbackBean.java
+788
-0
MesApiService.java
...c/main/java/com/wd/workoffice/retrofit/MesApiService.java
+7
-0
MesQualityActivity.java
...orkoffice/ui/activity/mes/quality/MesQualityActivity.java
+21
-13
MesTicketActivity.java
.../workoffice/ui/activity/mes/ticket/MesTicketActivity.java
+4
-0
MesQualityAdapter.java
.../java/com/wd/workoffice/ui/adapter/MesQualityAdapter.java
+9
-2
activity_mes_quality.xml
app/src/main/res/layout/activity_mes_quality.xml
+7
-0
item_mes_quality.xml
app/src/main/res/layout/item_mes_quality.xml
+16
-3
没有找到文件。
app/src/main/java/com/wd/workoffice/bean/mesBean/FeedbackBean.java
0 → 100644
浏览文件 @
e5f47cd3
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
FeedbackBean
extends
BaseMesPageBean
{
private
List
<
ListBean
>
list
;
public
List
<
ListBean
>
getList
()
{
return
list
;
}
public
void
setList
(
List
<
ListBean
>
list
)
{
this
.
list
=
list
;
}
public
static
class
ListBean
{
/**
* id : 52021d95138d437ca52ebb076a457710
* createDateTime : null
* updateDateTime : null
* feedbackCode : SCFK2005002
* productId : null
* productCode : null
* productName : null
* drawingNumber : null
* version : null
* specification : null
* customerId : null
* customerName : null
* saleUserId : null
* saleUserCode : null
* saleUserName : 质检主任
* phoneNumber : null
* boxId : null
* boxCode : BOX003
* serialNumber : null
* caster : 21212
* casterName : null
* defectId : null
* defectCount : 1
* defectCounts : null
* defectCode : null
* defectName : 11
* mainCause : 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
* status : 0
* attachments : null
* responsibleUserId : null
* responsibleUserName : null
* factoryTreatmentDateTime : null
* verifyUserId : null
* verifyUserName : null
* verifyUserDate : null
* recordUserId : null
* recorUserName : null
* recorUserDate : null
* responsibleDealId : null
* responsibleDealName : null
* responsibleDealDate : null
* responsibleCustId : null
* responsibleCustName : null
* responsibleCustDate : null
* approvalUserId : null
* approvalUserName : null
* approvalUserDate : null
* createUserId : 398c852b38e911ea8334fa163e1166bd
* createUserName : hello
* updateUserId : null
* updateUserName : null
* defectMudIds : null
* attachment : null
* delete : false
*/
private
String
id
;
private
Object
createDateTime
;
private
Object
updateDateTime
;
private
String
feedbackCode
;
private
Object
productId
;
private
Object
productCode
;
private
String
productName
;
private
Object
drawingNumber
;
private
Object
version
;
private
Object
specification
;
private
Object
customerId
;
private
String
customerName
;
private
Object
saleUserId
;
private
Object
saleUserCode
;
private
String
saleUserName
;
private
String
phoneNumber
;
private
Object
boxId
;
private
String
boxCode
;
private
Object
serialNumber
;
private
String
caster
;
private
Object
casterName
;
private
Object
defectId
;
private
int
defectCount
;
private
Object
defectCounts
;
private
Object
defectCode
;
private
String
defectName
;
private
Object
mainCause
;
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
String
status
;
private
Object
attachments
;
private
Object
responsibleUserId
;
private
Object
responsibleUserName
;
private
Object
factoryTreatmentDateTime
;
private
Object
verifyUserId
;
private
Object
verifyUserName
;
private
Object
verifyUserDate
;
private
Object
recordUserId
;
private
Object
recorUserName
;
private
Object
recorUserDate
;
private
Object
responsibleDealId
;
private
Object
responsibleDealName
;
private
Object
responsibleDealDate
;
private
Object
responsibleCustId
;
private
Object
responsibleCustName
;
private
Object
responsibleCustDate
;
private
Object
approvalUserId
;
private
Object
approvalUserName
;
private
Object
approvalUserDate
;
private
String
createUserId
;
private
String
createUserName
;
private
Object
updateUserId
;
private
Object
updateUserName
;
private
Object
defectMudIds
;
private
Object
attachment
;
private
boolean
delete
;
public
String
getId
()
{
return
id
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
Object
getCreateDateTime
()
{
return
createDateTime
;
}
public
void
setCreateDateTime
(
Object
createDateTime
)
{
this
.
createDateTime
=
createDateTime
;
}
public
Object
getUpdateDateTime
()
{
return
updateDateTime
;
}
public
void
setUpdateDateTime
(
Object
updateDateTime
)
{
this
.
updateDateTime
=
updateDateTime
;
}
public
String
getFeedbackCode
()
{
return
feedbackCode
;
}
public
void
setFeedbackCode
(
String
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
String
getProductName
()
{
return
productName
;
}
public
void
setProductName
(
String
productName
)
{
this
.
productName
=
productName
;
}
public
Object
getDrawingNumber
()
{
return
drawingNumber
;
}
public
void
setDrawingNumber
(
Object
drawingNumber
)
{
this
.
drawingNumber
=
drawingNumber
;
}
public
Object
getVersion
()
{
return
version
;
}
public
void
setVersion
(
Object
version
)
{
this
.
version
=
version
;
}
public
Object
getSpecification
()
{
return
specification
;
}
public
void
setSpecification
(
Object
specification
)
{
this
.
specification
=
specification
;
}
public
Object
getCustomerId
()
{
return
customerId
;
}
public
void
setCustomerId
(
Object
customerId
)
{
this
.
customerId
=
customerId
;
}
public
String
getCustomerName
()
{
return
customerName
;
}
public
void
setCustomerName
(
String
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
String
getSaleUserName
()
{
return
saleUserName
;
}
public
void
setSaleUserName
(
String
saleUserName
)
{
this
.
saleUserName
=
saleUserName
;
}
public
String
getPhoneNumber
()
{
return
phoneNumber
;
}
public
void
setPhoneNumber
(
String
phoneNumber
)
{
this
.
phoneNumber
=
phoneNumber
;
}
public
Object
getBoxId
()
{
return
boxId
;
}
public
void
setBoxId
(
Object
boxId
)
{
this
.
boxId
=
boxId
;
}
public
String
getBoxCode
()
{
return
boxCode
;
}
public
void
setBoxCode
(
String
boxCode
)
{
this
.
boxCode
=
boxCode
;
}
public
Object
getSerialNumber
()
{
return
serialNumber
;
}
public
void
setSerialNumber
(
Object
serialNumber
)
{
this
.
serialNumber
=
serialNumber
;
}
public
String
getCaster
()
{
return
caster
;
}
public
void
setCaster
(
String
caster
)
{
this
.
caster
=
caster
;
}
public
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
int
getDefectCount
()
{
return
defectCount
;
}
public
void
setDefectCount
(
int
defectCount
)
{
this
.
defectCount
=
defectCount
;
}
public
Object
getDefectCounts
()
{
return
defectCounts
;
}
public
void
setDefectCounts
(
Object
defectCounts
)
{
this
.
defectCounts
=
defectCounts
;
}
public
Object
getDefectCode
()
{
return
defectCode
;
}
public
void
setDefectCode
(
Object
defectCode
)
{
this
.
defectCode
=
defectCode
;
}
public
String
getDefectName
()
{
return
defectName
;
}
public
void
setDefectName
(
String
defectName
)
{
this
.
defectName
=
defectName
;
}
public
Object
getMainCause
()
{
return
mainCause
;
}
public
void
setMainCause
(
Object
mainCause
)
{
this
.
mainCause
=
mainCause
;
}
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
String
getStatus
()
{
return
status
;
}
public
void
setStatus
(
String
status
)
{
this
.
status
=
status
;
}
public
Object
getAttachments
()
{
return
attachments
;
}
public
void
setAttachments
(
Object
attachments
)
{
this
.
attachments
=
attachments
;
}
public
Object
getResponsibleUserId
()
{
return
responsibleUserId
;
}
public
void
setResponsibleUserId
(
Object
responsibleUserId
)
{
this
.
responsibleUserId
=
responsibleUserId
;
}
public
Object
getResponsibleUserName
()
{
return
responsibleUserName
;
}
public
void
setResponsibleUserName
(
Object
responsibleUserName
)
{
this
.
responsibleUserName
=
responsibleUserName
;
}
public
Object
getFactoryTreatmentDateTime
()
{
return
factoryTreatmentDateTime
;
}
public
void
setFactoryTreatmentDateTime
(
Object
factoryTreatmentDateTime
)
{
this
.
factoryTreatmentDateTime
=
factoryTreatmentDateTime
;
}
public
Object
getVerifyUserId
()
{
return
verifyUserId
;
}
public
void
setVerifyUserId
(
Object
verifyUserId
)
{
this
.
verifyUserId
=
verifyUserId
;
}
public
Object
getVerifyUserName
()
{
return
verifyUserName
;
}
public
void
setVerifyUserName
(
Object
verifyUserName
)
{
this
.
verifyUserName
=
verifyUserName
;
}
public
Object
getVerifyUserDate
()
{
return
verifyUserDate
;
}
public
void
setVerifyUserDate
(
Object
verifyUserDate
)
{
this
.
verifyUserDate
=
verifyUserDate
;
}
public
Object
getRecordUserId
()
{
return
recordUserId
;
}
public
void
setRecordUserId
(
Object
recordUserId
)
{
this
.
recordUserId
=
recordUserId
;
}
public
Object
getRecorUserName
()
{
return
recorUserName
;
}
public
void
setRecorUserName
(
Object
recorUserName
)
{
this
.
recorUserName
=
recorUserName
;
}
public
Object
getRecorUserDate
()
{
return
recorUserDate
;
}
public
void
setRecorUserDate
(
Object
recorUserDate
)
{
this
.
recorUserDate
=
recorUserDate
;
}
public
Object
getResponsibleDealId
()
{
return
responsibleDealId
;
}
public
void
setResponsibleDealId
(
Object
responsibleDealId
)
{
this
.
responsibleDealId
=
responsibleDealId
;
}
public
Object
getResponsibleDealName
()
{
return
responsibleDealName
;
}
public
void
setResponsibleDealName
(
Object
responsibleDealName
)
{
this
.
responsibleDealName
=
responsibleDealName
;
}
public
Object
getResponsibleDealDate
()
{
return
responsibleDealDate
;
}
public
void
setResponsibleDealDate
(
Object
responsibleDealDate
)
{
this
.
responsibleDealDate
=
responsibleDealDate
;
}
public
Object
getResponsibleCustId
()
{
return
responsibleCustId
;
}
public
void
setResponsibleCustId
(
Object
responsibleCustId
)
{
this
.
responsibleCustId
=
responsibleCustId
;
}
public
Object
getResponsibleCustName
()
{
return
responsibleCustName
;
}
public
void
setResponsibleCustName
(
Object
responsibleCustName
)
{
this
.
responsibleCustName
=
responsibleCustName
;
}
public
Object
getResponsibleCustDate
()
{
return
responsibleCustDate
;
}
public
void
setResponsibleCustDate
(
Object
responsibleCustDate
)
{
this
.
responsibleCustDate
=
responsibleCustDate
;
}
public
Object
getApprovalUserId
()
{
return
approvalUserId
;
}
public
void
setApprovalUserId
(
Object
approvalUserId
)
{
this
.
approvalUserId
=
approvalUserId
;
}
public
Object
getApprovalUserName
()
{
return
approvalUserName
;
}
public
void
setApprovalUserName
(
Object
approvalUserName
)
{
this
.
approvalUserName
=
approvalUserName
;
}
public
Object
getApprovalUserDate
()
{
return
approvalUserDate
;
}
public
void
setApprovalUserDate
(
Object
approvalUserDate
)
{
this
.
approvalUserDate
=
approvalUserDate
;
}
public
String
getCreateUserId
()
{
return
createUserId
;
}
public
void
setCreateUserId
(
String
createUserId
)
{
this
.
createUserId
=
createUserId
;
}
public
String
getCreateUserName
()
{
return
createUserName
;
}
public
void
setCreateUserName
(
String
createUserName
)
{
this
.
createUserName
=
createUserName
;
}
public
Object
getUpdateUserId
()
{
return
updateUserId
;
}
public
void
setUpdateUserId
(
Object
updateUserId
)
{
this
.
updateUserId
=
updateUserId
;
}
public
Object
getUpdateUserName
()
{
return
updateUserName
;
}
public
void
setUpdateUserName
(
Object
updateUserName
)
{
this
.
updateUserName
=
updateUserName
;
}
public
Object
getDefectMudIds
()
{
return
defectMudIds
;
}
public
void
setDefectMudIds
(
Object
defectMudIds
)
{
this
.
defectMudIds
=
defectMudIds
;
}
public
Object
getAttachment
()
{
return
attachment
;
}
public
void
setAttachment
(
Object
attachment
)
{
this
.
attachment
=
attachment
;
}
public
boolean
isDelete
()
{
return
delete
;
}
public
void
setDelete
(
boolean
delete
)
{
this
.
delete
=
delete
;
}
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @
e5f47cd3
...
@@ -303,5 +303,12 @@ public interface MesApiService {
...
@@ -303,5 +303,12 @@ public interface MesApiService {
@POST
(
"/himes/api/msRelationQuery/show/page.json"
)
@POST
(
"/himes/api/msRelationQuery/show/page.json"
)
Observable
<
BaseMesBean
>
searchList
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
Observable
<
BaseMesBean
>
searchList
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
* 质量反馈
*
* @return
*/
@POST
(
"/himes/api/feedback/show/page.json"
)
Observable
<
BaseMesBean
>
feedbackList
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityActivity.java
浏览文件 @
e5f47cd3
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
quality
;
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
quality
;
import
android.view.View
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
...
@@ -7,8 +9,11 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
...
@@ -7,8 +9,11 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
import
com.scwang.smartrefresh.layout.listener.OnRefreshListener
;
import
com.scwang.smartrefresh.layout.listener.OnRefreshListener
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.ProPriceBean
;
import
com.wd.workoffice.bean.ProPriceBean
;
import
com.wd.workoffice.bean.mesBean.FeedbackBean
;
import
com.wd.workoffice.bean.mesBean.TicketBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.MesQualityAdapter
;
import
com.wd.workoffice.ui.adapter.MesQualityAdapter
;
...
@@ -39,7 +44,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
...
@@ -39,7 +44,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
@BindView
(
R
.
id
.
srl_refresh
)
@BindView
(
R
.
id
.
srl_refresh
)
SmartRefreshLayout
srlRefresh
;
SmartRefreshLayout
srlRefresh
;
private
Map
<
String
,
Object
>
param
;
private
Map
<
String
,
Object
>
param
;
private
List
<
ProPriceBean
.
Records
Bean
>
dataList
;
private
List
<
FeedbackBean
.
List
Bean
>
dataList
;
private
MesQualityAdapter
dataAdapter
;
private
MesQualityAdapter
dataAdapter
;
private
int
page
=
1
;
private
int
page
=
1
;
...
@@ -56,14 +61,13 @@ public class MesQualityActivity extends WorkToolBarActivity {
...
@@ -56,14 +61,13 @@ public class MesQualityActivity extends WorkToolBarActivity {
dataAdapter
=
new
MesQualityAdapter
(
R
.
layout
.
item_mes_quality
,
dataList
);
dataAdapter
=
new
MesQualityAdapter
(
R
.
layout
.
item_mes_quality
,
dataList
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
dataAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
dataAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_content
,
rvData
);
param
=
WorkUtils
.
pageKey
();
param
=
WorkUtils
.
pageMesKey
();
param
.
put
(
"productId"
,
getIntent
().
getStringExtra
(
"id"
));
param
.
put
(
"pageNum"
,
page
);
param
.
put
(
"current"
,
page
);
getData
();
getData
();
}
}
private
void
getData
()
{
private
void
getData
()
{
RtfUtils
.
get
Rtf
().
getProHistoryPrice
(
param
).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
Base
Bean
>()
{
RtfUtils
.
get
MesRtf
().
feedbackList
(
"1"
,
WorkUtils
.
convertMapToBody
(
param
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseMes
Bean
>()
{
@Override
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
public
void
doOnSubscribe
(
Disposable
d
)
{
}
}
...
@@ -75,14 +79,13 @@ public class MesQualityActivity extends WorkToolBarActivity {
...
@@ -75,14 +79,13 @@ public class MesQualityActivity extends WorkToolBarActivity {
}
}
@Override
@Override
public
void
onSuccess
(
BaseBean
data
)
{
public
void
onSuccess
(
Base
Mes
Bean
data
)
{
hideLoading
();
hideLoading
();
if
(
data
.
getCode
()
!=
0
)
{
if
(
!
data
.
isSuccess
()
)
{
toast
(
data
.
getM
essage
());
toast
(
data
.
getM
sg
());
return
;
return
;
}
}
List
<
ProPriceBean
.
RecordsBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
ProPriceBean
.
class
).
getRecords
();
List
<
FeedbackBean
.
ListBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
FeedbackBean
.
class
).
getList
();
if
(
page
==
1
)
{
if
(
page
==
1
)
{
srlRefresh
.
finishRefresh
();
srlRefresh
.
finishRefresh
();
dataList
.
clear
();
dataList
.
clear
();
...
@@ -110,17 +113,23 @@ public class MesQualityActivity extends WorkToolBarActivity {
...
@@ -110,17 +113,23 @@ public class MesQualityActivity extends WorkToolBarActivity {
@Override
@Override
public
void
onRefresh
(
@NonNull
RefreshLayout
refreshLayout
)
{
public
void
onRefresh
(
@NonNull
RefreshLayout
refreshLayout
)
{
page
=
1
;
page
=
1
;
param
.
put
(
"
current
"
,
page
);
param
.
put
(
"
pageNum
"
,
page
);
getData
();
getData
();
}
}
});
});
dataAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
dataAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
@Override
@Override
public
void
onLoadMoreRequested
()
{
public
void
onLoadMoreRequested
()
{
param
.
put
(
"
current
"
,
page
);
param
.
put
(
"
pageNum
"
,
page
);
getData
();
getData
();
}
}
},
rvData
);
},
rvData
);
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
// startActivity();
}
});
}
}
@Override
@Override
...
@@ -128,5 +137,4 @@ public class MesQualityActivity extends WorkToolBarActivity {
...
@@ -128,5 +137,4 @@ public class MesQualityActivity extends WorkToolBarActivity {
return
R
.
layout
.
activity_mes_quality
;
return
R
.
layout
.
activity_mes_quality
;
}
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketActivity.java
浏览文件 @
e5f47cd3
...
@@ -5,6 +5,8 @@ import android.widget.LinearLayout;
...
@@ -5,6 +5,8 @@ import android.widget.LinearLayout;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.ui.activity.mes.quality.MesQualityActivity
;
import
com.wd.workoffice.ui.activity.mes.search.MesSearchActivity
;
import
com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity
;
import
com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity
;
import
com.wd.workoffice.ui.activity.mes.user.MesUserDataListActivity
;
import
com.wd.workoffice.ui.activity.mes.user.MesUserDataListActivity
;
...
@@ -58,8 +60,10 @@ public class MesTicketActivity extends WorkToolBarActivity {
...
@@ -58,8 +60,10 @@ public class MesTicketActivity extends WorkToolBarActivity {
startActivity
(
MesUserDataListActivity
.
class
);
startActivity
(
MesUserDataListActivity
.
class
);
break
;
break
;
case
R
.
id
.
ll_quality
:
case
R
.
id
.
ll_quality
:
startActivity
(
MesQualityActivity
.
class
);
break
;
break
;
case
R
.
id
.
ll_search
:
case
R
.
id
.
ll_search
:
startActivity
(
MesSearchActivity
.
class
);
break
;
break
;
}
}
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/MesQualityAdapter.java
浏览文件 @
e5f47cd3
...
@@ -3,7 +3,9 @@ package com.wd.workoffice.ui.adapter;
...
@@ -3,7 +3,9 @@ package com.wd.workoffice.ui.adapter;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.bean.ProPriceBean
;
import
com.wd.workoffice.bean.ProPriceBean
;
import
com.wd.workoffice.bean.mesBean.FeedbackBean
;
import
java.util.List
;
import
java.util.List
;
...
@@ -11,7 +13,7 @@ import java.util.List;
...
@@ -11,7 +13,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
* Created by flexible on 2018/8/13.
*/
*/
public
class
MesQualityAdapter
extends
BaseQuickAdapter
<
ProPriceBean
.
Records
Bean
,
BaseViewHolder
>
{
public
class
MesQualityAdapter
extends
BaseQuickAdapter
<
FeedbackBean
.
List
Bean
,
BaseViewHolder
>
{
public
MesQualityAdapter
(
int
layoutResId
,
List
data
)
{
public
MesQualityAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
super
(
layoutResId
,
data
);
...
@@ -19,7 +21,12 @@ public class MesQualityAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean
...
@@ -19,7 +21,12 @@ public class MesQualityAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean
@Override
@Override
protected
void
convert
(
BaseViewHolder
helper
,
ProPriceBean
.
RecordsBean
item
)
{
protected
void
convert
(
BaseViewHolder
helper
,
FeedbackBean
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_no
,
item
.
getFeedbackCode
());
helper
.
setText
(
R
.
id
.
tv_manager
,
item
.
getId
());
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getCustomerName
());
helper
.
setText
(
R
.
id
.
tv_phone
,
item
.
getPhoneNumber
());
helper
.
setText
(
R
.
id
.
tv_pro
,
item
.
getProductName
());
}
}
}
}
app/src/main/res/layout/activity_mes_quality.xml
浏览文件 @
e5f47cd3
...
@@ -45,6 +45,13 @@
...
@@ -45,6 +45,13 @@
android:gravity=
"center"
android:gravity=
"center"
android:text=
"联系电话"
android:text=
"联系电话"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"产品"
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
...
...
app/src/main/res/layout/item_mes_quality.xml
浏览文件 @
e5f47cd3
...
@@ -7,14 +7,16 @@
...
@@ -7,14 +7,16 @@
<TextView
<TextView
android:id=
"@+id/tv_no"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
客户编码
"
android:text=
"
反馈单号
"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
...
@@ -23,18 +25,28 @@
...
@@ -23,18 +25,28 @@
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_manager"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
炼钢厂
"
android:text=
"
销售经理
"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_phone"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"连铸机"
android:text=
"联系电话"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_pro"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:text=
"产品"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论