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
8e6d932d
提交
8e6d932d
authored
4月 11, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.订单详情
2.//TODO erp用户激活测试,忘记/重置密码测试,坩埚下单页面,组装下单,产品下单还差附件测试,mes,消息,刷新token
上级
f8ec7869
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
632 行增加
和
9 行删除
+632
-9
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+10
-2
OrderDetail.java
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
+0
-0
ApiService.java
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
+22
-6
SaleOrderDetailActivity.java
...koffice/ui/activity/bat/sale/SaleOrderDetailActivity.java
+183
-0
OrderDetailProductAdapter.java
...m/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
+37
-0
OrderProcessAdapter.java
...ava/com/wd/workoffice/ui/adapter/OrderProcessAdapter.java
+52
-0
SaleSaleFragment.java
...c/main/java/com/wd/workoffice/ui/fg/SaleSaleFragment.java
+10
-1
WorkUtils.java
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
+16
-0
shape_order_circle.xml
app/src/main/res/drawable/shape_order_circle.xml
+6
-0
activity_sale_order.xml
app/src/main/res/layout/activity_sale_order.xml
+0
-0
item_order_process.xml
app/src/main/res/layout/item_order_process.xml
+69
-0
item_order_product.xml
app/src/main/res/layout/item_order_product.xml
+226
-0
order_detail_bell.png
app/src/main/res/mipmap-xhdpi/order_detail_bell.png
+0
-0
order_process.png
app/src/main/res/mipmap-xhdpi/order_process.png
+0
-0
colors.xml
app/src/main/res/values/colors.xml
+1
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
8e6d932d
...
@@ -849,9 +849,17 @@
...
@@ -849,9 +849,17 @@
android:theme=
"@style/Work.Base"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
android:windowSoftInputMode=
"adjustPan"
/>
<activity
<activity
android:name=
".ui.activity.bat.work.WorkContactsLiveStockActivity"
android:name=
".ui.activity.bat.work.WorkContactsLiveStockActivity"
android:configChanges=
"keyboardHidden|orientation"
android:label=
"现场库"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.bat.sale.SaleOrderDetailActivity"
android:configChanges=
"keyboardHidden|orientation"
android:configChanges=
"keyboardHidden|orientation"
android:label=
"
现场库
"
android:label=
"
订单详情
"
android:launchMode=
"singleTop"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:theme=
"@style/Work.Base"
...
...
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
0 → 100644
浏览文件 @
8e6d932d
差异被折叠。
点击展开。
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @
8e6d932d
...
@@ -302,6 +302,7 @@ public interface ApiService {
...
@@ -302,6 +302,7 @@ public interface ApiService {
*/
*/
@GET
(
"/crucibleOrder/current-user/page/list"
)
@GET
(
"/crucibleOrder/current-user/page/list"
)
Observable
<
BaseBean
>
getCucibleOrder
(
@QueryMap
Map
<
String
,
Object
>
param
);
Observable
<
BaseBean
>
getCucibleOrder
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
/**
* 订单
* 订单
* <p>
* <p>
...
@@ -455,9 +456,10 @@ public interface ApiService {
...
@@ -455,9 +456,10 @@ public interface ApiService {
*
*
* <p>
* <p>
* orderItems
* orderItems
*type 类别 (暂时使用product)
*
type 类别 (暂时使用product)
* product(产品)
* product(产品)
* service(服务)
* service(服务)
*
* @return
* @return
*/
*/
@POST
(
"/insideOrder/start"
)
@POST
(
"/insideOrder/start"
)
...
@@ -472,17 +474,19 @@ public interface ApiService {
...
@@ -472,17 +474,19 @@ public interface ApiService {
* launchOrderAmount下单总金额
* launchOrderAmount下单总金额
* inStockId 入库仓库id
* inStockId 入库仓库id
* expandInfo 第二层:订单扩展信息
* expandInfo 第二层:订单扩展信息
*customerId
*
customerId
* supplierId
* supplierId
* subProcessId
* subProcessId
* 备注: 第二层:订单扩展信息
* 备注: 第二层:订单扩展信息
*
*
* <p>
* <p>
* orderItems
* orderItems
*
* @return
* @return
*/
*/
@POST
(
"/purchaseOrder/start"
)
@POST
(
"/purchaseOrder/start"
)
Observable
<
BaseBean
>
submitPurchaseOrder
(
@Body
RequestBody
requestBody
);
Observable
<
BaseBean
>
submitPurchaseOrder
(
@Body
RequestBody
requestBody
);
/**
/**
* 获取客户分厂
* 获取客户分厂
*
*
...
@@ -1013,6 +1017,7 @@ public interface ApiService {
...
@@ -1013,6 +1017,7 @@ public interface ApiService {
*/
*/
@GET
(
"/finance-dept-ar-ap-part-detail/app/page/list"
)
@GET
(
"/finance-dept-ar-ap-part-detail/app/page/list"
)
Observable
<
BaseBean
>
contactsMoney
(
@QueryMap
Map
<
String
,
Object
>
param
);
Observable
<
BaseBean
>
contactsMoney
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
/**
* 物流账单
* 物流账单
* transitPartId
* transitPartId
...
@@ -1024,6 +1029,7 @@ public interface ApiService {
...
@@ -1024,6 +1029,7 @@ public interface ApiService {
*/
*/
@GET
(
"/finance-logistics/page/list"
)
@GET
(
"/finance-logistics/page/list"
)
Observable
<
BaseBean
>
contactsMoneyLogistic
(
@QueryMap
Map
<
String
,
Object
>
param
);
Observable
<
BaseBean
>
contactsMoneyLogistic
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
/**
* 物流账单
* 物流账单
* transitPartId
* transitPartId
...
@@ -1043,6 +1049,7 @@ public interface ApiService {
...
@@ -1043,6 +1049,7 @@ public interface ApiService {
*/
*/
@GET
(
"/finance-dept-ar-ap-part/flow/page/list"
)
@GET
(
"/finance-dept-ar-ap-part/flow/page/list"
)
Observable
<
BaseBean
>
contactsMoneyFlow
(
@QueryMap
Map
<
String
,
Object
>
param
);
Observable
<
BaseBean
>
contactsMoneyFlow
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
/**
* 部门应收应付账款流水
* 部门应收应付账款流水
*
*
...
@@ -1066,7 +1073,8 @@ public interface ApiService {
...
@@ -1066,7 +1073,8 @@ public interface ApiService {
* @return
* @return
*/
*/
@GET
(
"/finance-tax/page/list"
)
@GET
(
"/finance-tax/page/list"
)
Observable
<
BaseBean
>
storeFinancial
(
@QueryMap
Map
<
String
,
Object
>
param
);
Observable
<
BaseBean
>
storeFinancial
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
/**
* 修改个人信息,头像和用户名(app)
* 修改个人信息,头像和用户名(app)
*
*
...
@@ -1082,7 +1090,7 @@ public interface ApiService {
...
@@ -1082,7 +1090,7 @@ public interface ApiService {
* @return
* @return
*/
*/
@GET
(
"/stockQuantity/return-stock/page/list"
)
@GET
(
"/stockQuantity/return-stock/page/list"
)
Observable
<
BaseBean
>
tradingPro
(
@QueryMap
Map
<
String
,
Object
>
param
);
Observable
<
BaseBean
>
tradingPro
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
/**
* 获取产品去向(搜索置换产品)
* 获取产品去向(搜索置换产品)
...
@@ -1098,7 +1106,7 @@ public interface ApiService {
...
@@ -1098,7 +1106,7 @@ public interface ApiService {
* @return
* @return
*/
*/
@GET
(
"/package-order/app/page/list"
)
@GET
(
"/package-order/app/page/list"
)
Observable
<
BaseBean
>
productList
(
@QueryMap
Map
<
String
,
Object
>
param
);
Observable
<
BaseBean
>
productList
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
/**
* 获取产品去向(搜索置换产品)
* 获取产品去向(搜索置换产品)
...
@@ -1106,6 +1114,14 @@ public interface ApiService {
...
@@ -1106,6 +1114,14 @@ public interface ApiService {
* @return
* @return
*/
*/
@GET
(
"/packageApply/app/page/list"
)
@GET
(
"/packageApply/app/page/list"
)
Observable
<
BaseBean
>
productApplyList
(
@QueryMap
Map
<
String
,
Object
>
param
);
Observable
<
BaseBean
>
productApplyList
(
@QueryMap
Map
<
String
,
Object
>
param
);
/**
* 获取产品去向(搜索置换产品)
*
* @return
*/
@GET
(
"/saleOrder/oneInfo/{orderId}"
)
Observable
<
BaseBean
>
saleOrderDetail
(
@Path
(
"orderId"
)
String
orderId
,
@Query
(
"type"
)
String
type
);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleOrderDetailActivity.java
0 → 100644
浏览文件 @
8e6d932d
package
com
.
wd
.
workoffice
.
ui
.
activity
.
bat
.
sale
;
import
android.media.tv.TvContentRating
;
import
android.os.Bundle
;
import
android.view.View
;
import
android.widget.LinearLayout
;
import
android.widget.RelativeLayout
;
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.AccountBean
;
import
com.wd.workoffice.bean.OrderDetail
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.adapter.OrderDetailProductAdapter
;
import
com.wd.workoffice.ui.adapter.OrderProcessAdapter
;
import
com.wd.workoffice.ui.adapter.SaleSupplierAdapter
;
import
com.wd.workoffice.util.MathUtils
;
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
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
SaleOrderDetailActivity
extends
WorkToolBarActivity
{
@BindView
(
R
.
id
.
tv_status
)
TextView
tvStatus
;
@BindView
(
R
.
id
.
tv_desc
)
TextView
tvDesc
;
@BindView
(
R
.
id
.
ll_top
)
RelativeLayout
llTop
;
@BindView
(
R
.
id
.
tv_refuse
)
TextView
tvRefuse
;
@BindView
(
R
.
id
.
tv_agree
)
TextView
tvAgree
;
@BindView
(
R
.
id
.
ll_bottom
)
LinearLayout
llBottom
;
@BindView
(
R
.
id
.
rv_process
)
RecyclerView
rvProcess
;
@BindView
(
R
.
id
.
tv_name
)
TextView
tvName
;
@BindView
(
R
.
id
.
tv_dep
)
TextView
tvDep
;
@BindView
(
R
.
id
.
tv_place_name
)
TextView
tvPlaceName
;
@BindView
(
R
.
id
.
tv_company
)
TextView
tvCompany
;
@BindView
(
R
.
id
.
tv_order_no
)
TextView
tvOrderNo
;
@BindView
(
R
.
id
.
tv_time
)
TextView
tvTime
;
@BindView
(
R
.
id
.
tv_send_time
)
TextView
tvSendTime
;
@BindView
(
R
.
id
.
tv_order_price
)
TextView
tvOrderPrice
;
@BindView
(
R
.
id
.
rv_pro
)
RecyclerView
rvPro
;
@BindView
(
R
.
id
.
tv_claim1
)
TextView
tvClaim1
;
@BindView
(
R
.
id
.
tv_claim2
)
TextView
tvClaim2
;
@BindView
(
R
.
id
.
tv_claim3
)
TextView
tvClaim3
;
@BindView
(
R
.
id
.
tv_claim4
)
TextView
tvClaim4
;
@BindView
(
R
.
id
.
tv_claim5
)
TextView
tvClaim5
;
@BindView
(
R
.
id
.
tv_claim6
)
TextView
tvClaim6
;
private
OrderDetail
dataBean
;
private
List
<
OrderDetail
.
OrderFlowsBean
>
flowList
;
private
OrderProcessAdapter
flowAdapter
;
private
OrderDetailProductAdapter
proAdapter
;
private
List
<
OrderDetail
.
OrderItemsBean
>
proList
;
@Override
protected
void
initView
()
{
ButterKnife
.
bind
(
this
);
rvPro
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
rvProcess
.
setLayoutManager
(
new
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
));
}
@Override
protected
void
initData
()
{
getData
();
flowList
=
new
ArrayList
<>();
flowAdapter
=
new
OrderProcessAdapter
(
R
.
layout
.
item_order_process
,
flowList
);
flowAdapter
.
bindToRecyclerView
(
rvProcess
);
flowAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_order
,
rvProcess
);
proList
=
new
ArrayList
<>();
proAdapter
=
new
OrderDetailProductAdapter
(
R
.
layout
.
item_order_product
,
proList
);
proAdapter
.
bindToRecyclerView
(
rvPro
);
proAdapter
.
setEmptyView
(
R
.
layout
.
view_empty_order
,
rvProcess
);
}
private
void
getData
()
{
RtfUtils
.
getRtf
().
saleOrderDetail
(
getIntent
().
getStringExtra
(
"id"
),
"3"
).
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
(),
OrderDetail
.
class
);
flowList
.
addAll
(
dataBean
.
getOrderFlows
());
flowAdapter
.
notifyDataSetChanged
();
proList
.
addAll
(
dataBean
.
getOrderItems
());
proAdapter
.
notifyDataSetChanged
();
tvName
.
setText
(
dataBean
.
getCustomerName
());
tvDep
.
setText
(
dataBean
.
getReceiveDeptName
());
tvStatus
.
setText
(
dataBean
.
getStatusName
());
tvPlaceName
.
setText
(
dataBean
.
getLaunchUserName
());
tvCompany
.
setText
(
dataBean
.
getLaunchDeptName
());
tvOrderNo
.
setText
(
dataBean
.
getId
());
tvTime
.
setText
(
dataBean
.
getCreatedTime
());
tvSendTime
.
setText
(
dataBean
.
getRequireTime
());
tvDesc
.
setText
(
dataBean
.
getAttrName
());
tvOrderPrice
.
setText
(
String
.
valueOf
(
dataBean
.
getLaunchOrderAmount
()));
OrderDetail
.
ExpandInfoBean
expandInfo
=
dataBean
.
getExpandInfo
();
tvClaim1
.
setText
(
expandInfo
.
getDemond4
());
tvClaim2
.
setText
(
expandInfo
.
getDemond5
());
tvClaim3
.
setText
(
expandInfo
.
getDemond1
());
tvClaim4
.
setText
(
expandInfo
.
getDemond2
());
tvClaim5
.
setText
(
expandInfo
.
getDemond3
());
tvClaim6
.
setText
(
expandInfo
.
getComments
());
tvDesc
.
setText
(
dataBean
.
getAttrName
());
tvStatus
.
setText
(
dataBean
.
getStatusName
());
}
});
}
@Override
protected
void
initEvent
()
{
}
@Override
protected
int
layoutId
()
{
return
R
.
layout
.
activity_sale_order
;
}
@OnClick
({
R
.
id
.
tv_refuse
,
R
.
id
.
tv_agree
})
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
tv_refuse
:
break
;
case
R
.
id
.
tv_agree
:
break
;
}
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
0 → 100644
浏览文件 @
8e6d932d
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.OrderDetail
;
import
com.wd.workoffice.util.WorkUtils
;
import
java.util.List
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
OrderDetailProductAdapter
extends
BaseQuickAdapter
<
OrderDetail
.
OrderItemsBean
,
BaseViewHolder
>
{
public
OrderDetailProductAdapter
(
int
layoutResId
,
List
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
OrderDetail
.
OrderItemsBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getProductName
());
helper
.
setText
(
R
.
id
.
tv_card
,
item
.
getProductSoleCode
());
helper
.
setText
(
R
.
id
.
tv_card_name
,
item
.
getProductSimpleCode
());
helper
.
setText
(
R
.
id
.
tv_spec
,
item
.
getProductSpec
());
helper
.
setText
(
R
.
id
.
tv_price
,
"¥"
.
concat
(
String
.
valueOf
(
item
.
getInnerPrice
())));
helper
.
setText
(
R
.
id
.
tv_all_price
,
"¥"
.
concat
(
String
.
valueOf
(
item
.
getInnerPrice
())));
helper
.
setText
(
R
.
id
.
tv_unit
,
item
.
getProductUnit
());
helper
.
setText
(
R
.
id
.
tv_from
,
WorkUtils
.
getOrderFrom
(
item
.
getType
()));
helper
.
setText
(
R
.
id
.
tv_num
,
String
.
valueOf
(
item
.
getProductCount
()));
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/OrderProcessAdapter.java
0 → 100644
浏览文件 @
8e6d932d
package
com
.
wd
.
workoffice
.
ui
.
adapter
;
import
android.graphics.Color
;
import
android.widget.CheckBox
;
import
android.widget.CompoundButton
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseViewHolder
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.bean.LogisticDetailBean
;
import
com.wd.workoffice.bean.OrderDetail
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
androidx.annotation.Nullable
;
/**
* Created by flexible on 2018/8/13.
*/
public
class
OrderProcessAdapter
extends
BaseQuickAdapter
<
OrderDetail
.
OrderFlowsBean
,
BaseViewHolder
>
{
public
OrderProcessAdapter
(
int
layoutResId
,
@Nullable
List
<
OrderDetail
.
OrderFlowsBean
>
data
)
{
super
(
layoutResId
,
data
);
}
@Override
protected
void
convert
(
BaseViewHolder
helper
,
OrderDetail
.
OrderFlowsBean
item
)
{
if
(
helper
.
getAdapterPosition
()
==
0
)
{
helper
.
setTextColor
(
R
.
id
.
tv_status
,
Color
.
parseColor
(
"#ff359486"
));
helper
.
setTextColor
(
R
.
id
.
tv_time
,
Color
.
parseColor
(
"#ff359486"
));
helper
.
setTextColor
(
R
.
id
.
tv_remark
,
Color
.
parseColor
(
"#ff359486"
));
helper
.
setGone
(
R
.
id
.
iv_last
,
true
);
helper
.
setGone
(
R
.
id
.
iv_simple
,
false
);
}
else
{
helper
.
setTextColor
(
R
.
id
.
tv_status
,
helper
.
getConvertView
().
getResources
().
getColor
(
R
.
color
.
flexible_text_gray
));
helper
.
setTextColor
(
R
.
id
.
tv_time
,
helper
.
getConvertView
().
getResources
().
getColor
(
R
.
color
.
flexible_text_gray
));
helper
.
setTextColor
(
R
.
id
.
tv_remark
,
helper
.
getConvertView
().
getResources
().
getColor
(
R
.
color
.
flexible_text_gray
));
helper
.
setGone
(
R
.
id
.
iv_last
,
false
);
helper
.
setGone
(
R
.
id
.
iv_simple
,
true
);
}
helper
.
setText
(
R
.
id
.
tv_status
,
item
.
getEventCodeName
());
helper
.
setText
(
R
.
id
.
tv_time
,
item
.
getCreatedTime
());
helper
.
setText
(
R
.
id
.
tv_remark
,
"备注:"
+
item
.
getOptComment
());
}
}
app/src/main/java/com/wd/workoffice/ui/fg/SaleSaleFragment.java
浏览文件 @
8e6d932d
package
com
.
wd
.
workoffice
.
ui
.
fg
;
package
com
.
wd
.
workoffice
.
ui
.
fg
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.view.View
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.R
;
...
@@ -8,6 +9,7 @@ import com.wd.workoffice.app.WorkBaseFg;
...
@@ -8,6 +9,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import
com.wd.workoffice.bean.OrderBean
;
import
com.wd.workoffice.bean.OrderBean
;
import
com.wd.workoffice.contract.SaleSaleContract
;
import
com.wd.workoffice.contract.SaleSaleContract
;
import
com.wd.workoffice.presenter.SaleSalePresenter
;
import
com.wd.workoffice.presenter.SaleSalePresenter
;
import
com.wd.workoffice.ui.activity.bat.sale.SaleOrderDetailActivity
;
import
com.wd.workoffice.ui.adapter.SaleSaleAdapter
;
import
com.wd.workoffice.ui.adapter.SaleSaleAdapter
;
import
com.wd.workoffice.util.WorkUtils
;
import
com.wd.workoffice.util.WorkUtils
;
...
@@ -38,6 +40,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
...
@@ -38,6 +40,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
private
SaleSaleAdapter
orderAdapter
;
private
SaleSaleAdapter
orderAdapter
;
private
int
page
=
1
;
private
int
page
=
1
;
private
String
identity
;
private
String
identity
;
@Override
@Override
protected
void
initView
()
{
protected
void
initView
()
{
ButterKnife
.
bind
(
this
,
getContentView
());
ButterKnife
.
bind
(
this
,
getContentView
());
...
@@ -56,7 +59,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
...
@@ -56,7 +59,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
param
=
WorkUtils
.
pageKey
();
param
=
WorkUtils
.
pageKey
();
param
.
put
(
"orderStatus"
,
state
);
param
.
put
(
"orderStatus"
,
state
);
param
.
put
(
"current"
,
page
);
param
.
put
(
"current"
,
page
);
param
.
put
(
"identity"
,
identity
);
param
.
put
(
"identity"
,
identity
);
page
=
1
;
page
=
1
;
param
.
put
(
"current"
,
page
);
param
.
put
(
"current"
,
page
);
saleSalePresenter
.
getOrder
(
param
);
saleSalePresenter
.
getOrder
(
param
);
...
@@ -72,6 +75,12 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
...
@@ -72,6 +75,12 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
saleSalePresenter
.
getOrder
(
param
);
saleSalePresenter
.
getOrder
(
param
);
}
}
},
rvData
);
},
rvData
);
orderAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
SaleOrderDetailActivity
.
class
,
"id"
,
orderList
.
get
(
position
).
getId
());
}
});
}
}
@Override
@Override
...
...
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @
8e6d932d
...
@@ -152,6 +152,22 @@ public class WorkUtils {
...
@@ -152,6 +152,22 @@ public class WorkUtils {
}
}
return
name
;
return
name
;
}
}
/**
* name:订单来源
*:PDS-拆分生产订单 TRS-库存已有转单
* @param code
* @return
*/
public
static
String
getOrderFrom
(
String
code
)
{
String
name
=
""
;
if
(
TextUtils
.
equals
(
code
,
"PDS"
)){
name
=
"拆分生产订单"
;
}
else
if
(
TextUtils
.
equals
(
code
,
"TRS"
)){
name
=
"库存已有转单"
;
}
return
name
;
}
/**
/**
* 财务状态
* 财务状态
* 0未审核 1已通过 2不通过
* 0未审核 1已通过 2不通过
...
...
app/src/main/res/drawable/shape_order_circle.xml
0 → 100644
浏览文件 @
8e6d932d
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<solid
android:color=
"#ff5c7589"
/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_sale_order.xml
0 → 100644
浏览文件 @
8e6d932d
差异被折叠。
点击展开。
app/src/main/res/layout/item_order_process.xml
0 → 100644
浏览文件 @
8e6d932d
<?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:orientation=
"horizontal"
>
<LinearLayout
android:layout_width=
"30mm"
android:layout_height=
"match_parent"
android:gravity=
"center_horizontal"
android:orientation=
"vertical"
>
<ImageView
android:id=
"@+id/iv_last"
android:layout_width=
"11mm"
android:layout_height=
"11mm"
android:src=
"@mipmap/order_process"
/>
<View
android:id=
"@+id/iv_simple"
style=
"@style/dividerY"
android:layout_width=
"5mm"
android:layout_height=
"5mm"
android:background=
"@drawable/shape_circle"
/>
<View
style=
"@style/dividerY"
android:layout_width=
"1mm"
android:layout_height=
"match_parent"
android:background=
"@color/blue_bg"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"wrap_content"
android:orientation=
"vertical"
android:paddingVertical=
"5mm"
android:layout_marginLeft=
"10mm"
android:layout_height=
"wrap_content"
>
<TextView
android:id=
"@+id/tv_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"销售部门管理员通过审核"
android:textColor=
"#ff359486"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_remark"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:text=
"备注"
android:textColor=
"#ff359486"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"3mm"
android:text=
"销售部门管理员通过审核"
android:textColor=
"#ff359486"
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_order_product.xml
0 → 100644
浏览文件 @
8e6d932d
<?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:background=
"@color/white"
android:orientation=
"vertical"
android:paddingHorizontal=
"20mm"
android:paddingVertical=
"10mm"
>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"图号TH82739857"
android:textColor=
"@color/black"
android:textSize=
"16sp"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"14mm"
android:background=
"#FCFCFD"
android:orientation=
"vertical"
android:padding=
"10mm"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:text=
"品号"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_card"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:text=
"品号"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
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:layout_alignParentLeft=
"true"
android:text=
"品名"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_card_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:text=
"品号"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
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:layout_alignParentLeft=
"true"
android:text=
"规格"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_spec"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:text=
"品号"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
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:layout_alignParentLeft=
"true"
android:text=
"单价"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:text=
"品号"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
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:layout_alignParentLeft=
"true"
android:text=
"单位"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_unit"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:text=
"品号"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
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:layout_alignParentLeft=
"true"
android:text=
"数量"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
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:layout_alignParentLeft=
"true"
android:text=
"产品来源"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_from"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:text=
"品号"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
<RelativeLayout
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:layout_alignParentLeft=
"true"
android:text=
"附件"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tv_annex"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"12sp"
/>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right"
android:layout_marginTop=
"4mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"小计:"
android:textColor=
"@color/flexible_text_gray"
/>
<TextView
android:id=
"@+id/tv_all_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"0"
android:textColor=
"@color/flexible_text_gray"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/mipmap-xhdpi/order_detail_bell.png
0 → 100644
浏览文件 @
8e6d932d
1.5 KB
app/src/main/res/mipmap-xhdpi/order_process.png
0 → 100644
浏览文件 @
8e6d932d
636 Bytes
app/src/main/res/values/colors.xml
浏览文件 @
8e6d932d
...
@@ -13,5 +13,6 @@
...
@@ -13,5 +13,6 @@
<color
name=
"red_btn_bg"
>
#C45D5D
</color>
<color
name=
"red_btn_bg"
>
#C45D5D
</color>
<color
name=
"orange"
>
#FF5722
</color>
<color
name=
"orange"
>
#FF5722
</color>
<color
name=
"flexible_text_color"
>
#333333
</color>
<color
name=
"flexible_text_color"
>
#333333
</color>
<color
name=
"blue_bg"
>
#5C768A
</color>
</resources>
</resources>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论