提交 628127f8 authored 作者: lgd's avatar lgd

1.修改参数

2.//TODO ,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,mes质量反馈,编辑任务担当无法修改.支数参数
上级 5f826bcc
...@@ -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"
......
...@@ -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;
} }
......
...@@ -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;
} }
......
...@@ -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());
......
...@@ -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());
......
...@@ -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.getVerson()); tvNum.setText(detailBean.getDefectCount());
tvMarkCode.setText(detailBean.getSerialNumber()); tvMarkCode.setText(detailBean.getSerialNumber());
tvMachine.setText(detailBean.getCasterName()); tvMachine.setText(detailBean.getCasterName());
tvSteelType.setText(detailBean.getSteelTypeId()); tvSteelType.setText(detailBean.getSteelTypeId());
......
...@@ -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() {
......
...@@ -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 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论