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
8ba6672f
提交
8ba6672f
authored
3月 27, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.仓库 订单详情
2.//TODO erp用户激活,忘记密码测试,产品下单还差附件,bat,mes,消息,我的,刷新token
上级
5e2028ff
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
361 行增加
和
0 行删除
+361
-0
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+8
-0
OrderBean.java
app/src/main/java/com/wd/workoffice/bean/OrderBean.java
+0
-0
ApiService.java
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
+8
-0
WorkWarehouseOrderDetailActivity.java
...i/activity/bat/work/WorkWarehouseOrderDetailActivity.java
+118
-0
WorkWarehouseOrderDetailAdapter.java
...orkoffice/ui/adapter/WorkWarehouseOrderDetailAdapter.java
+39
-0
WorkWarehouseOrderStockAdapter.java
...workoffice/ui/adapter/WorkWarehouseOrderStockAdapter.java
+33
-0
activity_work_warehouse_order_detail.xml
.../main/res/layout/activity_work_warehouse_order_detail.xml
+0
-0
item_warehoust_order.xml
app/src/main/res/layout/item_warehoust_order.xml
+80
-0
item_warehoust_order_stock.xml
app/src/main/res/layout/item_warehoust_order_stock.xml
+75
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
8ba6672f
...
...
@@ -528,6 +528,14 @@
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.bat.work.WorkWarehouseOrderDetailActivity"
android:configChanges=
"keyboardHidden|orientation"
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/OrderBean.java
浏览文件 @
8ba6672f
差异被折叠。
点击展开。
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @
8ba6672f
...
...
@@ -478,4 +478,12 @@ public interface ApiService {
@GET
(
"/stockQuantityDetailFlow/page/list"
)
Observable
<
BaseBean
>
stockDetailFlow
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
* 一个订单的详情[从订单列表进入]
*
* @return
*/
@GET
(
" /stockQuantity/app/oneOfOrder/{orderId}"
)
Observable
<
BaseBean
>
stockDetailFlow
(
@Path
(
"orderId"
)
String
id
,
@Path
(
"orderType"
)
String
orderType
);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseOrderDetailActivity.java
0 → 100644
浏览文件 @
8ba6672f
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
work
;
import
android.widget.TextView
;
import
com.alibaba.fastjson.JSON
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.app.BaseBean
;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.bean.OrderBean
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.WorkWarehouseOrderDetailAdapter
;
import
java.util.ArrayList
;
import
java.util.List
;
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
WorkWarehouseOrderDetailActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
tv_name
)
TextView
tvName
;
@BindView
(
R
.
id
.
tv_order_type
)
TextView
tvOrderType
;
@BindView
(
R
.
id
.
tv_order_dep
)
TextView
tvOrderDep
;
@BindView
(
R
.
id
.
tv_receive_order_dep
)
TextView
tvReceiveOrderDep
;
@BindView
(
R
.
id
.
tv_place_name
)
TextView
tvPlaceName
;
@BindView
(
R
.
id
.
tv_receive_person
)
TextView
tvReceivePerson
;
@BindView
(
R
.
id
.
tv_client
)
TextView
tvClient
;
@BindView
(
R
.
id
.
tv_process
)
TextView
tvProcess
;
@BindView
(
R
.
id
.
tv_time
)
TextView
tvTime
;
@BindView
(
R
.
id
.
tv_price
)
TextView
tvPrice
;
@BindView
(
R
.
id
.
rv_data
)
RecyclerView
rvData
;
private
OrderBean
dataBean
;
private
List
<
OrderBean
.
OrderItemsBean
>
dataList
;
private
WorkWarehouseOrderDetailAdapter
workWarehouseOrderDetailAdapter
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
dataList
=
new
ArrayList
<>();
workWarehouseOrderDetailAdapter
=
new
WorkWarehouseOrderDetailAdapter
(
R
.
layout
.
item_warehoust_order
,
dataList
);
workWarehouseOrderDetailAdapter
.
bindToRecyclerView
(
rvData
);
getData
();
}
private
void
getData
()
{
RtfUtils
.
getRtf
().
stockDetailFlow
(
getIntent
().
getStringExtra
(
"id"
),
getIntent
().
getStringExtra
(
"type"
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
BaseBean
>()
{
@Override
public
void
doOnSubscribe
(
Disposable
d
)
{
}
@Override
public
void
onFail
(
String
errorMsg
)
{
hideLoading
();
toast
(
errorMsg
);
}
@Override
public
void
onSuccess
(
BaseBean
data
)
{
hideLoading
();
if
(
data
.
getCode
()
!=
0
)
{
toast
(
data
.
getMessage
());
return
;
}
dataBean
=
JSON
.
parseObject
(
data
.
getData
().
toString
(),
OrderBean
.
class
);
tvName
.
setText
(
dataBean
.
getId
());
tvProcess
.
setText
(
dataBean
.
getSubProcessName
());
tvClient
.
setText
(
dataBean
.
getCustomerName
());
tvOrderDep
.
setText
(
dataBean
.
getLaunchDeptName
());
tvOrderType
.
setText
(
dataBean
.
getOrderType
());
tvPlaceName
.
setText
(
dataBean
.
getLaunchUserName
());
tvPrice
.
setText
(
String
.
valueOf
(
dataBean
.
getLaunchOrderAmount
()));
tvReceiveOrderDep
.
setText
(
dataBean
.
getReceiveDeptName
());
tvReceivePerson
.
setText
(
dataBean
.
getReceiveUserName
());
tvTime
.
setText
(
dataBean
.
getCreatedTime
());
dataList
.
addAll
(
dataBean
.
getOrderItems
());
workWarehouseOrderDetailAdapter
.
notifyDataSetChanged
();
}
});
}
@Override
protected
void
initEvent
()
{
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_work_warehouse_order_detail
;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkWarehouseOrderDetailAdapter.java
0 → 100644
浏览文件 @
8ba6672f
package
com
.
wd
.
workoffice
.
ui
.
adapter
;
import
android.view.View
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.bean.OrderBean
;
import
java.util.List
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkWarehouseOrderDetailAdapter
extends
BaseQuickAdapter
<
OrderBean
.
OrderItemsBean
,
BaseViewHolder
>
{
public
WorkWarehouseOrderDetailAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
OrderBean
.
OrderItemsBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getProductName
());
helper
.
setText
(
R
.
id
.
tv_code
,
item
.
getProductSoleCode
());
helper
.
setText
(
R
.
id
.
tv_img_code
,
item
.
getProductSimpleCode
());
helper
.
setText
(
R
.
id
.
tv_price
,
String
.
valueOf
(
item
.
getOuterPrice
()));
RecyclerView
rvData
=
helper
.
getView
(
R
.
id
.
rv_data
);
rvData
.
setLayoutManager
(
new
LinearLayoutManager
(
helper
.
itemView
.
getContext
(),
RecyclerView
.
VERTICAL
,
false
));
WorkWarehouseOrderStockAdapter
workWarehouseOrderStockAdapter
=
new
WorkWarehouseOrderStockAdapter
(
R
.
layout
.
item_warehoust_order_stock
,
item
.
getStockQuantityDetailMaps
());
workWarehouseOrderStockAdapter
.
bindToRecyclerView
(
rvData
);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkWarehouseOrderStockAdapter.java
0 → 100644
浏览文件 @
8ba6672f
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.OrderBean
;
import
com.wd.workoffice.bean.StockBean
;
import
com.wd.workoffice.util.MathUtils
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
WorkWarehouseOrderStockAdapter
extends
BaseQuickAdapter
<
OrderBean
.
OrderItemsBean
.
StockQuantityDetailMapsBean
,
BaseViewHolder
>
{
public
WorkWarehouseOrderStockAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
OrderBean
.
OrderItemsBean
.
StockQuantityDetailMapsBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getStockName
());
helper
.
setText
(
R
.
id
.
tv_type
,
item
.
getStockName
());
helper
.
setText
(
R
.
id
.
tv_num
,
MathUtils
.
converData
(
item
.
getQuantity
(),
3
));
helper
.
setText
(
R
.
id
.
tv_out_num
,
MathUtils
.
converData
(
item
.
getApplyOut
(),
3
));
}
}
app/src/main/res/layout/activity_work_warehouse_order_detail.xml
浏览文件 @
8ba6672f
差异被折叠。
点击展开。
app/src/main/res/layout/item_warehoust_order.xml
0 → 100644
浏览文件 @
8ba6672f
<?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_marginTop=
"10mm"
android:background=
"@color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"保护渣"
android:textColor=
"@color/black"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"品号:"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"销售订单"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_img_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"10mm"
android:text=
"订单号:"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"销售订单"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right"
android:gravity=
"right"
android:text=
"70"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</LinearLayout>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"5mm"
android:layout_marginTop=
"10mm"
android:text=
"库存信息"
android:textColor=
"@color/flexible_text_gray"
/>
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rv_data"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"5mm"
android:layout_marginTop=
"5mm"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_warehoust_order_stock.xml
0 → 100644
浏览文件 @
8ba6672f
<?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_marginTop=
"10mm"
android:background=
"@color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"#FCFCFD"
android:orientation=
"vertical"
android:paddingVertical=
"10mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"销售内库"
android:textColor=
"@color/black"
android:textSize=
"15sp"
/>
<TextView
android:id=
"@+id/tv_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:text=
"王紫逸"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:paddingHorizontal=
"10mm"
>
<TextView
android:id=
"@+id/tv_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:text=
"下单时间"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
<TextView
android:id=
"@+id/tv_out_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:text=
"销售内库"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论