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
628127f8
提交
628127f8
authored
5月 09, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修改参数
2.//TODO ,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,mes质量反馈,编辑任务担当无法修改.支数参数
上级
5f826bcc
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
14 行增加
和
22 行删除
+14
-22
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+0
-8
ChooseMachineBean.java
...ava/com/wd/workoffice/bean/mesBean/ChooseMachineBean.java
+3
-3
FeedbackDetailBean.java
...va/com/wd/workoffice/bean/mesBean/FeedbackDetailBean.java
+3
-3
MesQualityAddActivity.java
...office/ui/activity/mes/quality/MesQualityAddActivity.java
+3
-1
MesQualityConditionActivity.java
.../ui/activity/mes/quality/MesQualityConditionActivity.java
+1
-1
MesQualityDetailActivity.java
...ice/ui/activity/mes/quality/MesQualityDetailActivity.java
+1
-1
MesQualityFactoryActivity.java
...ce/ui/activity/mes/quality/MesQualityFactoryActivity.java
+2
-3
activity_mes_quality_add.xml
app/src/main/res/layout/activity_mes_quality_add.xml
+1
-2
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
628127f8
...
@@ -1388,14 +1388,6 @@
...
@@ -1388,14 +1388,6 @@
android:screenOrientation=
"portrait"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
android:windowSoftInputMode=
"adjustPan"
/>
<activity
android:name=
".ui.activity.mes.user.MesThreeAddActivity"
android:configChanges=
"keyboardHidden|orientation"
android:label=
"添加连铸三大件"
android:launchMode=
"singleTop"
android:screenOrientation=
"portrait"
android:theme=
"@style/Work.Base"
android:windowSoftInputMode=
"adjustPan"
/>
<activity
<activity
android:name=
".ui.activity.mes.user.MesThreeModifyActivity"
android:name=
".ui.activity.mes.user.MesThreeModifyActivity"
android:configChanges=
"keyboardHidden|orientation"
android:configChanges=
"keyboardHidden|orientation"
...
...
app/src/main/java/com/wd/workoffice/bean/mesBean/ChooseMachineBean.java
浏览文件 @
628127f8
...
@@ -111,7 +111,7 @@ public class ChooseMachineBean {
...
@@ -111,7 +111,7 @@ public class ChooseMachineBean {
private
String
caster
;
private
String
caster
;
private
String
casterName
;
private
String
casterName
;
private
Object
defectId
;
private
Object
defectId
;
private
Object
defectCount
;
private
String
defectCount
;
private
Object
defectCounts
;
private
Object
defectCounts
;
private
Object
defectCode
;
private
Object
defectCode
;
private
Object
defectName
;
private
Object
defectName
;
...
@@ -342,11 +342,11 @@ public class ChooseMachineBean {
...
@@ -342,11 +342,11 @@ public class ChooseMachineBean {
this
.
defectId
=
defectId
;
this
.
defectId
=
defectId
;
}
}
public
Object
getDefectCount
()
{
public
String
getDefectCount
()
{
return
defectCount
;
return
defectCount
;
}
}
public
void
setDefectCount
(
Object
defectCount
)
{
public
void
setDefectCount
(
String
defectCount
)
{
this
.
defectCount
=
defectCount
;
this
.
defectCount
=
defectCount
;
}
}
...
...
app/src/main/java/com/wd/workoffice/bean/mesBean/FeedbackDetailBean.java
浏览文件 @
628127f8
...
@@ -113,7 +113,7 @@ public class FeedbackDetailBean {
...
@@ -113,7 +113,7 @@ public class FeedbackDetailBean {
private
Object
defectCode
;
private
Object
defectCode
;
private
String
defectName
;
private
String
defectName
;
private
String
mainCause
;
private
String
mainCause
;
private
Object
defectCount
;
private
String
defectCount
;
private
Object
defectCounts
;
private
Object
defectCounts
;
private
String
steelTypeId
;
private
String
steelTypeId
;
private
String
steelTypeName
;
private
String
steelTypeName
;
...
@@ -365,11 +365,11 @@ public class FeedbackDetailBean {
...
@@ -365,11 +365,11 @@ public class FeedbackDetailBean {
this
.
mainCause
=
mainCause
;
this
.
mainCause
=
mainCause
;
}
}
public
Object
getDefectCount
()
{
public
String
getDefectCount
()
{
return
defectCount
;
return
defectCount
;
}
}
public
void
setDefectCount
(
Object
defectCount
)
{
public
void
setDefectCount
(
String
defectCount
)
{
this
.
defectCount
=
defectCount
;
this
.
defectCount
=
defectCount
;
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java
浏览文件 @
628127f8
...
@@ -66,7 +66,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
...
@@ -66,7 +66,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
@BindView
(
R
.
id
.
tv_img_code
)
@BindView
(
R
.
id
.
tv_img_code
)
TextView
tvImgCode
;
TextView
tvImgCode
;
@BindView
(
R
.
id
.
et_num
)
@BindView
(
R
.
id
.
et_num
)
EditText
etNum
;
TextView
etNum
;
@BindView
(
R
.
id
.
tv_mark_code
)
@BindView
(
R
.
id
.
tv_mark_code
)
TextView
tvMarkCode
;
TextView
tvMarkCode
;
@BindView
(
R
.
id
.
tv_machine
)
@BindView
(
R
.
id
.
tv_machine
)
...
@@ -158,8 +158,10 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
...
@@ -158,8 +158,10 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
chooseMachine
=
JSON
.
parseObject
(
data
.
getStringExtra
(
"data"
),
ChooseMachineBean
.
class
);
chooseMachine
=
JSON
.
parseObject
(
data
.
getStringExtra
(
"data"
),
ChooseMachineBean
.
class
);
tvMachine
.
setText
(
chooseMachine
.
getCasterName
());
tvMachine
.
setText
(
chooseMachine
.
getCasterName
());
tvSteel
.
setText
(
chooseMachine
.
getSteelTypeId
());
tvSteel
.
setText
(
chooseMachine
.
getSteelTypeId
());
etNum
.
setText
(
chooseMachine
.
getDefectCount
());
param
.
put
(
"steelTypeId"
,
chooseMachine
.
getSteelTypeId
());
param
.
put
(
"steelTypeId"
,
chooseMachine
.
getSteelTypeId
());
param
.
put
(
"casterName"
,
chooseMachine
.
getCasterName
());
param
.
put
(
"casterName"
,
chooseMachine
.
getCasterName
());
param
.
put
(
"defectCount"
,
chooseMachine
.
getDefectCount
());
}
else
if
(
requestCode
==
10003
&&
resultCode
==
10001
)
{
}
else
if
(
requestCode
==
10003
&&
resultCode
==
10001
)
{
chooseBox
=
JSON
.
parseObject
(
data
.
getStringExtra
(
"data"
),
BoxBean
.
class
);
chooseBox
=
JSON
.
parseObject
(
data
.
getStringExtra
(
"data"
),
BoxBean
.
class
);
tvProCode
.
setText
(
chooseBox
.
getProductCode
());
tvProCode
.
setText
(
chooseBox
.
getProductCode
());
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityConditionActivity.java
浏览文件 @
628127f8
...
@@ -119,7 +119,7 @@ public class MesQualityConditionActivity extends WorkToolBarActivity {
...
@@ -119,7 +119,7 @@ public class MesQualityConditionActivity extends WorkToolBarActivity {
param
.
put
(
"salesCompanyName"
,
etName
.
getText
().
toString
());
param
.
put
(
"salesCompanyName"
,
etName
.
getText
().
toString
());
}
}
if
(!
TextUtils
.
isEmpty
(
etNum
.
getText
().
toString
()))
{
if
(!
TextUtils
.
isEmpty
(
etNum
.
getText
().
toString
()))
{
param
.
put
(
"
verson
"
,
etNum
.
getText
().
toString
());
param
.
put
(
"
defectCount
"
,
etNum
.
getText
().
toString
());
}
}
if
(!
TextUtils
.
isEmpty
(
etBox
.
getText
().
toString
()))
{
if
(!
TextUtils
.
isEmpty
(
etBox
.
getText
().
toString
()))
{
param
.
put
(
"boxCode"
,
etBox
.
getText
().
toString
());
param
.
put
(
"boxCode"
,
etBox
.
getText
().
toString
());
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java
浏览文件 @
628127f8
...
@@ -200,7 +200,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
...
@@ -200,7 +200,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
tvSpec
.
setText
(
detailBean
.
getSpecification
());
tvSpec
.
setText
(
detailBean
.
getSpecification
());
tvImgCode
.
setText
(
detailBean
.
getDrawingNumber
());
tvImgCode
.
setText
(
detailBean
.
getDrawingNumber
());
tvBox
.
setText
(
detailBean
.
getBoxCode
());
tvBox
.
setText
(
detailBean
.
getBoxCode
());
tvNum
.
setText
(
detailBean
.
get
Verson
());
tvNum
.
setText
(
detailBean
.
get
DefectCount
());
tvMarkCode
.
setText
(
detailBean
.
getSerialNumber
());
tvMarkCode
.
setText
(
detailBean
.
getSerialNumber
());
tvMachine
.
setText
(
detailBean
.
getCasterName
());
tvMachine
.
setText
(
detailBean
.
getCasterName
());
tvSteelType
.
setText
(
detailBean
.
getSteelTypeId
());
tvSteelType
.
setText
(
detailBean
.
getSteelTypeId
());
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityFactoryActivity.java
浏览文件 @
628127f8
...
@@ -160,8 +160,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
...
@@ -160,8 +160,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
public
void
onViewClicked
(
View
view
)
{
public
void
onViewClicked
(
View
view
)
{
switch
(
view
.
getId
())
{
switch
(
view
.
getId
())
{
case
R
.
id
.
rl_process
:
case
R
.
id
.
rl_process
:
data
.
getProductId
();
startActivityForResult
(
MesChooseProcessActivity
.
class
,
10003
,
"id"
,
data
.
getProductId
());
startActivityForResult
(
MesChooseProcessActivity
.
class
,
10003
,
"id"
,
"000d85e9-8628-4fb3-ae01-51c58340caf0"
);
break
;
break
;
case
R
.
id
.
rl_duty_person
:
case
R
.
id
.
rl_duty_person
:
startActivityForResult
(
MesChooseMangerActivity
.
class
,
10001
);
startActivityForResult
(
MesChooseMangerActivity
.
class
,
10001
);
...
@@ -170,7 +169,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
...
@@ -170,7 +169,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
startActivityForResult
(
MesChooseMangerActivity
.
class
,
10002
);
startActivityForResult
(
MesChooseMangerActivity
.
class
,
10002
);
break
;
break
;
case
R
.
id
.
rl_question
:
case
R
.
id
.
rl_question
:
startActivityForResult
(
MesChooseQuestionActivity
.
class
,
10004
,
"id"
,
"000d85e9-8628-4fb3-ae01-51c58340caf0"
);
startActivityForResult
(
MesChooseQuestionActivity
.
class
,
10004
,
"id"
,
data
.
getProductId
()
);
break
;
break
;
case
R
.
id
.
rl_time
:
case
R
.
id
.
rl_time
:
PickTimeUtils
.
showPickThree
(
this
,
new
OnTimeSelectListener
()
{
PickTimeUtils
.
showPickThree
(
this
,
new
OnTimeSelectListener
()
{
...
...
app/src/main/res/layout/activity_mes_quality_add.xml
浏览文件 @
628127f8
...
@@ -348,7 +348,7 @@
...
@@ -348,7 +348,7 @@
android:text=
"支数"
android:text=
"支数"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
<
EditText
<
TextView
android:id=
"@+id/et_num"
android:id=
"@+id/et_num"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -357,7 +357,6 @@
...
@@ -357,7 +357,6 @@
android:layout_weight=
"1"
android:layout_weight=
"1"
android:background=
"@null"
android:background=
"@null"
android:gravity=
"right"
android:gravity=
"right"
android:hint=
"请输入"
android:padding=
"3mm"
android:padding=
"3mm"
android:textColor=
"@color/flexible_text_gray"
android:textColor=
"@color/flexible_text_gray"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论