Skip to content

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

1.连铸件 子编辑新增 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改,
上级 cfcae5d0
隐藏空白字符变更
内嵌 并排
正在显示 包含 989 行增加 和 74 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 53d6c12a
...@@ -1586,6 +1586,46 @@ ...@@ -1586,6 +1586,46 @@
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.MesMiddleDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="中间包承包与结算情况"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesStockAddActivity"
android:configChanges="keyboardHidden|orientation"
android:label="库存记录"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesStockDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="库存记录"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesStockModifyActivity"
android:configChanges="keyboardHidden|orientation"
android:label="库存记录"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesMiddleModifyActivity"
android:configChanges="keyboardHidden|orientation"
android:label="中间包承包与结算情况"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 53d6c12a
...@@ -236,6 +236,17 @@ public interface MesApiService { ...@@ -236,6 +236,17 @@ public interface MesApiService {
*/ */
@POST("/himes/api/msSceneFeedback/show/getByFeedInfo.json") @POST("/himes/api/msSceneFeedback/show/getByFeedInfo.json")
Observable<BaseMesBean> userDataDetail(@Query("functionId") String functionId, @Body RequestBody requestBody); Observable<BaseMesBean> userDataDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* otherSupplierAdd
*
* @return
*/
@POST("/himes/api/msStockRecord/save.json")
Observable<BaseMesBean> stockAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/** /**
* 审核接口 * 审核接口
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ 53d6c12a
package com.wd.workoffice.ui.activity.mes.user; package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
...@@ -113,6 +114,14 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -113,6 +114,14 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
RelativeLayout rlAdd; RelativeLayout rlAdd;
@BindView(R.id.tv_add3) @BindView(R.id.tv_add3)
TextView tvAdd3; TextView tvAdd3;
@BindView(R.id.rv_data5)
RecyclerView rvData5;
@BindView(R.id.tv_add5)
TextView tvAdd5;
@BindView(R.id.rv_data6)
RecyclerView rvData6;
@BindView(R.id.tv_add6)
TextView tvAdd6;
private UserDataMachineAdapter data1Adapter; private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter; private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter; private UserDataMachineAdapter data3Adapter;
...@@ -123,6 +132,10 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -123,6 +132,10 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
private List<String> data3List; private List<String> data3List;
private List<String> data4List; private List<String> data4List;
private MachineDetailBean machineDetailBean; private MachineDetailBean machineDetailBean;
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private List<String> data5List;
private List<String> data6List;
@Override @Override
protected void initView() { protected void initView() {
...@@ -131,6 +144,9 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -131,6 +144,9 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
} }
@Override @Override
...@@ -140,14 +156,21 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -140,14 +156,21 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data2List = new ArrayList<>(); data2List = new ArrayList<>();
data3List = new ArrayList<>(); data3List = new ArrayList<>();
data4List = new ArrayList<>(); data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List); data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List); data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List); data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List); data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data1Adapter.bindToRecyclerView(rvData1); data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2); data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3); data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4); data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
getData(); getData();
} }
...@@ -215,6 +238,8 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -215,6 +238,8 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data2List.clear(); data2List.clear();
data3List.clear(); data3List.clear();
data4List.clear(); data4List.clear();
data5List.clear();
data6List.clear();
if (machineDetailBean.getProductList() != null) { if (machineDetailBean.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) { for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName()); data1List.add(productListBean.getProductsName());
...@@ -239,6 +264,18 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -239,6 +264,18 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
} }
data4Adapter.notifyDataSetChanged(); data4Adapter.notifyDataSetChanged();
} }
if (machineDetailBean.getStockList() != null) {
for (MachineDetailBean.StockListBean productListBean : machineDetailBean.getStockList()) {
data5List.add(productListBean.getProductsName());
}
data5Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSettleList() != null) {
for (MachineDetailBean.SettleListBean productListBean : machineDetailBean.getSettleList()) {
data6List.add(productListBean.getSettlementMethod());
}
data6Adapter.notifyDataSetChanged();
}
} }
@Override @Override
...@@ -246,29 +283,40 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -246,29 +283,40 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesThreeModifyActivity.class,"data",JSON.toJSONString(machineDetailBean.getProductList().get(position))); startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position)));
} }
}); });
data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSupplierActivity.class,"data",JSON.toJSONString(machineDetailBean.getSupplyList().get(position))); startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
} }
}); });
data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesOtherSupplierModifyActivity.class,"data",JSON.toJSONString(machineDetailBean.getOtherSupList().get(position))); startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position)));
} }
}); });
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageModifyActivity.class,"data",JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position))); startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position)));
} }
}); });
data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesStockModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
}
});
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
} }
@Override @Override
...@@ -277,7 +325,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -277,7 +325,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
} }
@OnClick({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.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.tv_add1: case R.id.tv_add1:
...@@ -289,6 +337,12 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -289,6 +337,12 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
case R.id.tv_add4: case R.id.tv_add4:
startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()); startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break; break;
case R.id.tv_add5:
startActivity(MesStockAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.tv_add6:
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.rl_add: case R.id.rl_add:
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()); startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break; break;
...@@ -385,4 +439,5 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -385,4 +439,5 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleAddActivity.java
浏览文件 @ 53d6c12a
...@@ -7,10 +7,13 @@ import android.widget.EditText; ...@@ -7,10 +7,13 @@ import android.widget.EditText;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
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.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.Map; import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
...@@ -98,6 +101,7 @@ public class MesMiddleAddActivity extends WorkToolBarActivity { ...@@ -98,6 +101,7 @@ public class MesMiddleAddActivity extends WorkToolBarActivity {
} }
finish(); finish();
toast("添加成功"); toast("添加成功");
EventBus.getDefault().post(new RefreshMachineEvent());
} }
}); });
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleDetailActivity.java
浏览文件 @ 53d6c12a
package com.wd.workoffice.ui.activity.mes.user; package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent; import com.wd.workoffice.bean.event.AddFactoryEvent;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
/** /**
...@@ -20,6 +26,13 @@ import butterknife.ButterKnife; ...@@ -20,6 +26,13 @@ import butterknife.ButterKnife;
public class MesMiddleDetailActivity extends WorkToolBarActivity { public class MesMiddleDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_middle_status)
TextView tvMiddleStatus;
@BindView(R.id.tv_three_status)
TextView tvThreeStatus;
@BindView(R.id.tv_type)
TextView tvType;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -27,6 +40,10 @@ public class MesMiddleDetailActivity extends WorkToolBarActivity { ...@@ -27,6 +40,10 @@ public class MesMiddleDetailActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
MachineDetailBean.SettleListBean dataBean = JSON.parseObject(getIntent().getStringExtra("data"), MachineDetailBean.SettleListBean.class);
tvMiddleStatus.setText(dataBean.getLadleContractSituation());
tvThreeStatus.setText(dataBean.getContinuousCastingContractSituation());
tvType.setText(dataBean.getSettlementMethod());
} }
...@@ -36,40 +53,7 @@ public class MesMiddleDetailActivity extends WorkToolBarActivity { ...@@ -36,40 +53,7 @@ public class MesMiddleDetailActivity extends WorkToolBarActivity {
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_user_data_other_middle; return R.layout.activity_mes_user_data_other_middle_detail;
}
@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
浏览文件 @ 53d6c12a
...@@ -2,15 +2,26 @@ package com.wd.workoffice.ui.activity.mes.user; ...@@ -2,15 +2,26 @@ package com.wd.workoffice.ui.activity.mes.user;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent; import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/** /**
* author : flexible * author : flexible
...@@ -19,6 +30,14 @@ import butterknife.ButterKnife; ...@@ -19,6 +30,14 @@ import butterknife.ButterKnife;
**/ **/
public class MesMiddleModifyActivity extends WorkToolBarActivity { public class MesMiddleModifyActivity extends WorkToolBarActivity {
@BindView(R.id.et_middle_status)
EditText etMiddleStatus;
@BindView(R.id.et_three_status)
EditText etThreeStatus;
@BindView(R.id.et_type)
EditText etType;
private Map<String, Object> param;
private MachineDetailBean.SettleListBean dataBean;
@Override @Override
protected void initView() { protected void initView() {
...@@ -27,6 +46,13 @@ public class MesMiddleModifyActivity extends WorkToolBarActivity { ...@@ -27,6 +46,13 @@ public class MesMiddleModifyActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
dataBean = JSON.parseObject(getIntent().getStringExtra("data"), MachineDetailBean.SettleListBean.class);
param = WorkUtils.simpleParam();
param.put("continuousCasterCode", dataBean.getContinuousCasterCode());
param.put("id", dataBean.getId());
etMiddleStatus.setText(dataBean.getLadleContractSituation());
etThreeStatus.setText(dataBean.getContinuousCastingContractSituation());
etType.setText(dataBean.getSettlementMethod());
} }
...@@ -36,7 +62,7 @@ public class MesMiddleModifyActivity extends WorkToolBarActivity { ...@@ -36,7 +62,7 @@ public class MesMiddleModifyActivity extends WorkToolBarActivity {
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_user_data_other_supplier; return R.layout.activity_mes_user_data_other_middle;
} }
...@@ -50,26 +76,43 @@ public class MesMiddleModifyActivity extends WorkToolBarActivity { ...@@ -50,26 +76,43 @@ public class MesMiddleModifyActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.finish: case R.id.finish:
finish(); submit();
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override private void submit() {
public void onStart() { String middleStatus = etMiddleStatus.getText().toString();
super.onStart(); String threeStatus = etThreeStatus.getText().toString();
EventBus.getDefault().register(this); String type = etType.getText().toString();
} param.put("ladleContractSituation", middleStatus);
param.put("continuousCastingContractSituation", threeStatus);
@Override param.put("settlementMethod", type);
public void onStop() { RtfUtils.getMesRtf().middleAdd("1", "2", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
super.onStop(); @Override
EventBus.getDefault().unregister(this); public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMsg());
return;
}
finish();
toast("添加成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
} }
@Subscribe
public void refresh(AddFactoryEvent event) {
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesStockAddActivity.java 0 → 100644
浏览文件 @ 53d6c12a
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MesProBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.Map;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesStockAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_pro)
TextView tvPro;
@BindView(R.id.rl_pro)
RelativeLayout rlPro;
@BindView(R.id.et_img_code)
TextView etImgCode;
@BindView(R.id.tv_stock)
TextView tvStock;
@BindView(R.id.et_content)
EditText etContent;
private Map<String, Object> param;
private MesProBean.ListBean choosePro;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
param = WorkUtils.simpleParam();
param.put("continuousCasterCode", getIntent().getStringExtra("continuousCasterCode"));
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_other_stock;
}
@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:
submit();
break;
}
return super.onOptionsItemSelected(item);
}
private void submit() {
if (choosePro == null) {
toast("请选择产品");
return;
}
String content = etContent.getText().toString();
param.put("otherInformationExplain", content);
param.put("productsName", choosePro.getProductName());
param.put("figureNumber", choosePro.getDrawingNumber());
// param.put("stockNumber", choosePro.gets);
RtfUtils.getMesRtf().stockAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMsg());
return;
}
finish();
toast("添加成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
choosePro = JSON.parseObject(data.getStringExtra("data"), MesProBean.ListBean.class);
tvPro.setText(choosePro.getProductName());
etImgCode.setText(choosePro.getDrawingNumber());
// tvStock.setText(choosePro.get);
}
}
@OnClick(R.id.rl_pro)
public void onViewClicked() {
startActivityForResult(MesTicketProActivity.class, 10001);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesStockDetailActivity.java 0 → 100644
浏览文件 @ 53d6c12a
package com.wd.workoffice.ui.activity.mes.user;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesStockDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_pro)
TextView tvPro;
@BindView(R.id.rl_pro)
RelativeLayout rlPro;
@BindView(R.id.et_img_code)
TextView etImgCode;
@BindView(R.id.tv_stock)
TextView tvStock;
@BindView(R.id.et_content)
EditText etContent;
@Override
protected void initView() {
ButterKnife.bind(this);
etContent.setClickable(false);
}
@Override
protected void initData() {
MachineDetailBean.StockListBean dataBean = JSON.parseObject(getIntent().getStringExtra("data"), MachineDetailBean.StockListBean.class);
tvPro.setText(dataBean.getProductsName());
etImgCode.setText(dataBean.getProductsCode());
etContent.setText(dataBean.getOtherInformationExplain());
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_other_stock;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesStockModifyActivity.java 0 → 100644
浏览文件 @ 53d6c12a
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesProBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.Map;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesStockModifyActivity extends WorkToolBarActivity {
@BindView(R.id.tv_pro)
TextView tvPro;
@BindView(R.id.rl_pro)
RelativeLayout rlPro;
@BindView(R.id.et_img_code)
TextView etImgCode;
@BindView(R.id.tv_stock)
TextView tvStock;
@BindView(R.id.et_content)
EditText etContent;
private Map<String, Object> param;
private MesProBean.ListBean choosePro;
private MachineDetailBean.StockListBean dataBean;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
dataBean = JSON.parseObject(getIntent().getStringExtra("data"), MachineDetailBean.StockListBean.class);
param = WorkUtils.simpleParam();
param.put("continuousCasterCode", dataBean.getContinuousCasterCode());
param.put("id", dataBean.getId());
if (!TextUtils.isEmpty(dataBean.getProductsCode())) {
choosePro = new MesProBean.ListBean();
choosePro.setProductCode(dataBean.getProductsCode());
choosePro.setDrawingNumber(dataBean.getFigureNumber());
choosePro.setProductName(dataBean.getProductsName());
// param.put("stockNumber", choosePro.gets);
tvPro.setText(choosePro.getProductName());
etImgCode.setText(choosePro.getDrawingNumber());
}
etContent.setText(dataBean.getOtherInformationExplain());
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_other_stock;
}
@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:
submit();
break;
}
return super.onOptionsItemSelected(item);
}
private void submit() {
if (choosePro == null) {
toast("请选择产品");
return;
}
String content = etContent.getText().toString();
param.put("otherInformationExplain", content);
param.put("productsCode", choosePro.getProductCode());
param.put("productsName", choosePro.getProductName());
param.put("figureNumber", choosePro.getDrawingNumber());
// param.put("stockNumber", choosePro.gets);
RtfUtils.getMesRtf().stockAdd("1", "2", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMsg());
return;
}
finish();
toast("添加成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
choosePro = JSON.parseObject(data.getStringExtra("data"), MesProBean.ListBean.class);
tvPro.setText(choosePro.getProductName());
etImgCode.setText(choosePro.getDrawingNumber());
// tvStock.setText(choosePro.get);
}
}
@OnClick(R.id.rl_pro)
public void onViewClicked() {
startActivityForResult(MesTicketProActivity.class, 10001);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ 53d6c12a
package com.wd.workoffice.ui.activity.mes.user; package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -155,6 +156,20 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -155,6 +156,20 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
TextView tvAdd4; TextView tvAdd4;
@BindView(R.id.rl_add) @BindView(R.id.rl_add)
RelativeLayout rlAdd; RelativeLayout rlAdd;
@BindView(R.id.tv_factory_desc1)
TextView tvFactoryDesc1;
@BindView(R.id.tv_factory_desc2)
TextView tvFactoryDesc2;
@BindView(R.id.tv_factory_desc3)
TextView tvFactoryDesc3;
@BindView(R.id.rv_data5)
RecyclerView rvData5;
@BindView(R.id.tv_add5)
TextView tvAdd5;
@BindView(R.id.rv_data6)
RecyclerView rvData6;
@BindView(R.id.tv_add6)
TextView tvAdd6;
private AccountBean dataBean; private AccountBean dataBean;
private UserDataMachineAdapter data1Adapter; private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter; private UserDataMachineAdapter data2Adapter;
...@@ -171,6 +186,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -171,6 +186,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
private UserDataAdd3Adapter factory1Adapter; private UserDataAdd3Adapter factory1Adapter;
private UserDataAdd3RefAdapter factory2Adapter; private UserDataAdd3RefAdapter factory2Adapter;
private UserDataAdd3LabelAdapter factory3Adapter; private UserDataAdd3LabelAdapter factory3Adapter;
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private List<String> data5List;
private List<String> data6List;
@Override @Override
protected void initView() { protected void initView() {
...@@ -179,10 +198,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -179,10 +198,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvFactoryData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvFactoryData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvFactoryData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
} }
@Override @Override
...@@ -191,15 +212,20 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -191,15 +212,20 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
data2List = new ArrayList<>(); data2List = new ArrayList<>();
data3List = new ArrayList<>(); data3List = new ArrayList<>();
data4List = new ArrayList<>(); data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List); data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List); data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List); data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List); data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data1Adapter.bindToRecyclerView(rvData1); data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2); data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3); data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4); data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
dataFactory1List = new ArrayList<>(); dataFactory1List = new ArrayList<>();
dataFactory2List = new ArrayList<>(); dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>(); dataFactory3List = new ArrayList<>();
...@@ -259,6 +285,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -259,6 +285,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
private void getFactoryData(String code) { private void getFactoryData(String code) {
Map<String, Object> param = WorkUtils.simpleParam(); Map<String, Object> param = WorkUtils.simpleParam();
param.put("steelmakingWorksCode", code); param.put("steelmakingWorksCode", code);
...@@ -303,6 +330,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -303,6 +330,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
} }
}); });
} }
private void getMachineData(String code) { private void getMachineData(String code) {
Map<String, Object> param = WorkUtils.simpleParam(); Map<String, Object> param = WorkUtils.simpleParam();
param.put("continuousCasterCode", code); param.put("continuousCasterCode", code);
...@@ -367,6 +395,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -367,6 +395,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
data2List.clear(); data2List.clear();
data3List.clear(); data3List.clear();
data4List.clear(); data4List.clear();
data5List.clear();
data6List.clear();
if (machineDetailBean.getProductList() != null) { if (machineDetailBean.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) { for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName()); data1List.add(productListBean.getProductsName());
...@@ -391,6 +421,18 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -391,6 +421,18 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
} }
data4Adapter.notifyDataSetChanged(); data4Adapter.notifyDataSetChanged();
} }
if (machineDetailBean.getStockList() != null) {
for (MachineDetailBean.StockListBean productListBean : machineDetailBean.getStockList()) {
data5List.add(productListBean.getProductsName());
}
data5Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSettleList() != null) {
for (MachineDetailBean.SettleListBean productListBean : machineDetailBean.getSettleList()) {
data6List.add(productListBean.getSettlementMethod());
}
data6Adapter.notifyDataSetChanged();
}
} }
@Override @Override
...@@ -419,6 +461,18 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -419,6 +461,18 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
startActivity(MesPackageDetailActivity.class, "id", machineDetailBean.getOtherLadleList().get(position).getId()); startActivity(MesPackageDetailActivity.class, "id", machineDetailBean.getOtherLadleList().get(position).getId());
} }
}); });
data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesStockDetailActivity.class, "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
}
});
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesMiddleDetailActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
} }
@Override @Override
...@@ -427,7 +481,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -427,7 +481,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.btn_agree, R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add}) @OnClick({R.id.tv_add5, R.id.tv_add6, R.id.btn_agree, R.id.btn_refuse, 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.tv_add1: case R.id.tv_add1:
...@@ -439,6 +493,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity { ...@@ -439,6 +493,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
case R.id.tv_add4: case R.id.tv_add4:
startActivity(MesPackageAddActivity.class); startActivity(MesPackageAddActivity.class);
break; break;
case R.id.tv_add5:
// startActivity(MesStockAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.tv_add6:
// startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.rl_add: case R.id.rl_add:
startActivity(MesMiddleAddActivity.class); startActivity(MesMiddleAddActivity.class);
break; break;
......
app/src/main/res/layout/activity_mes_user_data_detail.xml
浏览文件 @ 53d6c12a
...@@ -302,59 +302,56 @@ ...@@ -302,59 +302,56 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_factory_data1" android:id="@+id/rv_factory_data1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
/>
</LinearLayout> </LinearLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/white" android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <TextView
android:id="@+id/tv_factory_desc2"
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:id="@+id/tv_factory_desc2"
android:textSize="15sp" /> android:textSize="15sp" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_factory_data2" android:id="@+id/rv_factory_data2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
/>
</LinearLayout> </LinearLayout>
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/white" android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <TextView
android:id="@+id/tv_factory_desc3"
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:id="@+id/tv_factory_desc3"
android:textSize="15sp" /> android:textSize="15sp" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_factory_data3" android:id="@+id/rv_factory_data3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
/>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
...@@ -1110,6 +1107,43 @@ ...@@ -1110,6 +1107,43 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
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:gravity="right"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data5"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -1147,6 +1181,43 @@ ...@@ -1147,6 +1181,43 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
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:gravity="right"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data6"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_add" android:id="@+id/rl_add"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/activity_mes_user_data_machine_detail.xml
浏览文件 @ 53d6c12a
...@@ -740,6 +740,43 @@ ...@@ -740,6 +740,43 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
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:gravity="right"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data5"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -777,6 +814,43 @@ ...@@ -777,6 +814,43 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
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:gravity="right"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data6"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_add" android:id="@+id/rl_add"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/activity_mes_user_data_other_middle_detail.xml 0 → 100644
浏览文件 @ 53d6c12a
<?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" />
<TextView
android:id="@+id/tv_middle_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
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" />
<TextView
android:id="@+id/tv_three_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
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" />
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/activity_mes_user_data_other_package.xml
浏览文件 @ 53d6c12a
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingVertical="15mm" android:paddingVertical="15mm"
android:paddingLeft="18mm" android:paddingLeft="18mm"
android:text="使用问题反馈（侵蚀、冲刷、断裂等）" android:text="使用情况反馈"
android:textSize="16sp" /> android:textSize="16sp" />
......
app/src/main/res/layout/activity_mes_user_data_other_package_detail.xml
浏览文件 @ 53d6c12a
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingVertical="15mm" android:paddingVertical="15mm"
android:paddingLeft="18mm" android:paddingLeft="18mm"
android:text="使用问题反馈（侵蚀、冲刷、断裂等）" android:text="使用情况反馈"
android:textSize="16sp" /> android:textSize="16sp" />
......
app/src/main/res/layout/activity_mes_user_data_other_stock.xml 0 → 100644
浏览文件 @ 53d6c12a
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
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:id="@+id/rl_pro"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
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" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</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" />
<TextView
android:id="@+id/et_img_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
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" />
<TextView
android:id="@+id/tv_stock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="15mm"
android:paddingLeft="18mm"
android:text="其他信息说明"
android:textSize="16sp" />
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请输入"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/activity_mes_user_data_other_supplier.xml
浏览文件 @ 53d6c12a
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingVertical="15mm" android:paddingVertical="15mm"
android:paddingLeft="18mm" android:paddingLeft="18mm"
android:text="使用问题反馈（侵蚀、冲刷、断裂等）" android:text="使用情况反馈"
android:textSize="16sp" /> android:textSize="16sp" />
......
app/src/main/res/layout/activity_mes_user_data_other_supplier_detail.xml
浏览文件 @ 53d6c12a
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingVertical="15mm" android:paddingVertical="15mm"
android:paddingLeft="18mm" android:paddingLeft="18mm"
android:text="使用问题反馈（侵蚀、冲刷、断裂等）" android:text="使用情况反馈"
android:textSize="16sp" /> android:textSize="16sp" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论