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
6f5a9186
提交
6f5a9186
authored
5月 26, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.是否可编辑
2.//TODO 设备三个子菜单,坩埚下单,mes其他页面,编辑任务担当无法修改.支数参数
上级
c319e55b
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
44 行增加
和
19 行删除
+44
-19
MesApiService.java
...c/main/java/com/wd/workoffice/retrofit/MesApiService.java
+9
-1
MesUserDataDetailActivity.java
...ffice/ui/activity/mes/user/MesUserDataDetailActivity.java
+35
-18
没有找到文件。
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @
6f5a9186
...
@@ -277,13 +277,21 @@ public interface MesApiService {
...
@@ -277,13 +277,21 @@ public interface MesApiService {
/**
/**
*
otherSupplierAdd
*
*
*
* @return
* @return
*/
*/
@POST
(
"/himes/api/msSceneFeedback/show/getByFeedInfo.json"
)
@POST
(
"/himes/api/msSceneFeedback/show/getByFeedInfo.json"
)
Observable
<
BaseMesBean
>
userDataDetail
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
Observable
<
BaseMesBean
>
userDataDetail
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
* otherSupplierAdd
*
* @return
*/
@POST
(
"/himes/api/msSceneFeedback/updateByWorkOrder.json"
)
Observable
<
BaseMesBean
>
canModify
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
/**
* otherSupplierAdd
* otherSupplierAdd
*
*
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @
6f5a9186
...
@@ -204,6 +204,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -204,6 +204,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
private
List
<
String
>
data6List
;
private
List
<
String
>
data6List
;
private
List
<
String
>
data7List
;
private
List
<
String
>
data7List
;
private
UserDataDetailBean
userDataDetailBean
;
private
UserDataDetailBean
userDataDetailBean
;
private
Menu
userDataMenu
;
@Override
@Override
...
@@ -271,6 +272,35 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -271,6 +272,35 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
getData
();
getData
();
}
}
private
void
isCanModify
(
String
customerUserCode
)
{
Map
<
String
,
Object
>
param
=
WorkUtils
.
simpleParam
();
param
.
put
(
"customerUserCode"
,
customerUserCode
);
RtfUtils
.
getMesRtf
().
canModify
(
"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
())
{
return
;
}
if
(
TextUtils
.
equals
(
data
.
getData
().
toString
(),
"1"
)
||
TextUtils
.
equals
(
"2"
,
getIntent
().
getStringExtra
(
"status"
)))
{
userDataMenu
.
findItem
(
R
.
id
.
modify
).
setVisible
(
true
);
}
else
{
userDataMenu
.
findItem
(
R
.
id
.
modify
).
setVisible
(
false
);
}
}
});
}
private
void
getData
()
{
private
void
getData
()
{
Map
<
String
,
Object
>
param
=
WorkUtils
.
simpleParam
();
Map
<
String
,
Object
>
param
=
WorkUtils
.
simpleParam
();
param
.
put
(
"id"
,
getIntent
().
getStringExtra
(
"id"
));
param
.
put
(
"id"
,
getIntent
().
getStringExtra
(
"id"
));
...
@@ -293,8 +323,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -293,8 +323,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
return
;
return
;
}
}
userDataDetailBean
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
UserDataDetailBean
.
class
);
userDataDetailBean
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
UserDataDetailBean
.
class
);
UserDataDetailBean
.
MainInfoBean
mainInfo
=
userDataDetailBean
.
getMainInfo
();
UserDataDetailBean
.
MainInfoBean
mainInfo
=
userDataDetailBean
.
getMainInfo
();
if
(
mainInfo
!=
null
)
{
if
(
mainInfo
!=
null
)
{
isCanModify
(
mainInfo
.
getCustomerUserCode
());
tvClient
.
setText
(
mainInfo
.
getCustomerUserName
());
tvClient
.
setText
(
mainInfo
.
getCustomerUserName
());
tvManager
.
setText
(
mainInfo
.
getSalesManagerName
());
tvManager
.
setText
(
mainInfo
.
getSalesManagerName
());
tvSale
.
setText
(
mainInfo
.
getSalesCompanyName
());
tvSale
.
setText
(
mainInfo
.
getSalesCompanyName
());
...
@@ -408,20 +440,6 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -408,20 +440,6 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
tvMiddle7
.
setText
(
castLadle
.
getBakingTemperature
());
tvMiddle7
.
setText
(
castLadle
.
getBakingTemperature
());
tvMiddle8
.
setText
(
TimeUtils
.
millis2String
(
castLadle
.
getBakingDateTime
()));
tvMiddle8
.
setText
(
TimeUtils
.
millis2String
(
castLadle
.
getBakingDateTime
()));
}
}
// MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
// if (covAgent != null) {
// tvCover1.setText(covAgent.getLadleCoveringAgentName());
// tvCover2.setText(covAgent.getAcidAlkaliDegree());
// tvCover3.setText(covAgent.getChemicalComposition());
// tvCover4.setText(covAgent.getSupplierName());
// }
// MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
// if (mouldFlu != null) {
// tvProtection1.setText(mouldFlu.getMouldFluxesName());
// tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
// tvProtection3.setText(mouldFlu.getChemicalComposition());
// tvProtection4.setText(mouldFlu.getSupplierName());
// }
changeList
();
changeList
();
}
}
});
});
...
@@ -531,7 +549,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -531,7 +549,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
}
}
@OnClick
({
R
.
id
.
tv_add7
,
R
.
id
.
tv_add5
,
R
.
id
.
tv_add6
,
R
.
id
.
btn_agree
,
@OnClick
({
R
.
id
.
tv_add7
,
R
.
id
.
tv_add5
,
R
.
id
.
tv_add6
,
R
.
id
.
btn_agree
,
R
.
id
.
btn_refuse
,
R
.
id
.
tv_add1
,
R
.
id
.
tv_add3
,
R
.
id
.
tv_add4
,
R
.
id
.
rl_add
,
R
.
id
.
rl_middle
,
R
.
id
.
rl_cover
,
R
.
id
.
rl_protection
})
R
.
id
.
btn_refuse
,
R
.
id
.
tv_add1
,
R
.
id
.
tv_add3
,
R
.
id
.
tv_add4
,
R
.
id
.
rl_add
,
R
.
id
.
rl_middle
,
R
.
id
.
rl_cover
,
R
.
id
.
rl_protection
})
public
void
onViewClicked
(
View
view
)
{
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
switch
(
view
.
getId
())
{
...
@@ -678,9 +696,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
...
@@ -678,9 +696,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
@Override
@Override
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
if
(
TextUtils
.
equals
(
"2"
,
getIntent
().
getStringExtra
(
"status"
)))
{
userDataMenu
=
menu
;
getMenuInflater
().
inflate
(
R
.
menu
.
menu_modify
,
menu
);
getMenuInflater
().
inflate
(
R
.
menu
.
menu_modify
,
menu
);
}
return
super
.
onCreateOptionsMenu
(
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论