Skip to content

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

1.内部订单详情 

2.//TODO erp用户激活测试，忘记/重置密码测试，质检接口数据问题,内部订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，刷新token
上级 4ae9620e
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 57 行增加 和 38 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 73969e97
...@@ -1317,7 +1317,13 @@ public interface ApiService { ...@@ -1317,7 +1317,13 @@ public interface ApiService {
*/ */
@POST("/procedureStart/co/applyStock/{orderItemId}") @POST("/procedureStart/co/applyStock/{orderItemId}")
Observable<BaseBean> addStockCoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody); Observable<BaseBean> addStockCoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/**
* step4_1-发起入库申请
*
* @return
*/
@POST("/procedureStart/io/applyStock/{orderItemId}")
Observable<BaseBean> addStockIoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/** /**
* step4_1-发起入库申请 * step4_1-发起入库申请
* *
...@@ -1356,7 +1362,13 @@ public interface ApiService { ...@@ -1356,7 +1362,13 @@ public interface ApiService {
*/ */
@GET("/enterStoreApply/co/app/page/list") @GET("/enterStoreApply/co/app/page/list")
Observable<BaseBean> addCoStockApplyList(@QueryMap Map<String, Object> param); Observable<BaseBean> addCoStockApplyList(@QueryMap Map<String, Object> param);
/**
* s入库申请列表
*
* @return
*/
@GET("/enterStoreApply/io/app/page/list")
Observable<BaseBean> addIoStockApplyList(@QueryMap Map<String, Object> param);
/** /**
* step4_3-入库申请列表 * step4_3-入库申请列表
* *
...@@ -1393,6 +1405,13 @@ public interface ApiService { ...@@ -1393,6 +1405,13 @@ public interface ApiService {
*/ */
@PUT("/enterStoreApply/co/audit/{id}") @PUT("/enterStoreApply/co/audit/{id}")
Observable<BaseBean> addCoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody); Observable<BaseBean> addCoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
* step4_2-入库申请审核
*
* @return
*/
@PUT("/enterStoreApply/io/audit/{id}")
Observable<BaseBean> addIoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/** /**
* 质检申请列表 * 质检申请列表
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyAddActivity.java
浏览文件 @ 73969e97
...@@ -120,6 +120,8 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity { ...@@ -120,6 +120,8 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().addFoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addFoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { }else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().addStockCoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addStockCoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().addStockIoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else { } else {
observable = RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyDetailActivity.java
浏览文件 @ 73969e97
...@@ -183,7 +183,9 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity { ...@@ -183,7 +183,9 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else { } else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().addIoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
}else {
observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 73969e97
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
...@@ -22,7 +23,6 @@ import com.wd.workoffice.retrofit.RtfUtils; ...@@ -22,7 +23,6 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.InsideOrderDetailProductAdapter; import com.wd.workoffice.ui.adapter.InsideOrderDetailProductAdapter;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter; import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.ui.adapter.SupplierOrderDetailProductAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -71,16 +71,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -71,16 +71,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
RecyclerView rvProcess; RecyclerView rvProcess;
@BindView(R.id.tv_name) @BindView(R.id.tv_name)
TextView tvName; TextView tvName;
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.rl_dep)
RelativeLayout rlDep;
@BindView(R.id.tv_place_name) @BindView(R.id.tv_place_name)
TextView tvPlaceName; TextView tvPlaceName;
@BindView(R.id.tv_place_dep) @BindView(R.id.tv_company)
TextView tvPlaceDep; TextView tvCompany;
@BindView(R.id.tv_warehouse)
TextView tvWarehouse;
@BindView(R.id.tv_order_no) @BindView(R.id.tv_order_no)
TextView tvOrderNo; TextView tvOrderNo;
@BindView(R.id.tv_time) @BindView(R.id.tv_time)
...@@ -121,34 +115,24 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -121,34 +115,24 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status")); status = Integer.valueOf(getIntent().getStringExtra("status"));
identity = getIntent().getStringExtra("identity"); identity = getIntent().getStringExtra("identity");
if (TextUtils.equals(identity, "1")) {//1销售 2生产
} else {
rlDep.setVisibility(View.GONE);
}
switch (status) { switch (status) {
// {"待审核", "待接单", "待生产", "已入库","已交付"}; // {"待审核", "待接单", "待生产", "已入库","已交付"};
// { "100", "200", "710", "500","600"}; // { "100", "200", "710", "500","600"};
case 100: case 100:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
break; break;
case 200: case 200:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
break; break;
case 300: case 300:
llBottom.setVisibility(View.VISIBLE);
break; break;
case 410: case 410:
llBottom.setVisibility(View.VISIBLE);
break; break;
case 500: case 500:
llBottom.setVisibility(View.VISIBLE);
break; break;
case 600: case 600:
llBottom.setVisibility(View.VISIBLE);
break; break;
default: default:
llBottom.setVisibility(View.VISIBLE);
break; break;
} }
} }
...@@ -193,18 +177,17 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -193,18 +177,17 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
proList.addAll(dataBean.getOrderItems()); proList.addAll(dataBean.getOrderItems());
proAdapter.notifyDataSetChanged(); proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getSupplierName()); tvName.setText(dataBean.getReceiveDeptName());
tvDep.setText(dataBean.getReceiveDeptName());
tvStatus.setText(dataBean.getStatusName()); tvStatus.setText(dataBean.getStatusName());
tvPlaceName.setText(dataBean.getLaunchUserName()); tvPlaceName.setText(dataBean.getLaunchUserName());
tvPlaceDep.setText(dataBean.getLaunchDeptName()); tvCompany.setText(dataBean.getLaunchDeptName());
tvWarehouse.setText(dataBean.getInStockName());
tvOrderNo.setText(dataBean.getId()); tvOrderNo.setText(dataBean.getId());
tvTime.setText(dataBean.getCreatedTime()); tvTime.setText(dataBean.getCreatedTime());
tvSendTime.setText(dataBean.getRequireTime()); tvSendTime.setText(dataBean.getRequireTime());
tvDesc.setText(dataBean.getAttrName()); tvOrderDesc.setText(dataBean.getAttrName());
tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount())); tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo(); OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
tvClaim1.setText(expandInfo.getDemond4()); tvClaim1.setText(expandInfo.getDemond4());
tvClaim2.setText(expandInfo.getDemond5()); tvClaim2.setText(expandInfo.getDemond5());
...@@ -238,7 +221,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -238,7 +221,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_add: case R.id.tv_add:
startActivity(AddStockApplyActivity.class, startActivity(AddStockApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getOrderType() + "", "orderType", dataBean.getExpandInfo().getOrderType() ,
"num", proList.get(position).getCanInStoreProductSum() + "", "num", proList.get(position).getCanInStoreProductSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -249,7 +232,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -249,7 +232,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_return: case R.id.tv_return:
startActivity(ReturnApplyActivity.class, startActivity(ReturnApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getOrderType() + "", "orderType", dataBean.getExpandInfo().getOrderType() ,
"num", proList.get(position).getStoreSum() + "", "num", proList.get(position).getStoreSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 73969e97
...@@ -266,7 +266,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -266,7 +266,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_add: case R.id.tv_add:
startActivity(AddStockApplyActivity.class, startActivity(AddStockApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getOrderType() + "", "orderType", dataBean.getExpandInfo().getOrderType() ,
"num", proList.get(position).getCanInStoreProductSum() + "", "num", proList.get(position).getCanInStoreProductSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -277,7 +277,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity { ...@@ -277,7 +277,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_return: case R.id.tv_return:
startActivity(ReturnApplyActivity.class, startActivity(ReturnApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getOrderType() + "", "orderType", dataBean.getExpandInfo().getOrderType() ,
"num", proList.get(position).getStoreSum() + "", "num", proList.get(position).getStoreSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ 73969e97
...@@ -244,6 +244,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -244,6 +244,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_add: case R.id.tv_add:
startActivity(AddStockApplyActivity.class, startActivity(AddStockApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType() ,
"num", proList.get(position).getCanInStoreProductSum() + "", "num", proList.get(position).getCanInStoreProductSum() + "",
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
...@@ -255,6 +256,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity { ...@@ -255,6 +256,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
startActivity(ReturnApplyActivity.class, startActivity(ReturnApplyActivity.class,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"num", proList.get(position).getStoreSum() + "", "num", proList.get(position).getStoreSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType() ,
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"), "orderId", getIntent().getStringExtra("id"),
......
app/src/main/java/com/wd/workoffice/ui/adapter/InsideOrderDetailProductAdapter.java
浏览文件 @ 73969e97
...@@ -47,20 +47,27 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai ...@@ -47,20 +47,27 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai
case 200: case 200:
break; break;
case 300: case 300:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false);
break; break;
case 400: case 400:
break;
case 500:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false);
break; break;
case 600: case 500:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false);
break;
case 600:
break; break;
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/fg/AddStockApplyFragment.java
浏览文件 @ 73969e97
...@@ -110,7 +110,9 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -110,7 +110,9 @@ public class AddStockApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().addFoStockApplyList(param); observable = RtfUtils.getRtf().addFoStockApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().addCoStockApplyList(param); observable = RtfUtils.getRtf().addCoStockApplyList(param);
}else { }else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().addIoStockApplyList(param);
} else {
observable = RtfUtils.getRtf().addStockApplyList(param); observable = RtfUtils.getRtf().addStockApplyList(param);
} }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
...@@ -250,6 +252,8 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -250,6 +252,8 @@ public class AddStockApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().addIoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
}else { }else {
observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论