Skip to content

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

1.统一新增 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改.供应商接口,产品库存，编辑逻辑，编辑参数错误
上级 fcef6968
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 150 行增加 和 46 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 139d9d4b
......@@ -1626,7 +1626,14 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesUserDataDetailModifyActivity"
android:configChanges="keyboardHidden|orientation"
android:label="用户数据采集详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseClientActivity.java
浏览文件 @ 139d9d4b
......@@ -126,8 +126,14 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
UserDataBean.ListBean userDataBean = new UserDataBean.ListBean();
MesClientBean.ListBean chooseClient = clientList.get(position);
if (TextUtils.equals("1",getIntent().getStringExtra("from"))){// 驳回编辑
Intent intent =new Intent();
intent.putExtra("data",JSON.toJSONString(chooseClient));
setResult(10001,intent);
finish();
}else{
UserDataBean.ListBean userDataBean = new UserDataBean.ListBean();
userDataBean.setCustomerUserCode(chooseClient.getCustomerCode());
userDataBean.setCustomerUserName(chooseClient.getCustomerName());
userDataBean.setSalesCompanyCode(chooseClient.getSalesCompanyCode());
......@@ -136,6 +142,8 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
userDataBean.setSalesManagerName(chooseClient.getSalesManagerName());
startActivity(MesUserDataAdd2Activity.class, "data", JSON.toJSONString(userDataBean));
}
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java
浏览文件 @ 139d9d4b
......@@ -114,6 +114,12 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {// 驳回编辑
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10002, intent);
finish();
} else {
data.setSteelmakingWorksName(clientList.get(position).getSteelmakingWorksName());
data.setSteelmakingWorksCode(clientList.get(position).getSteelmakingWorksCode());
data.setAnnualOutput(clientList.get(position).getAnnualOutput());
......@@ -122,6 +128,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
"data", JSON.toJSONString(data)
);
}
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.java
浏览文件 @ 139d9d4b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
......@@ -112,11 +113,18 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {// 驳回编辑
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10003, intent);
finish();
} else {
data.setContinuousCasterName(clientList.get(position).getContinuousCasterName());
data.setContinuousCasterType(clientList.get(position).getContinuousCasterType());
data.setContinuousCasterCode(clientList.get(position).getContinuousCasterCode());
startActivity(MesChooseMachineDetailActivity.class, "data", JSON.toJSONString(data));
}
}
});
}
......@@ -142,6 +150,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
data.setSteelmakingWorksCode(null);
startActivity(MesChooseMachineAddActivity.class, "data", JSON.toJSONString(data));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ 139d9d4b
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
......@@ -14,15 +13,12 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.event.AddMachineAddChildEvent;
import com.wd.workoffice.bean.event.AddMachineEvent;
import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
......@@ -43,8 +39,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.ConvertUtils;
import flexible.xd.android_base.utils.ObjectUtils;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
......@@ -162,6 +156,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
@Override
protected void initData() {
data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
data.setApprovalStatus(0);
data1List = new ArrayList<>();
data2List = new ArrayList<>();
data3List = new ArrayList<>();
......@@ -236,10 +231,10 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
return R.layout.activity_mes_user_data_machine_add;
}
private void changeSimple(){
private void changeSimple() {
MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
if (castInfo == null) {
castInfo =new MachineDetailBean.CastInfoBean();
castInfo = new MachineDetailBean.CastInfoBean();
machineDetailBean.setCastInfo(castInfo);
}
castInfo.setContinuousCasterType(tvMachineType.getText().toString());
......@@ -253,7 +248,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
MachineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
if (castLadle == null) {
castLadle =new MachineDetailBean.CastLadleBean();
castLadle = new MachineDetailBean.CastLadleBean();
machineDetailBean.setCastLadle(castLadle);
}
castLadle.setCapacity(tvMiddle1.getText().toString());
......@@ -263,11 +258,11 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
castLadle.setLiquidSteelTemperature(tvMiddle5.getText().toString());
castLadle.setBakingMethod(tvMiddle6.getText().toString());
castLadle.setBakingTemperature(tvMiddle7.getText().toString());
castLadle.setBakingDateTime(TimeUtils.string2Millis(tvMiddle8.getText().toString())/1000);
castLadle.setBakingDateTime(TimeUtils.string2Millis(tvMiddle8.getText().toString()) / 1000);
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent=new MachineDetailBean.CovAgentBean();
covAgent = new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
......@@ -278,7 +273,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu=new MachineDetailBean.MouldFluBean();
mouldFlu = new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
......@@ -286,6 +281,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
mouldFlu.setSupplierName(tvProtection4.getText().toString());
}
private void changeList() {
data1List.clear();
data2List.clear();
......@@ -498,9 +494,9 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
switch (item.getItemId()) {
case R.id.finish:
changeSimple();
if (TextUtils.equals("1",getIntent().getStringExtra("from"))){// 1 多步骤新增
if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {// 1 多步骤新增
submitAll();
}else {
} else {
submitMachine();
}
......@@ -519,8 +515,8 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
// steelInfo.put("ladleCode", data.getSteelmakingWorksCode());
steelInfo.put("continuousCasterCode", data.getContinuousCasterCode());
param.put("steelInfo", steelInfo);
Map<String,Object> factoryMap = JSON.parseObject(getIntent().getStringExtra("factory"), Map.class);
Map<String,Object> machineMap =JSON.parseObject(JSON.toJSONString(machineDetailBean),Map.class);
Map<String, Object> factoryMap = JSON.parseObject(getIntent().getStringExtra("factory"), Map.class);
Map<String, Object> machineMap = JSON.parseObject(JSON.toJSONString(machineDetailBean), Map.class);
for (Map.Entry<String, Object> factoryEntry : factoryMap.entrySet()) {
param.put(factoryEntry.getKey(), factoryEntry.getValue());
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAddActivity.java
浏览文件 @ 139d9d4b
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.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
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;
/**
* 用户数据采集，选择客户
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ 139d9d4b
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
......@@ -18,6 +19,7 @@ import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
......@@ -30,6 +32,7 @@ import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
......@@ -190,10 +193,19 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
private UserDataMachineAdapter data6Adapter;
private List<String> data5List;
private List<String> data6List;
private UserDataDetailBean userDataDetailBean;
@Override
protected void initView() {
ButterKnife.bind(this);
ivModifyClient.setVisibility(View.GONE);
ivModifyMachine.setVisibility(View.GONE);
ivModifySteel.setVisibility(View.GONE);
tvAdd1.setVisibility(View.GONE);
tvAdd3.setVisibility(View.GONE);
tvAdd4.setVisibility(View.GONE);
tvAdd5.setVisibility(View.GONE);
tvAdd6.setVisibility(View.GONE);
rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
......@@ -259,7 +271,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
toast(data.getMsg());
return;
}
UserDataDetailBean userDataDetailBean = JSON.parseObject(data.getData().toString(), UserDataDetailBean.class);
userDataDetailBean = JSON.parseObject(data.getData().toString(), UserDataDetailBean.class);
UserDataDetailBean.MainInfoBean mainInfo = userDataDetailBean.getMainInfo();
if (mainInfo != null) {
tvClient.setText(mainInfo.getCustomerUserName());
......@@ -272,11 +284,11 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
llBottom.setVisibility(View.VISIBLE);
}
} else {
if (mainInfo.getApprovalStatus() == 0) {
if (mainInfo.getApprovalStatus() == 2) {
llReason.setVisibility(View.VISIBLE);
tvReason.setText(mainInfo.getRemark());
} else {
llBottom.setVisibility(View.GONE);
llReason.setVisibility(View.GONE);
}
}
}
......@@ -315,14 +327,17 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
tvType.setText(steelWorks.getSteelGrade());
}
if (factoryDetailBean.getSteelFurnList() != null) {
dataFactory1List.clear();
dataFactory1List.addAll(factoryDetailBean.getSteelFurnList());
factory1Adapter.notifyDataSetChanged();
}
if (factoryDetailBean.getSteelRefFurnList() != null) {
dataFactory2List.clear();
dataFactory2List.addAll(factoryDetailBean.getSteelRefFurnList());
factory2Adapter.notifyDataSetChanged();
}
if (factoryDetailBean.getSteelLadleList() != null) {
dataFactory3List.clear();
dataFactory3List.addAll(factoryDetailBean.getSteelLadleList());
factory3Adapter.notifyDataSetChanged();
}
......@@ -355,7 +370,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
if (castInfo != null) {
tvMachineType.setText(castInfo.getContinuousCasterName());
tvMachineType.setText(castInfo.getContinuousCasterType());
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
tvSpeed.setText(castInfo.getCastingSpeed());
......@@ -485,22 +500,42 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_add1:
startActivity(MesThreeAddActivity.class);
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add3:
startActivity(MesOtherSupplierAddActivity.class);
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add4:
startActivity(MesPackageAddActivity.class);
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add5:
// startActivity(MesStockAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesStockAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add6:
// startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.rl_add:
startActivity(MesMiddleAddActivity.class);
// startActivity(MesMiddleAddActivity.class);
break;
case R.id.btn_agree:
openCheck(1);
......@@ -568,4 +603,44 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
});
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (!TextUtils.equals("1", getIntent().getStringExtra("from"))) {
if (TextUtils.equals("2", getIntent().getStringExtra("status"))) {
getMenuInflater().inflate(R.menu.menu_modify, menu);
}
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.modify:
startActivity(MesUserDataDetailModifyActivity.class, "from", getIntent().getStringExtra("from"),
"id", getIntent().getStringExtra("id"), "status",
getIntent().getStringExtra("status"));
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(RefreshMachineEvent event) {
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java
浏览文件 @ 139d9d4b
......@@ -138,7 +138,8 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesUserDataDetailActivity.class,"from","0","id",
dataList.get(position).getId());
dataList.get(position).getId(),"status",
dataList.get(position).getApprovalStatus()+"");
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListCheckActivity.java
浏览文件 @ 139d9d4b
......@@ -135,7 +135,8 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesUserDataDetailActivity.class, "from", "1", "id",
dataList.get(position).getId());
dataList.get(position).getId(),"status",
dataList.get(position).getApprovalStatus()+"");
}
});
}
......
app/src/main/res/layout/activity_mes_user_data_detail.xml
浏览文件 @ 139d9d4b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
......@@ -11,8 +11,9 @@
android:layout_alignParentBottom="true"
android:background="@color/white"
android:gravity="center"
android:visibility="gone"
android:paddingVertical="10mm"
android:visibility="gone">
>
<Button
android:id="@+id/btn_refuse"
......@@ -1220,6 +1221,7 @@
<RelativeLayout
android:id="@+id/rl_add"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
......@@ -1246,4 +1248,4 @@
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file
app/src/main/res/menu/menu_modify.xml 0 → 100644
浏览文件 @ 139d9d4b
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/modify"
android:title="编辑"
app:showAsAction="always" />
</menu>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论