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
a35c4fa7
提交
a35c4fa7
authored
9月 29, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修改名称为退货/报废
上级
f8920a09
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
7 行增加
和
3 行删除
+7
-3
OutOrderDetailActivity.java
...koffice/ui/activity/bat/order/OutOrderDetailActivity.java
+2
-1
ReturnApplyActivity.java
...workoffice/ui/activity/bat/order/ReturnApplyActivity.java
+1
-1
SaleOrderDetailActivity.java
...office/ui/activity/bat/order/SaleOrderDetailActivity.java
+2
-1
OrderDetailProductAdapter.java
...m/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
+1
-0
OutOrderDetailProductAdapter.java
...d/workoffice/ui/adapter/OutOrderDetailProductAdapter.java
+1
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @
a35c4fa7
...
@@ -386,7 +386,8 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
...
@@ -386,7 +386,8 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
"simpleCode"
,
proList
.
get
(
position
).
getProductSimpleCode
(),
"simpleCode"
,
proList
.
get
(
position
).
getProductSimpleCode
(),
"orderId"
,
getIntent
().
getStringExtra
(
"id"
),
"orderId"
,
getIntent
().
getStringExtra
(
"id"
),
"orderItemId"
,
proList
.
get
(
position
).
getId
(),
"orderItemId"
,
proList
.
get
(
position
).
getId
(),
"productId"
,
proList
.
get
(
position
).
getProductId
()
+
""
);
"productId"
,
proList
.
get
(
position
).
getProductId
()
+
""
,
_TITLE
,
"退货/报废申请列表"
);
break
;
break
;
case
R
.
id
.
tv_flow
:
case
R
.
id
.
tv_flow
:
startActivity
(
ProFlowActivity
.
class
,
startActivity
(
ProFlowActivity
.
class
,
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnApplyActivity.java
浏览文件 @
a35c4fa7
...
@@ -188,7 +188,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
...
@@ -188,7 +188,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
public
boolean
onCreateOptionsMenu
(
Menu
menu
)
{
String
orderType
=
getIntent
().
getStringExtra
(
"orderType"
);
String
orderType
=
getIntent
().
getStringExtra
(
"orderType"
);
String
num
=
getIntent
().
getStringExtra
(
"num"
);
String
num
=
getIntent
().
getStringExtra
(
"num"
);
if
(
Double
.
valueOf
(
num
)
==
0
d
)
{
if
(
Double
.
parseDouble
(
num
)
==
0
d
)
{
return
super
.
onCreateOptionsMenu
(
menu
);
return
super
.
onCreateOptionsMenu
(
menu
);
}
}
if
(
TextUtils
.
equals
(
orderType
,
OrderType
.
SALE
.
getCode
()))
{
if
(
TextUtils
.
equals
(
orderType
,
OrderType
.
SALE
.
getCode
()))
{
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @
a35c4fa7
...
@@ -357,7 +357,8 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
...
@@ -357,7 +357,8 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"simpleCode"
,
proList
.
get
(
position
).
getProductSimpleCode
(),
"simpleCode"
,
proList
.
get
(
position
).
getProductSimpleCode
(),
"orderId"
,
getIntent
().
getStringExtra
(
"id"
),
"orderId"
,
getIntent
().
getStringExtra
(
"id"
),
"orderItemId"
,
proList
.
get
(
position
).
getId
(),
"orderItemId"
,
proList
.
get
(
position
).
getId
(),
"productId"
,
proList
.
get
(
position
).
getProductId
()
+
""
);
"productId"
,
proList
.
get
(
position
).
getProductId
()
+
""
,
_TITLE
,
"退货/报废申请列表"
);
break
;
break
;
case
R
.
id
.
tv_flow
:
case
R
.
id
.
tv_flow
:
startActivity
(
ProFlowActivity
.
class
,
startActivity
(
ProFlowActivity
.
class
,
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
浏览文件 @
a35c4fa7
...
@@ -49,6 +49,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
...
@@ -49,6 +49,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
helper
.
setText
(
R
.
id
.
tv_unit
,
item
.
getProductUnit
());
helper
.
setText
(
R
.
id
.
tv_unit
,
item
.
getProductUnit
());
helper
.
setText
(
R
.
id
.
tv_from
,
WorkUtils
.
getOrderFrom
(
item
.
getType
()));
helper
.
setText
(
R
.
id
.
tv_from
,
WorkUtils
.
getOrderFrom
(
item
.
getType
()));
helper
.
setText
(
R
.
id
.
tv_num
,
MathUtils
.
converData
(
item
.
getProductCount
(),
3
));
helper
.
setText
(
R
.
id
.
tv_num
,
MathUtils
.
converData
(
item
.
getProductCount
(),
3
));
helper
.
setText
(
R
.
id
.
tv_return
,
"退货/报废"
);
// helper.setGone(R.id.rl_receive_order,true);
// helper.setGone(R.id.rl_receive_order,true);
//// {"接单方生产", "接单方采购"};
//// {"接单方生产", "接单方采购"};
// if (!TextUtils.isEmpty(item.getProvideMethod())){
// if (!TextUtils.isEmpty(item.getProvideMethod())){
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java
浏览文件 @
a35c4fa7
...
@@ -40,6 +40,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
...
@@ -40,6 +40,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
helper
.
setText
(
R
.
id
.
tv_unit
,
item
.
getProductUnit
());
helper
.
setText
(
R
.
id
.
tv_unit
,
item
.
getProductUnit
());
helper
.
setText
(
R
.
id
.
tv_from
,
WorkUtils
.
getOrderFrom
(
item
.
getType
()));
helper
.
setText
(
R
.
id
.
tv_from
,
WorkUtils
.
getOrderFrom
(
item
.
getType
()));
helper
.
setText
(
R
.
id
.
tv_num
,
MathUtils
.
converData
(
item
.
getProductCount
(),
3
));
helper
.
setText
(
R
.
id
.
tv_num
,
MathUtils
.
converData
(
item
.
getProductCount
(),
3
));
helper
.
setText
(
R
.
id
.
tv_return
,
"退货/报废"
);
if
(!
TextUtils
.
isEmpty
(
item
.
getAnnex
())){
if
(!
TextUtils
.
isEmpty
(
item
.
getAnnex
())){
helper
.
setText
(
R
.
id
.
tv_annex
,
"附件"
);
helper
.
setText
(
R
.
id
.
tv_annex
,
"附件"
);
// helper.setText(R.id.tv_annex,item.getAnnex().substring(1));
// helper.setText(R.id.tv_annex,item.getAnnex().substring(1));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论