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
4ad1317f
提交
4ad1317f
authored
8月 23, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.质量工单列表-计划
2.TODO 单独菜单
上级
876917f2
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
1339 行增加
和
2 行删除
+1339
-2
WorkOrderSon.java
...ain/java/com/wd/workoffice/bean/mesBean/WorkOrderSon.java
+0
-0
WorkTaskBean.java
...ain/java/com/wd/workoffice/bean/mesBean/WorkTaskBean.java
+321
-0
WorkTaskMaterialsBean.java
...com/wd/workoffice/bean/mesBean/WorkTaskMaterialsBean.java
+301
-0
MesApiService.java
...c/main/java/com/wd/workoffice/retrofit/MesApiService.java
+17
-0
QualityWorkPlanFragment.java
...koffice/ui/activity/mes/work/QualityWorkPlanFragment.java
+210
-0
WorkOrderDetailActivity.java
...koffice/ui/activity/mes/work/WorkOrderDetailActivity.java
+4
-2
WorkOrderSonAdapter.java
...ava/com/wd/workoffice/ui/adapter/WorkOrderSonAdapter.java
+33
-0
WorkOrderTaskAdapter.java
...va/com/wd/workoffice/ui/adapter/WorkOrderTaskAdapter.java
+32
-0
fg_work_order_detail_plan.xml
app/src/main/res/layout/fg_work_order_detail_plan.xml
+142
-0
item_work_order_son.xml
app/src/main/res/layout/item_work_order_son.xml
+151
-0
item_work_order_task.xml
app/src/main/res/layout/item_work_order_task.xml
+128
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/bean/mesBean/WorkOrderSon.java
0 → 100644
浏览文件 @
4ad1317f
差异被折叠。
点击展开。
app/src/main/java/com/wd/workoffice/bean/mesBean/WorkTaskBean.java
0 → 100644
浏览文件 @
4ad1317f
package
com
.
wd
.
workoffice
.
bean
.
mesBean
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.wd.workoffice.app.BaseMesPageBean
;
import
java.util.List
;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public
class
WorkTaskBean
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 : 42ddf9651f3f4507a191605536648e44
* createDateTime : null
* updateDateTime : null
* actNum : RW00001
* description : 1
* status : 5
* woId : 570f78e7e1cb11ea8334fa163e1166bd
* assetId : null
* locationId : null
* schedStart : null
* schedFinish : null
* actStart : null
* actFinish : null
* earliestStartTime : null
* latestCompTime : null
* time : 1
* siteId : null
* remark : null
* createBy : null
* changeBy : null
* delete : false
* userName : null
* userCode : null
* craftCode : null
* craftName : null
* skillCode : null
* skillName : null
* astAsset : null
* locations : null
*/
private
String
id
;
private
Object
createDateTime
;
private
Object
updateDateTime
;
private
String
actNum
;
private
String
description
;
private
int
status
;
private
String
woId
;
private
Object
assetId
;
private
Object
locationId
;
private
Object
schedStart
;
private
Object
schedFinish
;
private
Object
actStart
;
private
Object
actFinish
;
private
Object
earliestStartTime
;
private
Object
latestCompTime
;
private
int
time
;
private
Object
siteId
;
private
Object
remark
;
private
Object
createBy
;
private
Object
changeBy
;
private
boolean
delete
;
private
Object
userName
;
private
Object
userCode
;
private
Object
craftCode
;
private
Object
craftName
;
private
Object
skillCode
;
private
Object
skillName
;
private
Object
astAsset
;
private
Object
locations
;
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
getActNum
()
{
return
actNum
;
}
public
void
setActNum
(
String
actNum
)
{
this
.
actNum
=
actNum
;
}
public
String
getDescription
()
{
return
description
;
}
public
void
setDescription
(
String
description
)
{
this
.
description
=
description
;
}
public
int
getStatus
()
{
return
status
;
}
public
void
setStatus
(
int
status
)
{
this
.
status
=
status
;
}
public
String
getWoId
()
{
return
woId
;
}
public
void
setWoId
(
String
woId
)
{
this
.
woId
=
woId
;
}
public
Object
getAssetId
()
{
return
assetId
;
}
public
void
setAssetId
(
Object
assetId
)
{
this
.
assetId
=
assetId
;
}
public
Object
getLocationId
()
{
return
locationId
;
}
public
void
setLocationId
(
Object
locationId
)
{
this
.
locationId
=
locationId
;
}
public
Object
getSchedStart
()
{
return
schedStart
;
}
public
void
setSchedStart
(
Object
schedStart
)
{
this
.
schedStart
=
schedStart
;
}
public
Object
getSchedFinish
()
{
return
schedFinish
;
}
public
void
setSchedFinish
(
Object
schedFinish
)
{
this
.
schedFinish
=
schedFinish
;
}
public
Object
getActStart
()
{
return
actStart
;
}
public
void
setActStart
(
Object
actStart
)
{
this
.
actStart
=
actStart
;
}
public
Object
getActFinish
()
{
return
actFinish
;
}
public
void
setActFinish
(
Object
actFinish
)
{
this
.
actFinish
=
actFinish
;
}
public
Object
getEarliestStartTime
()
{
return
earliestStartTime
;
}
public
void
setEarliestStartTime
(
Object
earliestStartTime
)
{
this
.
earliestStartTime
=
earliestStartTime
;
}
public
Object
getLatestCompTime
()
{
return
latestCompTime
;
}
public
void
setLatestCompTime
(
Object
latestCompTime
)
{
this
.
latestCompTime
=
latestCompTime
;
}
public
int
getTime
()
{
return
time
;
}
public
void
setTime
(
int
time
)
{
this
.
time
=
time
;
}
public
Object
getSiteId
()
{
return
siteId
;
}
public
void
setSiteId
(
Object
siteId
)
{
this
.
siteId
=
siteId
;
}
public
Object
getRemark
()
{
return
remark
;
}
public
void
setRemark
(
Object
remark
)
{
this
.
remark
=
remark
;
}
public
Object
getCreateBy
()
{
return
createBy
;
}
public
void
setCreateBy
(
Object
createBy
)
{
this
.
createBy
=
createBy
;
}
public
Object
getChangeBy
()
{
return
changeBy
;
}
public
void
setChangeBy
(
Object
changeBy
)
{
this
.
changeBy
=
changeBy
;
}
public
boolean
isDelete
()
{
return
delete
;
}
public
void
setDelete
(
boolean
delete
)
{
this
.
delete
=
delete
;
}
public
Object
getUserName
()
{
return
userName
;
}
public
void
setUserName
(
Object
userName
)
{
this
.
userName
=
userName
;
}
public
Object
getUserCode
()
{
return
userCode
;
}
public
void
setUserCode
(
Object
userCode
)
{
this
.
userCode
=
userCode
;
}
public
Object
getCraftCode
()
{
return
craftCode
;
}
public
void
setCraftCode
(
Object
craftCode
)
{
this
.
craftCode
=
craftCode
;
}
public
Object
getCraftName
()
{
return
craftName
;
}
public
void
setCraftName
(
Object
craftName
)
{
this
.
craftName
=
craftName
;
}
public
Object
getSkillCode
()
{
return
skillCode
;
}
public
void
setSkillCode
(
Object
skillCode
)
{
this
.
skillCode
=
skillCode
;
}
public
Object
getSkillName
()
{
return
skillName
;
}
public
void
setSkillName
(
Object
skillName
)
{
this
.
skillName
=
skillName
;
}
public
Object
getAstAsset
()
{
return
astAsset
;
}
public
void
setAstAsset
(
Object
astAsset
)
{
this
.
astAsset
=
astAsset
;
}
public
Object
getLocations
()
{
return
locations
;
}
public
void
setLocations
(
Object
locations
)
{
this
.
locations
=
locations
;
}
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/WorkTaskMaterialsBean.java
0 → 100644
浏览文件 @
4ad1317f
package
com
.
wd
.
workoffice
.
bean
.
mesBean
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.wd.workoffice.app.BaseMesPageBean
;
import
java.util.List
;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public
class
WorkTaskMaterialsBean
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 : 0408f4a4694242719279cd07e3666ef1
* createDateTime : null
* updateDateTime : null
* woId : 570f78e7e1cb11ea8334fa163e1166bd
* actId : 42ddf9651f3f4507a191605536648e44
* actNum : RW00001
* directReq : true
* itemCode : 7103040272T
* itemName : 锆碳快换浸入式水口J195-1
* itemQty : 11.0
* unitCost : null
* orderUnit : null
* lineCost : null
* locationCode : null
* locationName : null
* storelocSite : null
* resType : null
* vendorCode : null
* requireDate : null
* requestBy : null
* isSueTo : null
* siteId : null
* siteCode : null
* remark : null
* createBy : 398c852b38e911ea8334fa163e1166bd
* changeBy : null
* delete : false
*/
private
String
id
;
private
Object
createDateTime
;
private
Object
updateDateTime
;
private
String
woId
;
private
String
actId
;
private
String
actNum
;
private
boolean
directReq
;
private
String
itemCode
;
private
String
itemName
;
private
double
itemQty
;
private
Object
unitCost
;
private
Object
orderUnit
;
private
Object
lineCost
;
private
Object
locationCode
;
private
Object
locationName
;
private
Object
storelocSite
;
private
Object
resType
;
private
Object
vendorCode
;
private
Object
requireDate
;
private
Object
requestBy
;
private
Object
isSueTo
;
private
Object
siteId
;
private
Object
siteCode
;
private
Object
remark
;
private
String
createBy
;
private
Object
changeBy
;
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
getWoId
()
{
return
woId
;
}
public
void
setWoId
(
String
woId
)
{
this
.
woId
=
woId
;
}
public
String
getActId
()
{
return
actId
;
}
public
void
setActId
(
String
actId
)
{
this
.
actId
=
actId
;
}
public
String
getActNum
()
{
return
actNum
;
}
public
void
setActNum
(
String
actNum
)
{
this
.
actNum
=
actNum
;
}
public
boolean
isDirectReq
()
{
return
directReq
;
}
public
void
setDirectReq
(
boolean
directReq
)
{
this
.
directReq
=
directReq
;
}
public
String
getItemCode
()
{
return
itemCode
;
}
public
void
setItemCode
(
String
itemCode
)
{
this
.
itemCode
=
itemCode
;
}
public
String
getItemName
()
{
return
itemName
;
}
public
void
setItemName
(
String
itemName
)
{
this
.
itemName
=
itemName
;
}
public
double
getItemQty
()
{
return
itemQty
;
}
public
void
setItemQty
(
double
itemQty
)
{
this
.
itemQty
=
itemQty
;
}
public
Object
getUnitCost
()
{
return
unitCost
;
}
public
void
setUnitCost
(
Object
unitCost
)
{
this
.
unitCost
=
unitCost
;
}
public
Object
getOrderUnit
()
{
return
orderUnit
;
}
public
void
setOrderUnit
(
Object
orderUnit
)
{
this
.
orderUnit
=
orderUnit
;
}
public
Object
getLineCost
()
{
return
lineCost
;
}
public
void
setLineCost
(
Object
lineCost
)
{
this
.
lineCost
=
lineCost
;
}
public
Object
getLocationCode
()
{
return
locationCode
;
}
public
void
setLocationCode
(
Object
locationCode
)
{
this
.
locationCode
=
locationCode
;
}
public
Object
getLocationName
()
{
return
locationName
;
}
public
void
setLocationName
(
Object
locationName
)
{
this
.
locationName
=
locationName
;
}
public
Object
getStorelocSite
()
{
return
storelocSite
;
}
public
void
setStorelocSite
(
Object
storelocSite
)
{
this
.
storelocSite
=
storelocSite
;
}
public
Object
getResType
()
{
return
resType
;
}
public
void
setResType
(
Object
resType
)
{
this
.
resType
=
resType
;
}
public
Object
getVendorCode
()
{
return
vendorCode
;
}
public
void
setVendorCode
(
Object
vendorCode
)
{
this
.
vendorCode
=
vendorCode
;
}
public
Object
getRequireDate
()
{
return
requireDate
;
}
public
void
setRequireDate
(
Object
requireDate
)
{
this
.
requireDate
=
requireDate
;
}
public
Object
getRequestBy
()
{
return
requestBy
;
}
public
void
setRequestBy
(
Object
requestBy
)
{
this
.
requestBy
=
requestBy
;
}
public
Object
getIsSueTo
()
{
return
isSueTo
;
}
public
void
setIsSueTo
(
Object
isSueTo
)
{
this
.
isSueTo
=
isSueTo
;
}
public
Object
getSiteId
()
{
return
siteId
;
}
public
void
setSiteId
(
Object
siteId
)
{
this
.
siteId
=
siteId
;
}
public
Object
getSiteCode
()
{
return
siteCode
;
}
public
void
setSiteCode
(
Object
siteCode
)
{
this
.
siteCode
=
siteCode
;
}
public
Object
getRemark
()
{
return
remark
;
}
public
void
setRemark
(
Object
remark
)
{
this
.
remark
=
remark
;
}
public
String
getCreateBy
()
{
return
createBy
;
}
public
void
setCreateBy
(
String
createBy
)
{
this
.
createBy
=
createBy
;
}
public
Object
getChangeBy
()
{
return
changeBy
;
}
public
void
setChangeBy
(
Object
changeBy
)
{
this
.
changeBy
=
changeBy
;
}
public
boolean
isDelete
()
{
return
delete
;
}
public
void
setDelete
(
boolean
delete
)
{
this
.
delete
=
delete
;
}
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @
4ad1317f
...
...
@@ -701,6 +701,23 @@ public interface MesApiService {
@POST
(
"/himes/api/opmreporterror/show/listWo.json"
)
Observable
<
BaseMesBean
>
opmreportError
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
* 质量工单-计划-子工单
*
* @return
*/
@POST
(
"/himes/api/workOrder/show/getChild.json"
)
Observable
<
BaseMesBean
>
workOrderChild
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
* 质量工单-计划-任务
*
* @return
*/
@POST
(
"/himes/api/workOrder/show/pageActivity.json"
)
Observable
<
BaseMesBean
>
pageActivity
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkPlanFragment.java
0 → 100644
浏览文件 @
4ad1317f
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.os.Bundle
;
import
android.widget.TextView
;
import
com.alibaba.fastjson.JSON
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkBaseFg
;
import
com.wd.workoffice.bean.mesBean.WokrOrderBean
;
import
com.wd.workoffice.bean.mesBean.WorkOrderSon
;
import
com.wd.workoffice.bean.mesBean.WorkTaskBean
;
import
com.wd.workoffice.bean.mesBean.WorkTaskMaterialsBean
;
import
com.wd.workoffice.bean.workEnum.WorkOrder
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.WorkOrderSonAdapter
;
import
com.wd.workoffice.ui.adapter.WorkOrderTaskAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
androidx.annotation.Nullable
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
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
QualityWorkPlanFragment
extends
WorkBaseFg
{
@BindView
(
R
.
id
.
tv_no
)
TextView
tvNo
;
@BindView
(
R
.
id
.
tv_desc
)
TextView
tvDesc
;
@BindView
(
R
.
id
.
tv_status
)
TextView
tvStatus
;
@BindView
(
R
.
id
.
rv_son
)
RecyclerView
rvSon
;
@BindView
(
R
.
id
.
rv_data
)
RecyclerView
rvData
;
private
Map
<
String
,
Object
>
param
;
private
List
<
WorkOrderSon
.
ListBean
>
sonList
;
private
List
<
WorkTaskBean
.
ListBean
>
taskList
;
private
WorkOrderSonAdapter
sonAdapter
;
private
WorkOrderTaskAdapter
taskAdapter
;
private
WokrOrderBean
.
ListBean
info
;
private
int
page
=
1
;
private
int
taskPage
=
1
;
private
Map
<
String
,
Object
>
paramMap
;
private
Map
<
String
,
Object
>
taskParam
;
private
Map
<
String
,
Object
>
taskParamMap
;
@Override
public
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
Bundle
arguments
=
getArguments
();
if
(
arguments
!=
null
)
{
info
=
JSON
.
parseObject
(
arguments
.
getString
(
"info"
),
WokrOrderBean
.
ListBean
.
class
);
}
}
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
,
getContentView
());
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
getActivity
(),
RecyclerView
.
VERTICAL
,
false
));
rvSon
.
setLayoutManager
(
new
LinearLayoutManager
(
getActivity
(),
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
tvNo
.
setText
(
info
.
getWoCode
());
tvDesc
.
setText
(
info
.
getDescription
());
tvStatus
.
setText
(
WorkOrder
.
getNameByCode
(
info
.
getStatus
()));
taskList
=
new
ArrayList
<>();
taskAdapter
=
new
WorkOrderTaskAdapter
(
R
.
layout
.
item_work_order_task
,
taskList
);
taskAdapter
.
bindToRecyclerView
(
rvData
);
sonList
=
new
ArrayList
<>();
sonAdapter
=
new
WorkOrderSonAdapter
(
R
.
layout
.
item_work_order_son
,
sonList
);
sonAdapter
.
bindToRecyclerView
(
rvSon
);
param
=
WorkUtils
.
pageMesKey
();
param
.
put
(
"pageNum"
,
1
);
paramMap
=
WorkUtils
.
simpleParam
();
param
.
put
(
"paramMap"
,
paramMap
);
paramMap
.
put
(
"parentId"
,
info
.
getId
());
taskParam
=
WorkUtils
.
pageMesKey
();
taskParam
.
put
(
"pageNum"
,
1
);
taskParamMap
=
WorkUtils
.
simpleParam
();
taskParam
.
put
(
"paramMap"
,
taskParamMap
);
taskParamMap
.
put
(
"woId"
,
info
.
getId
());
getData
();
getTask
();
}
private
void
getData
()
{
RtfUtils
.
getMesRtf
().
workOrderChild
(
"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
<
WorkOrderSon
.
ListBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkOrderSon
.
class
).
getList
();
if
(
page
==
1
)
{
sonList
.
clear
();
sonList
.
addAll
(
getList
);
sonAdapter
.
notifyDataSetChanged
();
sonAdapter
.
loadMoreComplete
();
}
else
{
sonAdapter
.
loadMoreComplete
();
sonList
.
addAll
(
getList
);
sonAdapter
.
notifyDataSetChanged
();
}
if
(
getList
.
size
()
==
0
)
{
sonAdapter
.
loadMoreEnd
(
true
);
}
else
{
page
++;
}
}
});
}
private
void
getTask
()
{
RtfUtils
.
getMesRtf
().
pageActivity
(
"1"
,
WorkUtils
.
convertMapToBody
(
taskParam
)).
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
<
WorkTaskBean
.
ListBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
WorkTaskBean
.
class
).
getList
();
if
(
taskPage
==
1
)
{
taskList
.
clear
();
taskList
.
addAll
(
getList
);
taskAdapter
.
notifyDataSetChanged
();
taskAdapter
.
loadMoreComplete
();
}
else
{
taskAdapter
.
loadMoreComplete
();
taskList
.
addAll
(
getList
);
taskAdapter
.
notifyDataSetChanged
();
}
if
(
getList
.
size
()
==
0
)
{
taskAdapter
.
loadMoreEnd
(
true
);
}
else
{
taskPage
++;
}
}
});
}
@Override
protected
void
initEvent
()
{
sonAdapter
.
setOnLoadMoreListener
(()
->
{
param
.
put
(
"pageNum"
,
page
);
getData
();
},
rvSon
);
taskAdapter
.
setOnLoadMoreListener
(()
->
{
taskParam
.
put
(
"pageNum"
,
taskPage
);
getTask
();
},
rvData
);
//TODO 子工单任务详情跳转
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
fg_work_order_detail_plan
;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkOrderDetailActivity.java
浏览文件 @
4ad1317f
...
...
@@ -49,15 +49,17 @@ public class WorkOrderDetailActivity extends WorkToolBarActivity {
FragmentManager
sfm
=
getSupportFragmentManager
();
List
<
Fragment
>
data
=
new
ArrayList
<>();
QualityWorkFragment
qualityWorkFragment
=
new
QualityWorkFragment
();
QualityWorkPlanFragment
qualityWorkPlanFragment
=
new
QualityWorkPlanFragment
();
tab
.
add
(
"工单"
);
//
tab.add("计划");
tab
.
add
(
"计划"
);
// if (TextUtils.equals(status, "3") || TextUtils.equals(status, "4")) {
// tab.add("实际情况");
// }
// tab.add("故障报告");
qualityWorkFragment
.
setArguments
(
bundle
);
qualityWorkPlanFragment
.
setArguments
(
bundle
);
data
.
add
(
qualityWorkFragment
);
// data.add(qualityWork
Fragment);
data
.
add
(
qualityWorkPlan
Fragment
);
// data.add(qualityWorkFragment);
// data.add(qualityWorkFragment);
VpDataAdapter
vpFgAdapter
=
new
VpDataAdapter
(
sfm
,
data
);
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/WorkOrderSonAdapter.java
0 → 100644
浏览文件 @
4ad1317f
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.OpmreportErrorBean
;
import
com.wd.workoffice.bean.mesBean.WorkOrderSon
;
import
com.wd.workoffice.bean.workEnum.WorkOrder
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkOrderSonAdapter
extends
BaseQuickAdapter
<
WorkOrderSon
.
ListBean
,
BaseViewHolder
>
{
public
WorkOrderSonAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
WorkOrderSon
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_no
,
String
.
format
(
"工单编号:%s"
,
item
.
getWoCode
()));
helper
.
setText
(
R
.
id
.
tv_status
,
WorkOrder
.
getNameByCode
(
item
.
getStatus
()));
helper
.
setText
(
R
.
id
.
tv_location_code
,
item
.
getLocationCode
());
helper
.
setText
(
R
.
id
.
tv_machine_code
,
item
.
getAssetCode
());
helper
.
setText
(
R
.
id
.
tv_desc
,
item
.
getDescription
());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkOrderTaskAdapter.java
0 → 100644
浏览文件 @
4ad1317f
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.WorkTaskBean
;
import
com.wd.workoffice.bean.mesBean.WorkTaskMaterialsBean
;
import
com.wd.workoffice.bean.workEnum.WorkOrder
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkOrderTaskAdapter
extends
BaseQuickAdapter
<
WorkTaskBean
.
ListBean
,
BaseViewHolder
>
{
public
WorkOrderTaskAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
WorkTaskBean
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_no
,
String
.
format
(
"任务号:%s"
,
item
.
getActNum
()));
helper
.
setText
(
R
.
id
.
tv_status
,
WorkOrder
.
getNameByCode
(
item
.
getStatus
()));
helper
.
setText
(
R
.
id
.
tv_desc
,
item
.
getDescription
());
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getTime
()+
""
);
}
}
app/src/main/res/layout/fg_work_order_detail_plan.xml
0 → 100644
浏览文件 @
4ad1317f
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_above=
"@id/ll_bottom"
android:background=
"@color/white"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_above=
"@id/ll_bottom"
android:orientation=
"vertical"
android:paddingBottom=
"20mm"
>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/flexible_background"
android:paddingVertical=
"10mm"
android:paddingLeft=
"10mm"
android:text=
"基本信息"
android:textSize=
"16sp"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:gravity=
"center"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"15mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"工单"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_no"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:gravity=
"center"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"15mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"描述"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:gravity=
"center"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"15mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"状态"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</RelativeLayout>
<View
style=
"@style/dividerX"
/>
<View
style=
"@style/ViewX"
/>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/flexible_background"
android:paddingVertical=
"10mm"
android:paddingLeft=
"10mm"
android:text=
"工单的子工单"
android:textSize=
"16sp"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_son"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<View
style=
"@style/ViewX"
/>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/flexible_background"
android:paddingVertical=
"10mm"
android:paddingLeft=
"10mm"
android:text=
"工单的任务"
android:textSize=
"16sp"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
app/src/main/res/layout/item_work_order_son.xml
0 → 100644
浏览文件 @
4ad1317f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_margin=
"8mm"
android:background=
"@color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
android:paddingTop=
"10mm"
android:paddingBottom=
"10mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"5mm"
>
<TextView
android:id=
"@+id/tv_no"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"工单编号:"
android:textSize=
"16sp"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:textColor=
"@color/orange"
android:textSize=
"14sp"
/>
</RelativeLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"14mm"
android:background=
"#FCFCFD"
android:orientation=
"vertical"
android:paddingVertical=
"10mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"10mm"
android:visibility=
"gone"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"工序名称"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"位置编码"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_location_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"设备编码"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_machine_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</RelativeLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:orientation=
"vertical"
android:layout_marginTop=
"10mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"描述"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"4mm"
android:layout_marginLeft=
"10mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_work_order_task.xml
0 → 100644
浏览文件 @
4ad1317f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_margin=
"8mm"
android:background=
"@color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
android:paddingTop=
"10mm"
android:paddingBottom=
"10mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"5mm"
>
<TextView
android:id=
"@+id/tv_no"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"任务号:"
android:textSize=
"16sp"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:drawableRight=
"@mipmap/arrow_right_gray"
android:textColor=
"@color/orange"
android:textSize=
"14sp"
/>
</RelativeLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"14mm"
android:background=
"#FCFCFD"
android:orientation=
"vertical"
android:paddingVertical=
"10mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"10mm"
android:visibility=
"gone"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"工序名称"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"估计持续时间"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</RelativeLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:background=
"@color/white"
android:orientation=
"vertical"
android:layout_marginTop=
"10mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"描述"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"4mm"
android:layout_marginLeft=
"10mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论