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
fad07a57
提交
fad07a57
authored
7月 20, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.添加坩埚订单不显示分厂和来源
上级
53c5224f
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
22 行增加
和
2 行删除
+22
-2
StoreSaleConfirmActivity.java
...ffice/ui/activity/bat/store/StoreSaleConfirmActivity.java
+5
-1
StoreCarAdapter.java
...in/java/com/wd/workoffice/ui/adapter/StoreCarAdapter.java
+16
-1
item_confirm_pro.xml
app/src/main/res/layout/item_confirm_pro.xml
+1
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleConfirmActivity.java
浏览文件 @
fad07a57
...
...
@@ -165,6 +165,7 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
proList
=
new
ArrayList
<>();
proAdapter
=
new
StoreCarAdapter
(
R
.
layout
.
item_confirm_pro
,
proList
,
1
);
proAdapter
.
bindToRecyclerView
(
rvPro
);
proAdapter
.
setOrderType
(
getIntent
().
getStringExtra
(
"code"
));
proList
.
addAll
(
JSON
.
parseArray
(
getIntent
().
getStringExtra
(
"pro"
),
ProductBean
.
RecordsBean
.
class
));
proAdapter
.
notifyDataSetChanged
();
changeNumAndPrice
();
...
...
@@ -239,8 +240,11 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
JSONObject
data
=
new
JSONObject
();
data
.
put
(
"productId"
,
recordsBean
.
getId
());
data
.
put
(
"type"
,
"PDS"
);
if
(!
TextUtils
.
equals
(
getIntent
().
getStringExtra
(
"code"
),
PermissionType
.
PROCESS_CRUCIBLE
.
getCode
()))
{
data
.
put
(
"innerPrice"
,
MathUtils
.
converData
(
recordsBean
.
getInternalPrice
(),
3
));
}
// data.put("tranFromStockId", recordsBean.getCarPrice());
data
.
put
(
"innerPrice"
,
MathUtils
.
converData
(
recordsBean
.
getInternalPrice
(),
3
));
data
.
put
(
"customerBranchFactoryId"
,
recordsBean
.
getFactoryId
());
//3.分厂客户ID
data
.
put
(
"outerPrice"
,
recordsBean
.
getCarPrice
());
data
.
put
(
"productCount"
,
recordsBean
.
getCarNum
());
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/StoreCarAdapter.java
浏览文件 @
fad07a57
...
...
@@ -13,6 +13,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.bean.ProductBean
;
import
com.wd.workoffice.bean.event.ModifyCarEvent
;
import
com.wd.workoffice.bean.workEnum.PermissionType
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.widget.AddAndReduceView
;
...
...
@@ -30,6 +31,7 @@ import flexible.xd.android_base.utils.ToastUtil;
public
class
StoreCarAdapter
extends
BaseQuickAdapter
<
ProductBean
.
RecordsBean
,
BaseViewHolder
>
{
int
type
=
0
;
//1 确认订单页面 2 单数量无价格
private
int
curFocusPosition
=
-
1
;
private
String
orderType
;
public
StoreCarAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
...
...
@@ -58,6 +60,11 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
if
(!
TextUtils
.
isEmpty
(
item
.
getUrl
()))
{
helper
.
setText
(
R
.
id
.
tv_upload
,
item
.
getUrl
().
substring
(
1
));
}
if
(
TextUtils
.
equals
(
orderType
,
PermissionType
.
PROCESS_CRUCIBLE
.
getCode
()))
{
helper
.
setGone
(
R
.
id
.
rl_pro_from
,
false
);
helper
.
setGone
(
R
.
id
.
rl_choose_dep
,
false
);
}
}
else
if
(
type
==
2
)
{
helper
.
setGone
(
R
.
id
.
tv_desc
,
item
.
getFlag
()
==
1
);
helper
.
addOnClickListener
(
R
.
id
.
tv_delete
);
...
...
@@ -139,9 +146,17 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
public
void
notifyData
()
{
notifyDataSetChanged
();
if
(
curFocusPosition
!=
-
1
)
{
AddAndReduceView
num
=
(
AddAndReduceView
)
getViewByPosition
(
curFocusPosition
,
R
.
id
.
ar_num
);
AddAndReduceView
num
=
(
AddAndReduceView
)
getViewByPosition
(
curFocusPosition
,
R
.
id
.
ar_num
);
num
.
setNumFouce
();
}
}
public
String
getOrderType
()
{
return
orderType
;
}
public
void
setOrderType
(
String
orderType
)
{
this
.
orderType
=
orderType
;
}
}
app/src/main/res/layout/item_confirm_pro.xml
浏览文件 @
fad07a57
...
...
@@ -160,6 +160,7 @@
</LinearLayout>
<RelativeLayout
android:id=
"@+id/rl_pro_from"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"5mm"
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论