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
97615e66
提交
97615e66
authored
4月 15, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.搜索跳转
2.//TODO erp用户激活测试,忘记/重置密码测试,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,组装下单,产品下单还差附件测试,mes,刷新token
上级
68f5ce94
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
76 行增加
和
3 行删除
+76
-3
InsideOrderDetailActivity.java
...fice/ui/activity/bat/order/InsideOrderDetailActivity.java
+9
-3
InsideOrderSearchActivity.java
...fice/ui/activity/bat/order/InsideOrderSearchActivity.java
+10
-0
OutOrderSearchActivity.java
...koffice/ui/activity/bat/order/OutOrderSearchActivity.java
+19
-0
SaleOrderSearchActivity.java
...office/ui/activity/bat/order/SaleOrderSearchActivity.java
+19
-0
SupplierOrderSearchActivity.java
...ce/ui/activity/bat/order/SupplierOrderSearchActivity.java
+19
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @
97615e66
...
@@ -221,7 +221,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
...
@@ -221,7 +221,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
case
R
.
id
.
tv_add
:
case
R
.
id
.
tv_add
:
startActivity
(
AddStockApplyActivity
.
class
,
startActivity
(
AddStockApplyActivity
.
class
,
"status"
,
dataBean
.
getStatus
()
+
""
,
"status"
,
dataBean
.
getStatus
()
+
""
,
"orderType"
,
dataBean
.
getExpandInfo
().
getOrderType
()
,
"orderType"
,
dataBean
.
getExpandInfo
().
getOrderType
(),
"num"
,
proList
.
get
(
position
).
getCanInStoreProductSum
()
+
""
,
"num"
,
proList
.
get
(
position
).
getCanInStoreProductSum
()
+
""
,
"product"
,
proList
.
get
(
position
).
getProductName
(),
"product"
,
proList
.
get
(
position
).
getProductName
(),
"simpleCode"
,
proList
.
get
(
position
).
getProductSimpleCode
(),
"simpleCode"
,
proList
.
get
(
position
).
getProductSimpleCode
(),
...
@@ -232,7 +232,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
...
@@ -232,7 +232,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
case
R
.
id
.
tv_return
:
case
R
.
id
.
tv_return
:
startActivity
(
ReturnApplyActivity
.
class
,
startActivity
(
ReturnApplyActivity
.
class
,
"status"
,
dataBean
.
getStatus
()
+
""
,
"status"
,
dataBean
.
getStatus
()
+
""
,
"orderType"
,
dataBean
.
getExpandInfo
().
getOrderType
()
,
"orderType"
,
dataBean
.
getExpandInfo
().
getOrderType
(),
"num"
,
proList
.
get
(
position
).
getStoreSum
()
+
""
,
"num"
,
proList
.
get
(
position
).
getStoreSum
()
+
""
,
"product"
,
proList
.
get
(
position
).
getProductName
(),
"product"
,
proList
.
get
(
position
).
getProductName
(),
"simpleCode"
,
proList
.
get
(
position
).
getProductSimpleCode
(),
"simpleCode"
,
proList
.
get
(
position
).
getProductSimpleCode
(),
...
@@ -269,7 +269,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
...
@@ -269,7 +269,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
@Override
@Override
protected
int
layoutId
()
{
protected
int
layoutId
()
{
return
R
.
layout
.
activity_
supplier
_order
;
return
R
.
layout
.
activity_
inside
_order
;
}
}
...
@@ -380,4 +380,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
...
@@ -380,4 +380,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
});
});
}
}
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
// TODO: add setContentView(...) invocation
ButterKnife
.
bind
(
this
);
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderSearchActivity.java
浏览文件 @
97615e66
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
...
@@ -86,6 +87,15 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
...
@@ -86,6 +87,15 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
saleSalePresenter
.
getInsideOrder
(
param
);
saleSalePresenter
.
getInsideOrder
(
param
);
}
}
},
rvData
);
},
rvData
);
orderAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
InsideOrderDetailActivity
.
class
,
"identity"
,
identity
,
"id"
,
orderList
.
get
(
position
).
getId
()
+
""
,
"status"
,
orderList
.
get
(
position
).
getStatus
()
+
""
);
}
});
}
}
@Override
@Override
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderSearchActivity.java
浏览文件 @
97615e66
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
...
@@ -96,6 +97,15 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
...
@@ -96,6 +97,15 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
saleSalePresenter
.
getInsideOrder
(
param
);
saleSalePresenter
.
getInsideOrder
(
param
);
}
}
},
rvData
);
},
rvData
);
saleAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
OutOrderDetailActivity
.
class
,
"identity"
,
identity
,
"id"
,
orderList
.
get
(
position
).
getId
()
+
""
,
"status"
,
orderList
.
get
(
position
).
getStatus
()
+
""
);
}
});
}
else
{
}
else
{
proAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
proAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
@Override
@Override
...
@@ -104,6 +114,15 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
...
@@ -104,6 +114,15 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
saleSalePresenter
.
getInsideOrder
(
param
);
saleSalePresenter
.
getInsideOrder
(
param
);
}
}
},
rvData
);
},
rvData
);
proAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
OutOrderDetailActivity
.
class
,
"identity"
,
identity
,
"id"
,
orderList
.
get
(
position
).
getId
()
+
""
,
"status"
,
orderList
.
get
(
position
).
getStatus
()
+
""
);
}
});
}
}
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderSearchActivity.java
浏览文件 @
97615e66
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
...
@@ -97,6 +98,15 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
...
@@ -97,6 +98,15 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
saleSalePresenter
.
getOrder
(
param
);
saleSalePresenter
.
getOrder
(
param
);
}
}
},
rvData
);
},
rvData
);
saleAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
SaleOrderDetailActivity
.
class
,
"identity"
,
identity
,
"id"
,
orderList
.
get
(
position
).
getId
()
+
""
,
"status"
,
orderList
.
get
(
position
).
getStatus
()
+
""
);
}
});
}
else
{
}
else
{
proAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
proAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
@Override
@Override
...
@@ -105,6 +115,15 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
...
@@ -105,6 +115,15 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
saleSalePresenter
.
getOrder
(
param
);
saleSalePresenter
.
getOrder
(
param
);
}
}
},
rvData
);
},
rvData
);
proAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
SaleOrderDetailActivity
.
class
,
"identity"
,
identity
,
"id"
,
orderList
.
get
(
position
).
getId
()
+
""
,
"status"
,
orderList
.
get
(
position
).
getStatus
()
+
""
);
}
});
}
}
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderSearchActivity.java
浏览文件 @
97615e66
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
...
@@ -97,6 +98,15 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
...
@@ -97,6 +98,15 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
saleSalePresenter
.
getSupplierOrder
(
param
);
saleSalePresenter
.
getSupplierOrder
(
param
);
}
}
},
rvData
);
},
rvData
);
saleAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
SupplierOrderDetailActivity
.
class
,
"identity"
,
identity
,
"id"
,
orderList
.
get
(
position
).
getId
()
+
""
,
"status"
,
orderList
.
get
(
position
).
getStatus
()
+
""
);
}
});
}
else
{
}
else
{
proAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
proAdapter
.
setOnLoadMoreListener
(
new
BaseQuickAdapter
.
RequestLoadMoreListener
()
{
@Override
@Override
...
@@ -105,6 +115,15 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
...
@@ -105,6 +115,15 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
saleSalePresenter
.
getSupplierOrder
(
param
);
saleSalePresenter
.
getSupplierOrder
(
param
);
}
}
},
rvData
);
},
rvData
);
proAdapter
.
setOnItemClickListener
(
new
BaseQuickAdapter
.
OnItemClickListener
()
{
@Override
public
void
onItemClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
startActivity
(
SupplierOrderDetailActivity
.
class
,
"identity"
,
identity
,
"id"
,
orderList
.
get
(
position
).
getId
()
+
""
,
"status"
,
orderList
.
get
(
position
).
getStatus
()
+
""
);
}
});
}
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论