Skip to content

W
workoffice
提交 cdfe2c14 authored 作者: lgd's avatar lgd
浏览文件
操作

1.新增连铸机供应商 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改.
上级 fe42132b
显示空白字符变更
内嵌 并排
正在显示 包含 94 行增加 和 19 行删除
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseClientActivity.java
浏览文件 @ cdfe2c14
...@@ -127,7 +127,7 @@ public class MesChooseClientActivity extends WorkToolBarActivity { ...@@ -127,7 +127,7 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
MesClientBean.ListBean chooseClient = clientList.get(position); MesClientBean.ListBean chooseClient = clientList.get(position);
if (TextUtils.equals("1",getIntent().getStringExtra("from"))){// 驳回编辑 if (TextUtils.equals("1",getIntent().getStringExtra("from"))){// 新增连铸机供应商
Intent intent =new Intent(); Intent intent =new Intent();
intent.putExtra("data",JSON.toJSONString(chooseClient)); intent.putExtra("data",JSON.toJSONString(chooseClient));
setResult(10001,intent); setResult(10001,intent);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ cdfe2c14
package com.wd.workoffice.ui.activity.mes.user; package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
...@@ -19,8 +21,12 @@ import com.wd.workoffice.bean.event.AddMachineAddChildEvent; ...@@ -19,8 +21,12 @@ import com.wd.workoffice.bean.event.AddMachineAddChildEvent;
import com.wd.workoffice.bean.event.AddMachineEvent; import com.wd.workoffice.bean.event.AddMachineEvent;
import com.wd.workoffice.bean.event.AddMachineModifyChildEvent; import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent; import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.FactoryBean;
import com.wd.workoffice.bean.mesBean.MachineBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean; import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataBean; import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter; import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
...@@ -33,6 +39,7 @@ import java.util.ArrayList; ...@@ -33,6 +39,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
...@@ -88,7 +95,9 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity { ...@@ -88,7 +95,9 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_cover3) @BindView(R.id.tv_cover3)
EditText tvCover3; EditText tvCover3;
@BindView(R.id.tv_cover4) @BindView(R.id.tv_cover4)
EditText tvCover4; TextView tvCover4;
@BindView(R.id.rl_cover4)
RelativeLayout rlCover4;
@BindView(R.id.ll_cover) @BindView(R.id.ll_cover)
LinearLayout llCover; LinearLayout llCover;
@BindView(R.id.rl_protection) @BindView(R.id.rl_protection)
...@@ -100,7 +109,9 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity { ...@@ -100,7 +109,9 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_protection3) @BindView(R.id.tv_protection3)
EditText tvProtection3; EditText tvProtection3;
@BindView(R.id.tv_protection4) @BindView(R.id.tv_protection4)
EditText tvProtection4; TextView tvProtection4;
@BindView(R.id.rl_protection4)
RelativeLayout rlProtection4;
@BindView(R.id.ll_protection) @BindView(R.id.ll_protection)
LinearLayout llProtection; LinearLayout llProtection;
@BindView(R.id.rv_data1) @BindView(R.id.rv_data1)
...@@ -327,9 +338,17 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity { ...@@ -327,9 +338,17 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
} }
} }
@OnClick({R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add}) @OnClick({R.id.rl_cover4,R.id.rl_protection4,R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.rl_cover4:
startActivityForResult(MesChooseClientActivity.class,
10001,"from", "1");
break;
case R.id.rl_protection4:
startActivityForResult(MesChooseClientActivity.class,
10002,"from", "1");
break;
case R.id.tv_add1: case R.id.tv_add1:
startActivity(MesThreeAddActivity.class, startActivity(MesThreeAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()); "from", "1", "continuousCasterCode", data.getContinuousCasterCode());
...@@ -578,4 +597,37 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity { ...@@ -578,4 +597,37 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
} }
}); });
} }
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent==null){
covAgent =new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
covAgent.setSupplierCode(modifyClient.getCustomerCode());
covAgent.setSupplierName(modifyClient.getCustomerName());
}
break;
case 10002:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu==null){
mouldFlu =new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
mouldFlu.setSupplierCode(modifyClient.getCustomerCode());
mouldFlu.setSupplierCode(modifyClient.getCustomerName());
}
break;
}
}
} }
app/src/main/res/layout/activity_mes_user_data_machine_add.xml
浏览文件 @ cdfe2c14
...@@ -483,31 +483,42 @@ ...@@ -483,31 +483,42 @@
android:hint="请输入" android:hint="请输入"
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_cover4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="25mm"
android:background="@android:color/white" android:background="@android:color/white"
android:paddingVertical="9mm" android:paddingVertical="9mm">
android:paddingLeft="25mm">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="供应商" android:text="供应商"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <LinearLayout
android:id="@+id/tv_cover4"
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"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_cover4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:background="@null" android:text="请选择"
android:hint="请输入" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
...@@ -626,30 +637,42 @@ ...@@ -626,30 +637,42 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_protection4"
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:background="@android:color/white" android:background="@android:color/white"
android:paddingVertical="9mm" android:paddingHorizontal="20mm"
android:paddingLeft="25mm"> android:paddingVertical="9mm">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="供应商" android:text="供应商"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <LinearLayout
android:id="@+id/tv_protection4"
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"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_protection4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:background="@null" android:text="请选择"
android:hint="请输入" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论