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
a2ba4d04
提交
a2ba4d04
authored
8月 20, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1修改质量追溯页面
2.TODO 单独菜单
上级
b1a3a18a
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
17 行增加
和
14 行删除
+17
-14
MesApiService.java
...c/main/java/com/wd/workoffice/retrofit/MesApiService.java
+1
-1
MudAdapter.java
...rc/main/java/com/wd/workoffice/ui/adapter/MudAdapter.java
+1
-1
QualityDispatchAdapter.java
.../com/wd/workoffice/ui/adapter/QualityDispatchAdapter.java
+1
-0
QualityTraceabilityAdapter.java
.../wd/workoffice/ui/adapter/QualityTraceabilityAdapter.java
+2
-2
item_quality_traceability.xml
app/src/main/res/layout/item_quality_traceability.xml
+2
-2
item_quality_traceability_dispatch.xml
...rc/main/res/layout/item_quality_traceability_dispatch.xml
+1
-1
item_quality_traceability_mud.xml
app/src/main/res/layout/item_quality_traceability_mud.xml
+9
-7
没有找到文件。
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @
a2ba4d04
...
@@ -657,7 +657,7 @@ public interface MesApiService {
...
@@ -657,7 +657,7 @@ public interface MesApiService {
*
*
* @return
* @return
*/
*/
@POST
(
"/himes/api/mpsProduct/show/get
MpsProductByBasket
/list.json"
)
@POST
(
"/himes/api/mpsProduct/show/get
BySingleCode
/list.json"
)
Observable
<
BaseMesBean
>
getMpsProductByBasket
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
Observable
<
BaseMesBean
>
getMpsProductByBasket
(
@Query
(
"functionId"
)
String
functionId
,
@Body
RequestBody
requestBody
);
/**
/**
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/MudAdapter.java
浏览文件 @
a2ba4d04
...
@@ -25,7 +25,7 @@ public class MudAdapter extends BaseQuickAdapter<MudBean, BaseViewHolder> {
...
@@ -25,7 +25,7 @@ public class MudAdapter extends BaseQuickAdapter<MudBean, BaseViewHolder> {
@Override
@Override
protected
void
convert
(
BaseViewHolder
helper
,
MudBean
item
)
{
protected
void
convert
(
BaseViewHolder
helper
,
MudBean
item
)
{
// helper.setText(R.id.tv_no,String.format( "泥料编码:%s",item.getProcedureNam
e()));
helper
.
setText
(
R
.
id
.
tv_no
,
String
.
format
(
"泥料编码:%s"
,
item
.
getMudCod
e
()));
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getMudName
());
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getMudName
());
helper
.
setText
(
R
.
id
.
tv_code
,
item
.
getMudCode
());
helper
.
setText
(
R
.
id
.
tv_code
,
item
.
getMudCode
());
helper
.
setText
(
R
.
id
.
tv_code_no
,
item
.
getMudVoucherNumber
());
helper
.
setText
(
R
.
id
.
tv_code_no
,
item
.
getMudVoucherNumber
());
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/QualityDispatchAdapter.java
浏览文件 @
a2ba4d04
...
@@ -24,6 +24,7 @@ public class QualityDispatchAdapter extends BaseQuickAdapter<DispatchBean, BaseV
...
@@ -24,6 +24,7 @@ public class QualityDispatchAdapter extends BaseQuickAdapter<DispatchBean, BaseV
@Override
@Override
protected
void
convert
(
BaseViewHolder
helper
,
DispatchBean
item
)
{
protected
void
convert
(
BaseViewHolder
helper
,
DispatchBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_no
,
String
.
format
(
"工序名称:%s"
,
item
.
getProcedureName
()));
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getProcedureName
());
helper
.
setText
(
R
.
id
.
tv_name
,
item
.
getProcedureName
());
helper
.
setText
(
R
.
id
.
tv_identify_name
,
item
.
getAssetName
());
helper
.
setText
(
R
.
id
.
tv_identify_name
,
item
.
getAssetName
());
helper
.
setText
(
R
.
id
.
tv_person
,
item
.
getCreateUserName
());
helper
.
setText
(
R
.
id
.
tv_person
,
item
.
getCreateUserName
());
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/QualityTraceabilityAdapter.java
浏览文件 @
a2ba4d04
...
@@ -24,8 +24,8 @@ public class QualityTraceabilityAdapter extends BaseQuickAdapter<QualityTraceabi
...
@@ -24,8 +24,8 @@ public class QualityTraceabilityAdapter extends BaseQuickAdapter<QualityTraceabi
@Override
@Override
protected
void
convert
(
BaseViewHolder
helper
,
QualityTraceabilityBean
.
ListBean
item
)
{
protected
void
convert
(
BaseViewHolder
helper
,
QualityTraceabilityBean
.
ListBean
item
)
{
helper
.
setText
(
R
.
id
.
tv_no
,
String
.
format
(
"
订单号:%s"
,
item
.
getOrder
Number
()));
helper
.
setText
(
R
.
id
.
tv_no
,
String
.
format
(
"
单支码:%s"
,
item
.
getSerial
Number
()));
helper
.
setText
(
R
.
id
.
tv_single_code
,
item
.
get
Serial
Number
());
helper
.
setText
(
R
.
id
.
tv_single_code
,
item
.
get
Order
Number
());
helper
.
setText
(
R
.
id
.
tv_pro_name
,
item
.
getProductName
());
helper
.
setText
(
R
.
id
.
tv_pro_name
,
item
.
getProductName
());
helper
.
setText
(
R
.
id
.
tv_pro_code
,
item
.
getProductCode
());
helper
.
setText
(
R
.
id
.
tv_pro_code
,
item
.
getProductCode
());
helper
.
setText
(
R
.
id
.
tv_img_code
,
item
.
getDrawingNumber
());
helper
.
setText
(
R
.
id
.
tv_img_code
,
item
.
getDrawingNumber
());
...
...
app/src/main/res/layout/item_quality_traceability.xml
浏览文件 @
a2ba4d04
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
android:id=
"@+id/tv_no"
android:id=
"@+id/tv_no"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"
订单号
:"
android:text=
"
单支码
:"
android:textSize=
"16sp"
android:textSize=
"16sp"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:layout_marginLeft=
"10mm"
android:text=
"
单支码
"
android:text=
"
订单号
"
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
android:textSize=
"13sp"
/>
...
...
app/src/main/res/layout/item_quality_traceability_dispatch.xml
浏览文件 @
a2ba4d04
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:visibility=
"gone"
android:paddingHorizontal=
"10mm"
>
android:paddingHorizontal=
"10mm"
>
<TextView
<TextView
...
@@ -68,7 +69,6 @@
...
@@ -68,7 +69,6 @@
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:paddingHorizontal=
"10mm"
>
android:paddingHorizontal=
"10mm"
>
<TextView
<TextView
...
...
app/src/main/res/layout/item_quality_traceability_mud.xml
浏览文件 @
a2ba4d04
...
@@ -41,10 +41,10 @@
...
@@ -41,10 +41,10 @@
android:background=
"#FCFCFD"
android:background=
"#FCFCFD"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:paddingVertical=
"10mm"
>
android:paddingVertical=
"10mm"
>
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:paddingHorizontal=
"10mm"
>
android:paddingHorizontal=
"10mm"
>
<TextView
<TextView
...
@@ -52,12 +52,12 @@
...
@@ -52,12 +52,12 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:layout_marginLeft=
"10mm"
android:text=
"泥料
名称
"
android:text=
"泥料
传票号
"
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
android:textSize=
"13sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_
name
"
android:id=
"@+id/tv_
code_no
"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
...
@@ -76,12 +76,12 @@
...
@@ -76,12 +76,12 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:layout_marginLeft=
"10mm"
android:text=
"泥料
编码
"
android:text=
"泥料
名称
"
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
android:textSize=
"13sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_
cod
e"
android:id=
"@+id/tv_
nam
e"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
...
@@ -93,6 +93,7 @@
...
@@ -93,6 +93,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:layout_marginTop=
"10mm"
android:visibility=
"gone"
android:paddingHorizontal=
"10mm"
>
android:paddingHorizontal=
"10mm"
>
<TextView
<TextView
...
@@ -100,12 +101,12 @@
...
@@ -100,12 +101,12 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"10mm"
android:layout_marginLeft=
"10mm"
android:text=
"泥料
传票号
"
android:text=
"泥料
编码
"
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
android:textSize=
"13sp"
/>
<TextView
<TextView
android:id=
"@+id/tv_code
_no
"
android:id=
"@+id/tv_code"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
...
@@ -113,6 +114,7 @@
...
@@ -113,6 +114,7 @@
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"13sp"
/>
android:textSize=
"13sp"
/>
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论