Skip to content

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

1.内部领料

上级 2c8053f8
显示空白字符变更
内嵌 并排
正在显示 包含 92 行增加 和 26 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ d3247444
...@@ -1271,9 +1271,17 @@ public interface ApiService { ...@@ -1271,9 +1271,17 @@ public interface ApiService {
* *
* @return * @return
*/ */
@GET("/pick-apply/page/list") @GET("/pick-apply/fo/page/list")
Observable<BaseBean> pickApplyList(@QueryMap Map<String, Object> param); Observable<BaseBean> pickApplyList(@QueryMap Map<String, Object> param);
/**
* 获取供应订单领料申请分页列表
*
* @return
*/
@GET("/pick-apply/io/page/list")
Observable<BaseBean> pickIoApplyList(@QueryMap Map<String, Object> param);
/** /**
* 获取发货申请分页列表 * 获取发货申请分页列表
* *
...@@ -1311,9 +1319,17 @@ public interface ApiService { ...@@ -1311,9 +1319,17 @@ public interface ApiService {
* *
* @return * @return
*/ */
@PUT("/pick-apply/status") @PUT("/pick-apply/fo/status")
Observable<BaseBean> pickApplyCheck(@Body RequestBody requestBody); Observable<BaseBean> pickApplyCheck(@Body RequestBody requestBody);
/**
* 审批领料申请
*
* @return
*/
@PUT("/pick-apply/io/status")
Observable<BaseBean> pickIoApplyCheck(@Body RequestBody requestBody);
/** /**
* 审批发货申请 * 审批发货申请
* *
...@@ -1352,9 +1368,17 @@ public interface ApiService { ...@@ -1352,9 +1368,17 @@ public interface ApiService {
* *
* @return * @return
*/ */
@GET("/pick-apply/item/list") @GET("/pick-apply/fo/item/list")
Observable<BaseBean> pickApplyDetail(@Query("applyId") String applyId); Observable<BaseBean> pickApplyDetail(@Query("applyId") String applyId);
/**
* _获取领料申请详细信息列表
*
* @return
*/
@GET("/pick-apply/io/item/list")
Observable<BaseBean> pickIoApplyDetail(@Query("applyId") String applyId);
/** /**
* _step6_1发起发货申请 * _step6_1发起发货申请
* *
...@@ -1378,7 +1402,15 @@ public interface ApiService { ...@@ -1378,7 +1402,15 @@ public interface ApiService {
* @return * @return
*/ */
@POST("/procedureStart/fo/applyOutStock/{orderId}") @POST("/procedureStart/fo/applyOutStock/{orderId}")
Observable<BaseBean> pickApply(@Path("orderId") String orderId, @Body RequestBody requestBody); Observable<BaseBean> pickApply(@Path("orderId")String orderId, @Body RequestBody requestBody);
/**
* 领料
*
* @return
*/
@POST("/procedureStart/io/applyOutStock/{orderId}")
Observable<BaseBean> pickIoApply(@Path("orderId")String orderId, @Body RequestBody requestBody);
/** /**
* _step6_1发起发货申请 * _step6_1发起发货申请
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ d3247444
...@@ -166,22 +166,39 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -166,22 +166,39 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
break; break;
case 220: case 220:
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.GONE);
break; break;
case 300: case 300:
llBottom.setVisibility(View.GONE); // llBottom.setVisibility(View.GONE);
// llCheck.setVisibility(View.GONE);
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE); llCheck.setVisibility(View.GONE);
llApply.setVisibility(View.GONE);
break; break;
case 320: case 320:
llBottom.setVisibility(View.GONE); // llBottom.setVisibility(View.GONE);
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE);
llApply.setVisibility(View.GONE);
break; break;
case 410: case 410:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE);
llApply.setVisibility(View.GONE);
break; break;
case 420: case 420:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE);
llApply.setVisibility(View.GONE);
break; break;
case 500: case 500:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE);
llApply.setVisibility(View.GONE);
break; break;
case 600: case 600:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE);
llApply.setVisibility(View.GONE);
break; break;
default: default:
break; break;
...@@ -353,7 +370,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -353,7 +370,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
} }
@OnClick({R.id.ll_see_more, R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree}) @OnClick({R.id.tv_pick_apply, R.id.ll_see_more, R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.ll_see_more: case R.id.ll_see_more:
...@@ -394,6 +411,16 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity { ...@@ -394,6 +411,16 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
"orderType", dataBean.getExpandInfo().getOrderType(), "orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id")); "orderId", getIntent().getStringExtra("id"));
break; break;
case R.id.tv_pick_apply:
if (dataBean == null) {
toast("正在加载中，请稍后");
return;
}
startActivity(PickApplyActivity.class,
"status", getIntent().getStringExtra("status"),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/PickApplyAddActivity.java
浏览文件 @ d3247444
...@@ -185,7 +185,7 @@ public class PickApplyAddActivity extends WorkToolBarActivity { ...@@ -185,7 +185,7 @@ public class PickApplyAddActivity extends WorkToolBarActivity {
if (entry.getValue()) { if (entry.getValue()) {
OrderDetail.OrderItemsBean recordsBean = dataList.get(entry.getKey()); OrderDetail.OrderItemsBean recordsBean = dataList.get(entry.getKey());
JSONObject returnData = new JSONObject(); JSONObject returnData = new JSONObject();
if (TextUtils.isEmpty(recordsBean.getChooseNum()) || Double.valueOf(recordsBean.getChooseNum()) == 0d) { if (TextUtils.isEmpty(recordsBean.getChooseNum()) || Double.parseDouble(recordsBean.getChooseNum()) == 0d) {
toast("请选择领料数量"); toast("请选择领料数量");
return false; return false;
} }
...@@ -233,8 +233,10 @@ public class PickApplyAddActivity extends WorkToolBarActivity { ...@@ -233,8 +233,10 @@ public class PickApplyAddActivity extends WorkToolBarActivity {
// param.put("logisticsId", clientId); // param.put("logisticsId", clientId);
Observable<BaseBean> observable; Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().pickApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().pickApply( getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else { } else if (TextUtils.equals(orderType, OrderType.IN.getCode())){
observable = RtfUtils.getRtf().pickIoApply( getIntent().getStringExtra("id"),WorkUtils.convertMapToBody(param));
}else {
observable = RtfUtils.getRtf().pickApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().pickApply(getIntent().getStringExtra("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/PickApplyDetailActivity.java
浏览文件 @ d3247444
...@@ -132,7 +132,15 @@ public class PickApplyDetailActivity extends WorkToolBarActivity { ...@@ -132,7 +132,15 @@ public class PickApplyDetailActivity extends WorkToolBarActivity {
} }
private void getData(String id) { private void getData(String id) {
RtfUtils.getRtf().pickApplyDetail(id).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().pickApplyDetail(id);
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().pickIoApplyDetail(id);
}else {
observable = RtfUtils.getRtf().pickApplyDetail(id);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
...@@ -220,6 +228,8 @@ public class PickApplyDetailActivity extends WorkToolBarActivity { ...@@ -220,6 +228,8 @@ public class PickApplyDetailActivity extends WorkToolBarActivity {
Observable<BaseBean> observable; Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.IN.getCode())){
observable = RtfUtils.getRtf().pickIoApplyCheck(WorkUtils.convertMapToBody(param));
}else { }else {
observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param));
} }
......
app/src/main/java/com/wd/workoffice/ui/fg/PickApplyFragment.java
浏览文件 @ d3247444
...@@ -89,12 +89,10 @@ public class PickApplyFragment extends WorkBaseFg { ...@@ -89,12 +89,10 @@ public class PickApplyFragment extends WorkBaseFg {
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_LIST.getPermission()) && hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_LIST.getPermission()) &&
WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_AUDIT.getPermission()); WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_LIST.getPermission()) &&
WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_AUDIT.getPermission());
} }
// else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getPermission());
// } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getPermission());
// }
dataAdapter.setHasPermission(hasPermission); dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged(); dataAdapter.notifyDataSetChanged();
} }
...@@ -114,12 +112,12 @@ public class PickApplyFragment extends WorkBaseFg { ...@@ -114,12 +112,12 @@ public class PickApplyFragment extends WorkBaseFg {
Observable<BaseBean> observable; Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().pickApplyList(param); observable = RtfUtils.getRtf().pickApplyList(param);
} else { } else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().pickIoApplyList(param);
}else {
observable = RtfUtils.getRtf().pickApplyList(param); observable = RtfUtils.getRtf().pickApplyList(param);
} }
// else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { // else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
// observable = RtfUtils.getRtf().sendPoApplyList(param);
// } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
// observable = RtfUtils.getRtf().sendCoApplyList(param); // observable = RtfUtils.getRtf().sendCoApplyList(param);
// } // }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
...@@ -238,14 +236,11 @@ public class PickApplyFragment extends WorkBaseFg { ...@@ -238,14 +236,11 @@ public class PickApplyFragment extends WorkBaseFg {
Observable<BaseBean> observable; Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.IN.getCode())){
observable = RtfUtils.getRtf().pickIoApplyCheck(WorkUtils.convertMapToBody(param));
}else { }else {
observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param));
} }
// else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
// observable = RtfUtils.getRtf().sendPoApplyCheck(WorkUtils.convertMapToBody(param));
// } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
// observable = RtfUtils.getRtf().sendCoApplyCheck(WorkUtils.convertMapToBody(param));
// }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论