Skip to content

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

1.修改库存 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数
上级 b079876b
显示空白字符变更
内嵌 并排
正在显示 包含 199 行增加 和 10 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ af228f96
......@@ -1769,6 +1769,16 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesUserProActivity"
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/bean/mesBean/MesProBean.java
浏览文件 @ af228f96
......@@ -81,8 +81,26 @@ public class MesProBean extends BaseMesPageBean {
private String directUserName;
private Object auditUserName;
private String specification;
private String deliveryDateTime;
private String deliveryNumber;
private boolean delete;
public String getDeliveryNumber() {
return deliveryNumber;
}
public void setDeliveryNumber(String deliveryNumber) {
this.deliveryNumber = deliveryNumber;
}
public String getDeliveryDateTime() {
return deliveryDateTime;
}
public void setDeliveryDateTime(String deliveryDateTime) {
this.deliveryDateTime = deliveryDateTime;
}
public String getId() {
return id;
}
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ af228f96
......@@ -391,4 +391,12 @@ public interface MesApiService {
@POST("/himes/api/feedback/show/bom/page.json")
Observable<BaseMesBean> questionList( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
*
* @return
*/
@POST("/himes/api/msStockRecord/show/page.json")
Observable<BaseMesBean> stockList( @Query("functionId") String functionId, @Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ af228f96
......@@ -366,7 +366,8 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
break;
case R.id.tv_add5:
startActivity(MesStockAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
,"id", data.getCustomerUserCode());
break;
case R.id.tv_add6:
startActivity(MesMiddleAddActivity.class,
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesStockAddActivity.java
浏览文件 @ af228f96
......@@ -126,7 +126,8 @@ public class MesStockAddActivity extends WorkToolBarActivity {
toast("添加成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});}
});
}
}
@Override
......@@ -142,6 +143,6 @@ public class MesStockAddActivity extends WorkToolBarActivity {
@OnClick(R.id.rl_pro)
public void onViewClicked() {
startActivityForResult(MesTicketProActivity.class, 10001);
startActivityForResult(MesUserProActivity.class, 10001, "id", getIntent().getStringExtra("id"));
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSupplierAddActivity.java
浏览文件 @ af228f96
......@@ -56,7 +56,7 @@ public class MesSupplierAddActivity extends WorkToolBarActivity {
@BindView(R.id.rl_time)
RelativeLayout rlTime;
@BindView(R.id.tv_send_num)
EditText tvSendNum;
TextView tvSendNum;
private Map<String, Object> param;
private MesProBean.ListBean choosePro;
private String from;
......@@ -74,12 +74,10 @@ public class MesSupplierAddActivity extends WorkToolBarActivity {
}
private void submit() {
String num = tvSendNum.getText().toString();
if (choosePro == null) {
toast("请选择产品");
return;
}
param.put("deliveryNumber", num);
if (TextUtils.equals(from, "1")) {
EventBus.getDefault().post(new AddMachineAddChildEvent(2, JSON.toJSONString(param)));
finish();
......@@ -147,6 +145,7 @@ public class MesSupplierAddActivity extends WorkToolBarActivity {
tvImgCode.setText(choosePro.getDrawingNumber());
param.put("productsCode", choosePro.getProductCode());
param.put("productsName", choosePro.getProductName());
param.put("deliveryNumber", choosePro.getDeliveryNumber());
param.put("figureNumber", choosePro.getDrawingNumber());
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ af228f96
......@@ -172,6 +172,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
RecyclerView rvData6;
@BindView(R.id.tv_add6)
TextView tvAdd6;
@BindView(R.id.tv_add2)
TextView tvAdd2;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -200,6 +202,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
ivModifyMachine.setVisibility(View.GONE);
ivModifySteel.setVisibility(View.GONE);
tvAdd1.setVisibility(View.GONE);
tvAdd2.setVisibility(View.GONE);
tvAdd3.setVisibility(View.GONE);
tvAdd4.setVisibility(View.GONE);
tvAdd5.setVisibility(View.GONE);
......@@ -530,7 +533,9 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesStockAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesStockAddActivity.class,
"continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "id", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add6:
if (userDataDetailBean == null) {
......@@ -643,7 +648,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
EventBus.getDefault().unregister(this);
}
// @Subscribe
// @Subscribe
// public void refresh(RefreshMachineEvent event) {
// getData();
// }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @ af228f96
......@@ -557,7 +557,9 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
toast("数据加载中，请稍后");
return;
}
startActivity(MesStockAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
startActivity(MesStockAddActivity.class,
"continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "id", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add6:
if (userDataDetailBean == null) {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserProActivity.java 0 → 100644
浏览文件 @ af228f96
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.MesProBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesProAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
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 MesUserProActivity extends WorkToolBarActivity {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<MesProBean.ListBean> clientList;
private MesProAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new MesProAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
param.put("paramMap",paramMap);
paramMap.put("custCode",getIntent().getStringExtra("id"));
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().stockList("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.getMessage());
return;
}
List<MesProBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesProBean.class).getList();
if (page == 1) {
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
clientAdapter.loadMoreComplete();
} else {
clientAdapter.loadMoreComplete();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
clientAdapter.loadMoreEnd();
} else {
page++;
}
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("pageNum", page);
getData();
}
}, rvClient);
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_ticket_take_on;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("productName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
app/src/main/res/layout/activity_mes_user_data_supplier.xml
浏览文件 @ af228f96
......@@ -145,7 +145,7 @@
android:textSize="14sp" />
<EditText
<TextView
android:id="@+id/tv_send_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论