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
052c28a5
提交
052c28a5
authored
8月 31, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.人员物料
2.TODO 单独菜单
上级
eb59c5aa
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
1353 行增加
和
2 行删除
+1353
-2
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+9
-0
TaskMaterials.java
...in/java/com/wd/workoffice/bean/mesBean/TaskMaterials.java
+300
-0
TaskPeopleBean.java
...n/java/com/wd/workoffice/bean/mesBean/TaskPeopleBean.java
+321
-0
MesApiService.java
...c/main/java/com/wd/workoffice/retrofit/MesApiService.java
+17
-2
QualityWorkPlanFragment.java
...koffice/ui/activity/mes/work/QualityWorkPlanFragment.java
+8
-0
WorkTaskDetailActivity.java
...rkoffice/ui/activity/mes/work/WorkTaskDetailActivity.java
+75
-0
WorkTaskMaterialsFragment.java
...ffice/ui/activity/mes/work/WorkTaskMaterialsFragment.java
+141
-0
WorkTaskPeopleFragment.java
...rkoffice/ui/activity/mes/work/WorkTaskPeopleFragment.java
+144
-0
WorkTaskMaterialsAdapter.java
...om/wd/workoffice/ui/adapter/WorkTaskMaterialsAdapter.java
+33
-0
WorkTaskPeopleAdapter.java
...a/com/wd/workoffice/ui/adapter/WorkTaskPeopleAdapter.java
+33
-0
item_work_task_materials.xml
app/src/main/res/layout/item_work_task_materials.xml
+136
-0
item_work_task_people.xml
app/src/main/res/layout/item_work_task_people.xml
+136
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
052c28a5
...
...
@@ -2483,6 +2483,15 @@
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.mes.work.WorkTaskDetailActivity"
android:configChanges=
"orientation|screenSize|keyboardHidden"
android:label=
"工单任务详情"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<provider
android:name=
"androidx.core.content.FileProvider"
android:authorities=
"com.wd.workoffice.fileprovider"
...
...
app/src/main/java/com/wd/workoffice/bean/mesBean/TaskMaterials.java
0 → 100644
浏览文件 @
052c28a5
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
TaskMaterials
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
String
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
String
getLocationName
()
{
return
locationName
;
}
public
void
setLocationName
(
String
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/bean/mesBean/TaskPeopleBean.java
0 → 100644
浏览文件 @
052c28a5
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
TaskPeopleBean
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 : f58718d0e0054fcc96ca014bab4d7505
* createDateTime : null
* updateDateTime : null
* woId : 570f78e7e1cb11ea8334fa163e1166bd
* actId : 42ddf9651f3f4507a191605536648e44
* actNum : RW00001
* actDesc : null
* userId : 4b25850f462511ea8334fa163e1166bd
* craftId : 7d4fc1e5462511ea8334fa163e1166bd
* skillId : 9fd6aadd5ec845de959e3844672ac715
* laborHrs : null
* lineCost : null
* payRate : null
* quantity : null
* vendorCode : null
* contractCode : null
* teamId : null
* siteId : null
* siteCode : null
* remark : null
* createBy : null
* changeBy : null
* userCode : 20001
* userName : 仓库管理员
* craftCode : GZ00005
* craftName : 仓库管理员
* skillCode : JN00001
* skillName : 仓库管理
* delete : false
*/
private
String
id
;
private
Object
createDateTime
;
private
Object
updateDateTime
;
private
String
woId
;
private
String
actId
;
private
String
actNum
;
private
Object
actDesc
;
private
String
userId
;
private
String
craftId
;
private
String
skillId
;
private
Object
laborHrs
;
private
Object
lineCost
;
private
Object
payRate
;
private
Object
quantity
;
private
Object
vendorCode
;
private
Object
contractCode
;
private
Object
teamId
;
private
Object
siteId
;
private
Object
siteCode
;
private
Object
remark
;
private
Object
createBy
;
private
Object
changeBy
;
private
String
userCode
;
private
String
userName
;
private
String
craftCode
;
private
String
craftName
;
private
String
skillCode
;
private
String
skillName
;
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
Object
getActDesc
()
{
return
actDesc
;
}
public
void
setActDesc
(
Object
actDesc
)
{
this
.
actDesc
=
actDesc
;
}
public
String
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
String
userId
)
{
this
.
userId
=
userId
;
}
public
String
getCraftId
()
{
return
craftId
;
}
public
void
setCraftId
(
String
craftId
)
{
this
.
craftId
=
craftId
;
}
public
String
getSkillId
()
{
return
skillId
;
}
public
void
setSkillId
(
String
skillId
)
{
this
.
skillId
=
skillId
;
}
public
Object
getLaborHrs
()
{
return
laborHrs
;
}
public
void
setLaborHrs
(
Object
laborHrs
)
{
this
.
laborHrs
=
laborHrs
;
}
public
Object
getLineCost
()
{
return
lineCost
;
}
public
void
setLineCost
(
Object
lineCost
)
{
this
.
lineCost
=
lineCost
;
}
public
Object
getPayRate
()
{
return
payRate
;
}
public
void
setPayRate
(
Object
payRate
)
{
this
.
payRate
=
payRate
;
}
public
Object
getQuantity
()
{
return
quantity
;
}
public
void
setQuantity
(
Object
quantity
)
{
this
.
quantity
=
quantity
;
}
public
Object
getVendorCode
()
{
return
vendorCode
;
}
public
void
setVendorCode
(
Object
vendorCode
)
{
this
.
vendorCode
=
vendorCode
;
}
public
Object
getContractCode
()
{
return
contractCode
;
}
public
void
setContractCode
(
Object
contractCode
)
{
this
.
contractCode
=
contractCode
;
}
public
Object
getTeamId
()
{
return
teamId
;
}
public
void
setTeamId
(
Object
teamId
)
{
this
.
teamId
=
teamId
;
}
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
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
String
getUserCode
()
{
return
userCode
;
}
public
void
setUserCode
(
String
userCode
)
{
this
.
userCode
=
userCode
;
}
public
String
getUserName
()
{
return
userName
;
}
public
void
setUserName
(
String
userName
)
{
this
.
userName
=
userName
;
}
public
String
getCraftCode
()
{
return
craftCode
;
}
public
void
setCraftCode
(
String
craftCode
)
{
this
.
craftCode
=
craftCode
;
}
public
String
getCraftName
()
{
return
craftName
;
}
public
void
setCraftName
(
String
craftName
)
{
this
.
craftName
=
craftName
;
}
public
String
getSkillCode
()
{
return
skillCode
;
}
public
void
setSkillCode
(
String
skillCode
)
{
this
.
skillCode
=
skillCode
;
}
public
String
getSkillName
()
{
return
skillName
;
}
public
void
setSkillName
(
String
skillName
)
{
this
.
skillName
=
skillName
;
}
public
boolean
isDelete
()
{
return
delete
;
}
public
void
setDelete
(
boolean
delete
)
{
this
.
delete
=
delete
;
}
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @
052c28a5
...
...
@@ -709,6 +709,23 @@ public interface MesApiService {
@POST
(
"/himes/api/workOrder/show/getChild.json"
)
Observable
<
BaseMesBean
>
workOrderChild
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
* 质量工单-计划-人员
*
* @return
*/
@POST
(
"/himes/api/workOrder/show/pagePlanLabor.json"
)
Observable
<
BaseMesBean
>
pagePlanLabor
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
* 质量工单-计划-物料
*
* @return
*/
@POST
(
"/himes/api/workOrder/show/pagePlanMaterial.json"
)
Observable
<
BaseMesBean
>
pagePlanMaterial
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
* 质量工单-计划-任务
*
...
...
@@ -718,8 +735,6 @@ public interface MesApiService {
Observable
<
BaseMesBean
>
pageActivity
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
* @return
*/
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkPlanFragment.java
浏览文件 @
052c28a5
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.os.Bundle
;
import
android.view.View
;
import
android.widget.TextView
;
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.WorkBaseFg
;
...
...
@@ -198,6 +200,12 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
getTask
();
},
rvData
);
//TODO 子工单任务详情跳转
taskAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
WorkTaskDetailActivity
.
class
,
"info"
,
JSON
.
toJSONString
(
taskList
.
get
(
position
)));
}
});
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskDetailActivity.java
0 → 100644
浏览文件 @
052c28a5
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
com.google.android.material.tabs.TabLayout
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.ui.adapter.VpDataAdapter
;
import
java.util.ArrayList
;
import
java.util.List
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.viewpager.widget.ViewPager
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
/**
* 质量工单详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public
class
WorkTaskDetailActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
tl_tab
)
TabLayout
tlTab
;
@BindView
(
R
.
id
.
vp_data
)
ViewPager
vpData
;
private
List
<
String
>
tab
=
new
ArrayList
<>();
// {
// "工单", "计划", "实际情况" ,"故障报告"};
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
tlTab
.
setupWithViewPager
(
vpData
);
tlTab
.
setTabMode
(
TabLayout
.
MODE_FIXED
);
}
@Override
protected
void
initData
()
{
String
status
=
getIntent
().
getStringExtra
(
"status"
);
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
"info"
,
getIntent
().
getStringExtra
(
"info"
));
FragmentManager
sfm
=
getSupportFragmentManager
();
List
<
Fragment
>
data
=
new
ArrayList
<>();
WorkTaskPeopleFragment
qualityWorkFragment
=
new
WorkTaskPeopleFragment
();
WorkTaskMaterialsFragment
qualityWorkPlanFragment
=
new
WorkTaskMaterialsFragment
();
qualityWorkFragment
.
setArguments
(
bundle
);
qualityWorkPlanFragment
.
setArguments
(
bundle
);
data
.
add
(
qualityWorkFragment
);
data
.
add
(
qualityWorkPlanFragment
);
tab
.
add
(
"员工"
);
tab
.
add
(
"物料"
);
VpDataAdapter
vpFgAdapter
=
new
VpDataAdapter
(
sfm
,
data
);
vpData
.
setAdapter
(
vpFgAdapter
);
for
(
int
i
=
0
;
i
<
tab
.
size
();
i
++)
{
tlTab
.
getTabAt
(
i
).
setText
(
tab
.
get
(
i
));
}
}
@Override
protected
void
initEvent
()
{
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_order
;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskMaterialsFragment.java
0 → 100644
浏览文件 @
052c28a5
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.os.Bundle
;
import
com.alibaba.fastjson.JSON
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkBaseFg
;
import
com.wd.workoffice.bean.mesBean.TaskMaterials
;
import
com.wd.workoffice.bean.mesBean.TaskPeopleBean
;
import
com.wd.workoffice.bean.mesBean.WorkTaskBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.WorkTaskMaterialsAdapter
;
import
com.wd.workoffice.ui.adapter.WorkTaskPeopleAdapter
;
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
WorkTaskMaterialsFragment
extends
WorkBaseFg
{
@BindView
(
R
.
id
.
rv_data
)
RecyclerView
rvData
;
@BindView
(
R
.
id
.
srl_refresh
)
SmartRefreshLayout
srlRefresh
;
private
Map
<
String
,
Object
>
param
;
private
List
<
TaskMaterials
.
ListBean
>
taskList
;
private
WorkTaskMaterialsAdapter
taskAdapter
;
private
WorkTaskBean
.
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"
),
WorkTaskBean
.
ListBean
.
class
);
}
}
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
,
getContentView
());
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
getActivity
(),
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
taskList
=
new
ArrayList
<>();
taskAdapter
=
new
WorkTaskMaterialsAdapter
(
R
.
layout
.
item_work_task_materials
,
taskList
);
taskAdapter
.
bindToRecyclerView
(
rvData
);
taskParam
=
WorkUtils
.
pageMesKey
();
taskParam
.
put
(
"pageNum"
,
1
);
taskParamMap
=
WorkUtils
.
simpleParam
();
taskParam
.
put
(
"paramMap"
,
taskParamMap
);
taskParamMap
.
put
(
"woId"
,
info
.
getWoId
());
taskParamMap
.
put
(
"actId"
,
info
.
getId
());
getTask
();
}
private
void
getTask
()
{
RtfUtils
.
getMesRtf
().
pagePlanMaterial
(
"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
<
TaskMaterials
.
ListBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
TaskMaterials
.
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
()
{
taskAdapter
.
setOnLoadMoreListener
(()
->
{
taskParam
.
put
(
"pageNum"
,
taskPage
);
getTask
();
},
rvData
);
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_pro_price
;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskPeopleFragment.java
0 → 100644
浏览文件 @
052c28a5
package
com
.
wd
.
workoffice
.
ui
.
activity
.
mes
.
work
;
import
android.os.Bundle
;
import
com.alibaba.fastjson.JSON
;
import
com.scwang.smartrefresh.layout.SmartRefreshLayout
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseMesBean
;
import
com.wd.workoffice.app.WorkBaseFg
;
import
com.wd.workoffice.bean.mesBean.TaskPeopleBean
;
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.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.ui.adapter.WorkTaskPeopleAdapter
;
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
WorkTaskPeopleFragment
extends
WorkBaseFg
{
@BindView
(
R
.
id
.
rv_data
)
RecyclerView
rvData
;
@BindView
(
R
.
id
.
srl_refresh
)
SmartRefreshLayout
srlRefresh
;
private
Map
<
String
,
Object
>
param
;
private
List
<
TaskPeopleBean
.
ListBean
>
taskList
;
private
WorkTaskPeopleAdapter
taskAdapter
;
private
WorkTaskBean
.
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"
),
WorkTaskBean
.
ListBean
.
class
);
}
}
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
,
getContentView
());
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
getActivity
(),
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
taskList
=
new
ArrayList
<>();
taskAdapter
=
new
WorkTaskPeopleAdapter
(
R
.
layout
.
item_work_task_people
,
taskList
);
taskAdapter
.
bindToRecyclerView
(
rvData
);
taskParam
=
WorkUtils
.
pageMesKey
();
taskParam
.
put
(
"pageNum"
,
1
);
taskParamMap
=
WorkUtils
.
simpleParam
();
taskParam
.
put
(
"paramMap"
,
taskParamMap
);
taskParamMap
.
put
(
"woId"
,
info
.
getWoId
());
taskParamMap
.
put
(
"actId"
,
info
.
getId
());
getTask
();
}
private
void
getTask
()
{
RtfUtils
.
getMesRtf
().
pagePlanLabor
(
"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
<
TaskPeopleBean
.
ListBean
>
getList
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
TaskPeopleBean
.
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
()
{
taskAdapter
.
setOnLoadMoreListener
(()
->
{
taskParam
.
put
(
"pageNum"
,
taskPage
);
getTask
();
},
rvData
);
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_pro_price
;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkTaskMaterialsAdapter.java
0 → 100644
浏览文件 @
052c28a5
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.TaskMaterials
;
import
com.wd.workoffice.bean.mesBean.TaskPeopleBean
;
import
com.wd.workoffice.util.MathUtils
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkTaskMaterialsAdapter
extends
BaseQuickAdapter
<
TaskMaterials
.
ListBean
,
BaseViewHolder
>
{
public
WorkTaskMaterialsAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
TaskMaterials
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_no
,
String
.
format
(
"物料编码:%s"
,
item
.
getItemCode
()));
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getItemName
());
helper
.
setText
(
R
.
id
.
tv_num
,
MathUtils
.
converData
(
item
.
getItemQty
(),
3
));
helper
.
setText
(
R
.
id
.
tv_stock
,
item
.
getLocationName
());
helper
.
setText
(
R
.
id
.
tv_grant
,
item
.
isDirectReq
()?
"是"
:
"否"
);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkTaskPeopleAdapter.java
0 → 100644
浏览文件 @
052c28a5
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.TaskPeopleBean
;
import
com.wd.workoffice.bean.mesBean.WorkTaskBean
;
import
com.wd.workoffice.bean.workEnum.WorkOrder
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkTaskPeopleAdapter
extends
BaseQuickAdapter
<
TaskPeopleBean
.
ListBean
,
BaseViewHolder
>
{
public
WorkTaskPeopleAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
TaskPeopleBean
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_no
,
String
.
format
(
"任务号:%s"
,
item
.
getActNum
()));
helper
.
setText
(
R
.
id
.
tv_code
,
item
.
getUserCode
());
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getUserName
());
helper
.
setText
(
R
.
id
.
tv_type
,
item
.
getCraftName
());
helper
.
setText
(
R
.
id
.
tv_skill
,
item
.
getSkillName
());
}
}
app/src/main/res/layout/item_work_task_materials.xml
0 → 100644
浏览文件 @
052c28a5
<?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:background=
"#FCFCFD"
android:orientation=
"vertical"
android:paddingVertical=
"10mm"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
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_marginLeft=
"4mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"数量:"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"4mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"库房:"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_stock"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"4mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"直接发放:"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_grant"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"4mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_work_task_people.xml
0 → 100644
浏览文件 @
052c28a5
<?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:background=
"#FCFCFD"
android:orientation=
"vertical"
android:paddingVertical=
"10mm"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"员工编号:"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"4mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
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_marginLeft=
"4mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"工种:"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"4mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"技能级别:"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_skill"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"4mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论