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
9bf74860
提交
9bf74860
authored
8月 06, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.去除销售坩埚订单,入库领用显示,新增坩埚发货页面(未处理功能)
2.TODO 三个功能测试,下单新增唛头測試
上级
6d51d129
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
33 行增加
和
6 行删除
+33
-6
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+8
-1
OrderDetail.java
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
+1
-1
SaleOrderDetailActivity.java
...office/ui/activity/bat/order/SaleOrderDetailActivity.java
+2
-0
SendApplyActivity.java
...d/workoffice/ui/activity/bat/order/SendApplyActivity.java
+6
-0
SendApplyAddCruibleActivity.java
...ce/ui/activity/bat/order/SendApplyAddCruibleActivity.java
+0
-0
OrderDetailProductAdapter.java
...m/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
+16
-4
activity_send_apply_add_crucible.xml
app/src/main/res/layout/activity_send_apply_add_crucible.xml
+0
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
9bf74860
...
...
@@ -2383,7 +2383,14 @@
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.bat.order.SendApplyAddCruibleActivity"
android:configChanges=
"orientation|screenSize|keyboardHidden"
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/OrderDetail.java
浏览文件 @
9bf74860
...
...
@@ -93,7 +93,7 @@ public class OrderDetail {
private
String
inStockName
;
private
String
usedStore
;
private
String
usedStoreName
;
private
String
isCrucible
;
private
String
isCrucible
;
//坩埚销售订单 1 坩埚销售订单
public
String
getIsCrucible
()
{
return
isCrucible
;
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @
9bf74860
...
...
@@ -271,6 +271,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
proList
.
addAll
(
dataBean
.
getOrderItems
());
proAdapter
.
setStatus
(
dataBean
.
getStatus
());
proAdapter
.
setAttr
(
dataBean
.
getAttr
());
proAdapter
.
setIsCrucible
(
dataBean
.
getIsCrucible
());
proAdapter
.
notifyDataSetChanged
();
tvName
.
setText
(
dataBean
.
getCustomerName
());
tvDep
.
setText
(
dataBean
.
getReceiveDeptName
());
...
...
@@ -433,6 +434,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
}
startActivity
(
SendApplyActivity
.
class
,
"status"
,
dataBean
.
getStatus
()
+
""
,
"isCrucible"
,
dataBean
.
getIsCrucible
(),
"orderType"
,
dataBean
.
getExpandInfo
().
getOrderType
(),
"orderId"
,
getIntent
().
getStringExtra
(
"id"
));
break
;
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyActivity.java
浏览文件 @
9bf74860
...
...
@@ -102,6 +102,12 @@ public class SendApplyActivity extends WorkToolBarActivity {
public
boolean
onOptionsItemSelected
(
MenuItem
item
)
{
switch
(
item
.
getItemId
())
{
case
R
.
id
.
add
:
if
(
TextUtils
.
equals
(
"1"
,
getIntent
().
getStringExtra
(
"isCrucible"
)))
{
startActivity
(
SendApplyAddCruibleActivity
.
class
,
"orderType"
,
getIntent
().
getStringExtra
(
"orderType"
),
"id"
,
getIntent
().
getStringExtra
(
"orderId"
));
return
super
.
onOptionsItemSelected
(
item
);
}
startActivity
(
SendApplyAddActivity
.
class
,
"orderType"
,
getIntent
().
getStringExtra
(
"orderType"
),
"id"
,
getIntent
().
getStringExtra
(
"orderId"
));
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyAddCruibleActivity.java
0 → 100644
浏览文件 @
9bf74860
差异被折叠。
点击展开。
app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
浏览文件 @
9bf74860
...
...
@@ -22,7 +22,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
int
status
;
int
attr
;
List
<
OrderCheckStatusBean
.
ItemsBean
>
proStatusList
;
String
isCrucible
;
public
OrderDetailProductAdapter
(
int
layoutResId
,
List
data
,
Integer
status
)
{
super
(
layoutResId
,
data
);
...
...
@@ -49,8 +49,8 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
helper
.
setText
(
R
.
id
.
tv_unit
,
item
.
getProductUnit
());
helper
.
setText
(
R
.
id
.
tv_from
,
WorkUtils
.
getOrderFrom
(
item
.
getType
()));
helper
.
setText
(
R
.
id
.
tv_num
,
MathUtils
.
converData
(
item
.
getProductCount
(),
3
));
if
(!
TextUtils
.
isEmpty
(
item
.
getAnnex
())){
helper
.
setText
(
R
.
id
.
tv_annex
,
item
.
getAnnex
().
substring
(
1
));
if
(!
TextUtils
.
isEmpty
(
item
.
getAnnex
()))
{
helper
.
setText
(
R
.
id
.
tv_annex
,
item
.
getAnnex
().
substring
(
1
));
}
helper
.
addOnClickListener
(
R
.
id
.
ll_annex
);
helper
.
addOnClickListener
(
R
.
id
.
tv_get
);
...
...
@@ -108,12 +108,16 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
helper
.
setGone
(
R
.
id
.
fl_get
,
false
);
}
changeStats
(
helper
,
item
.
getProductId
());
if
(
TextUtils
.
equals
(
isCrucible
,
"1"
))
{
//坩埚销售订单,入库和领用不展示
helper
.
setGone
(
R
.
id
.
fl_add
,
false
);
helper
.
setGone
(
R
.
id
.
fl_get
,
false
);
}
}
private
void
changeStats
(
BaseViewHolder
helper
,
int
productId
)
{
if
(
getProStatusList
()
!=
null
)
{
for
(
OrderCheckStatusBean
.
ItemsBean
itemsBean
:
getProStatusList
())
{
if
(
productId
==
itemsBean
.
getProductId
())
{
if
(
productId
==
itemsBean
.
getProductId
())
{
helper
.
setGone
(
R
.
id
.
view_add
,
itemsBean
.
isInStore
());
helper
.
setGone
(
R
.
id
.
view_get
,
itemsBean
.
isUsed
());
helper
.
setGone
(
R
.
id
.
view_quality
,
itemsBean
.
isQualityInspection
());
...
...
@@ -140,5 +144,13 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
this
.
proStatusList
=
proStatusList
;
notifyDataSetChanged
();
}
public
String
getIsCrucible
()
{
return
isCrucible
;
}
public
void
setIsCrucible
(
String
isCrucible
)
{
this
.
isCrucible
=
isCrucible
;
}
}
app/src/main/res/layout/activity_send_apply_add_crucible.xml
0 → 100644
浏览文件 @
9bf74860
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论