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
609380ca
提交
609380ca
authored
9月 30, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.运费单详情
上级
b5cc59c1
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
317 行增加
和
2 行删除
+317
-2
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+8
-0
FareDetailActivity.java
...d/workoffice/ui/activity/bat/work/FareDetailActivity.java
+112
-0
FareListActivity.java
.../wd/workoffice/ui/activity/bat/work/FareListActivity.java
+7
-0
FareSearchActivity.java
...d/workoffice/ui/activity/bat/work/FareSearchActivity.java
+6
-0
activity_fare_confirm.xml
app/src/main/res/layout/activity_fare_confirm.xml
+2
-2
activity_fare_detail.xml
app/src/main/res/layout/activity_fare_detail.xml
+182
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
609380ca
...
@@ -2505,6 +2505,14 @@
...
@@ -2505,6 +2505,14 @@
android:screenOrientation=
"portrait"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.bat.work.FareDetailActivity"
android:configChanges=
"keyboardHidden|orientation"
android:label=
"运费单详情"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
<activity
android:name=
".ui.activity.mes.work.QualityWorkActivity"
android:name=
".ui.activity.mes.work.QualityWorkActivity"
android:configChanges=
"orientation|screenSize|keyboardHidden"
android:configChanges=
"orientation|screenSize|keyboardHidden"
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/FareDetailActivity.java
0 → 100644
浏览文件 @
609380ca
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
work
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.widget.CheckBox
;
import
android.widget.LinearLayout
;
import
android.widget.TextView
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.FareBean
;
import
com.wd.workoffice.bean.FareOrderBean
;
import
com.wd.workoffice.bean.event.FareConfirmEvent
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity
;
import
com.wd.workoffice.ui.adapter.FareOrderAdapter
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
import
org.greenrobot.eventbus.EventBus
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
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
butterknife.OnClick
;
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
FareDetailActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
rv_from
)
RecyclerView
rvData
;
@BindView
(
R
.
id
.
et_logistics_price
)
TextView
etLogisticsPrice
;
@BindView
(
R
.
id
.
ll_logistics_price
)
LinearLayout
llLogisticsPrice
;
@BindView
(
R
.
id
.
et_tax
)
TextView
etTax
;
@BindView
(
R
.
id
.
ll_tax
)
LinearLayout
llTax
;
@BindView
(
R
.
id
.
et_logistics_code
)
TextView
etLogisticsCode
;
@BindView
(
R
.
id
.
ll_logistics_code
)
LinearLayout
llLogisticsCode
;
@BindView
(
R
.
id
.
tv_logistics_company
)
TextView
tvLogisticsCompany
;
@BindView
(
R
.
id
.
rl_set
)
LinearLayout
rlSet
;
private
List
<
FareOrderBean
.
RecordsBean
>
dataList
;
private
FareOrderAdapter
dataAdapter
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
String
data
=
getIntent
().
getStringExtra
(
"data"
);
if
(!
TextUtils
.
isEmpty
(
data
))
{
FareBean
.
RecordsBean
fareBean
=
JSON
.
parseObject
(
data
,
FareBean
.
RecordsBean
.
class
);
etLogisticsPrice
.
setText
(
MathUtils
.
converData
(
fareBean
.
getFareMoney
(),
3
));
etTax
.
setText
(
MathUtils
.
converData
(
fareBean
.
getTax
(),
3
));
etLogisticsCode
.
setText
(
fareBean
.
getTrackingNumber
());
tvLogisticsCompany
.
setText
(
fareBean
.
getTransitPartName
());
dataList
=
new
ArrayList
<>();
if
(
null
!=
fareBean
.
getFareItemList
())
{
for
(
FareBean
.
RecordsBean
.
FareItemListBean
fareItemListBean
:
fareBean
.
getFareItemList
())
{
FareOrderBean
.
RecordsBean
fareOrder
=
new
FareOrderBean
.
RecordsBean
();
fareOrder
.
setUpdatedTime
(
fareItemListBean
.
getCreatedTime
());
fareOrder
.
setTotalWeight
(
fareItemListBean
.
getWeight
());
fareOrder
.
setReceiveDeptName
(
fareItemListBean
.
getLaunchDeptName
());
fareOrder
.
setOrderId
(
fareItemListBean
.
getOrderId
());
dataList
.
add
(
fareOrder
);
}
}
dataAdapter
=
new
FareOrderAdapter
(
R
.
layout
.
item_fare_order
,
dataList
,
1
);
dataAdapter
.
bindToRecyclerView
(
rvData
);
}
}
@Override
protected
void
initEvent
()
{
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_fare_detail
;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/FareListActivity.java
浏览文件 @
609380ca
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.work;
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.work;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
...
@@ -131,6 +132,12 @@ public class FareListActivity extends WorkToolBarActivity {
...
@@ -131,6 +132,12 @@ public class FareListActivity extends WorkToolBarActivity {
getData
();
getData
();
}
}
},
rvData
);
},
rvData
);
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
FareDetailActivity
.
class
,
"data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
}
});
}
}
@Override
@Override
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/FareSearchActivity.java
浏览文件 @
609380ca
...
@@ -143,6 +143,12 @@ public class FareSearchActivity extends WorkBaseActivity {
...
@@ -143,6 +143,12 @@ public class FareSearchActivity extends WorkBaseActivity {
getData
();
getData
();
}
}
},
rvData
);
},
rvData
);
dataAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
FareDetailActivity
.
class
,
"data"
,
JSON
.
toJSONString
(
dataList
.
get
(
position
)));
}
});
}
}
...
...
app/src/main/res/layout/activity_fare_confirm.xml
浏览文件 @
609380ca
...
@@ -136,7 +136,7 @@
...
@@ -136,7 +136,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:layout_alignParentLeft=
"true"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:text=
"税率"
android:text=
"税率
(%)
"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
<EditText
<EditText
...
@@ -148,7 +148,7 @@
...
@@ -148,7 +148,7 @@
android:layout_weight=
"1"
android:layout_weight=
"1"
android:background=
"@null"
android:background=
"@null"
android:gravity=
"right"
android:gravity=
"right"
android:hint=
"
如果为5%,这里应该填写0.05
"
android:hint=
"
请输入税率
"
android:inputType=
"numberDecimal"
android:inputType=
"numberDecimal"
android:padding=
"3mm"
android:padding=
"3mm"
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
...
...
app/src/main/res/layout/activity_fare_detail.xml
0 → 100644
浏览文件 @
609380ca
<?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: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"
>
<View
style=
"@style/ViewX"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingVertical=
"10mm"
>
<View
android:layout_width=
"8mm"
android:layout_height=
"18mm"
android:background=
"@color/red_btn_bg"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"10mm"
android:text=
"组装来源"
android:textSize=
"16sp"
/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_from"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<View
style=
"@style/ViewX"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingVertical=
"10mm"
>
<View
android:layout_width=
"8mm"
android:layout_height=
"18mm"
android:background=
"@color/red_btn_bg"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"10mm"
android:text=
"基本信息"
android:textSize=
"16sp"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_logistics_price"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:layout_centerVertical=
"true"
android:text=
"运费"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/et_logistics_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginLeft=
"10mm"
android:layout_weight=
"1"
android:background=
"@null"
android:gravity=
"right"
android:padding=
"3mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_tax"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:layout_centerVertical=
"true"
android:text=
"税率(%)"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/et_tax"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginLeft=
"10mm"
android:layout_weight=
"1"
android:background=
"@null"
android:gravity=
"right"
android:inputType=
"numberDecimal"
android:padding=
"3mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_logistics_code"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:layout_centerVertical=
"true"
android:text=
"快递单号"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/et_logistics_code"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginLeft=
"10mm"
android:layout_weight=
"1"
android:background=
"@null"
android:gravity=
"right"
android:padding=
"3mm"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/rl_set"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"9mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:layout_centerVertical=
"true"
android:text=
"物流公司"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tv_logistics_company"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"3mm"
android:layout_weight=
"1"
android:gravity=
"right"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论