Skip to content

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

1.中间包承包与结算 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token
上级 eb8d357d
隐藏空白字符变更
内嵌 并排
正在显示 包含 330 行增加 和 111 行删除
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ 298567e0
......@@ -56,10 +56,6 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
TextView tvAdd3;
@BindView(R.id.tv_add4)
TextView tvAdd4;
@BindView(R.id.rv_data5)
RecyclerView rvData5;
@BindView(R.id.tv_add5)
TextView tvAdd5;
private AccountBean dataBean;
@Override
......@@ -69,7 +65,6 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
......@@ -90,20 +85,14 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
data4List.add(null);
data4List.add(null);
data4List.add(null);
List<Object> data5List = new ArrayList<>();
data5List.add(null);
data5List.add(null);
data5List.add(null);
UserDataMachineAdapter data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
UserDataMachineAdapter data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
UserDataMachineAdapter data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List);
UserDataMachineAdapter data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
UserDataMachineAdapter data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
getData();
}
......@@ -153,7 +142,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.tv_add5, R.id.rl_add})
@OnClick({R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_add1:
......@@ -162,8 +151,6 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
break;
case R.id.tv_add4:
break;
case R.id.tv_add5:
break;
case R.id.rl_add:
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ 298567e0
......@@ -50,10 +50,6 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
RecyclerView rvData4;
@BindView(R.id.tv_add4)
TextView tvAdd4;
@BindView(R.id.rv_data5)
RecyclerView rvData5;
@BindView(R.id.tv_add5)
TextView tvAdd5;
@BindView(R.id.rl_add)
RelativeLayout rlAdd;
private AccountBean dataBean;
......@@ -61,7 +57,6 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
private UserDataMachineAdapter data4Adapter;
private UserDataMachineAdapter data5Adapter;
@Override
protected void initView() {
......@@ -70,7 +65,6 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
......@@ -91,20 +85,14 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data4List.add(null);
data4List.add(null);
data4List.add(null);
List<Object> data5List = new ArrayList<>();
data5List.add(null);
data5List.add(null);
data5List.add(null);
data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
getData();
}
......@@ -161,13 +149,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
}
});
data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageModifyActivity.class);
}
});
}
......@@ -178,7 +160,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.tv_add5, R.id.rl_add})
@OnClick({R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_add1:
......@@ -190,9 +172,8 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
case R.id.tv_add4:
startActivity(MesPackageAddActivity.class);
break;
case R.id.tv_add5:
break;
case R.id.rl_add:
startActivity(MesMiddleAddActivity.class);
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleAddActivity.java 0 → 100644
浏览文件 @ 298567e0
package com.wd.workoffice.ui.activity.mes.user;
import android.view.Menu;
import android.view.MenuItem;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import butterknife.ButterKnife;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesMiddleAddActivity extends WorkToolBarActivity {
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_other_supplier;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
finish();
break;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(AddFactoryEvent event) {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleDetailActivity.java 0 → 100644
浏览文件 @ 298567e0
package com.wd.workoffice.ui.activity.mes.user;
import android.view.Menu;
import android.view.MenuItem;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import butterknife.ButterKnife;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesMiddleDetailActivity extends WorkToolBarActivity {
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_other_supplier;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
finish();
break;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(AddFactoryEvent event) {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleModifyActivity.java 0 → 100644
浏览文件 @ 298567e0
package com.wd.workoffice.ui.activity.mes.user;
import android.view.Menu;
import android.view.MenuItem;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import butterknife.ButterKnife;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesMiddleModifyActivity extends WorkToolBarActivity {
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_other_supplier;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
finish();
break;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(AddFactoryEvent event) {
}
}
app/src/main/res/layout/activity_mes_user_data_machine_add.xml
浏览文件 @ 298567e0
......@@ -639,39 +639,6 @@
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="添加连铸三大件"
android:textSize="15sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data3"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
......@@ -694,12 +661,12 @@
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data4"
android:id="@+id/rv_data3"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add4"
android:id="@+id/tv_add3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加 +"
......@@ -728,12 +695,12 @@
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data5"
android:id="@+id/rv_data4"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add5"
android:id="@+id/tv_data4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加 +"
......
app/src/main/res/layout/activity_mes_user_data_machine_detail.xml
浏览文件 @ 298567e0
......@@ -639,39 +639,6 @@
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="添加连铸三大件"
android:textSize="15sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data3"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
......@@ -694,12 +661,12 @@
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data4"
android:id="@+id/rv_data3"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
t
<TextView
android:id="@+id/tv_add4"
android:id="@+id/tv_data3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加 +"
......@@ -728,12 +695,12 @@
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data5"
android:id="@+id/rv_data4"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add5"
android:id="@+id/tv_add4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加 +"
......
app/src/main/res/layout/activity_mes_user_data_other_middle.xml 0 → 100644
浏览文件 @ 298567e0
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="中间包承包情况"
android:textSize="14sp" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="三大件承包情况"
android:textSize="14sp" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="结算方式"
android:textSize="14sp" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论