Skip to content

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

1.供应订单，新加退货，未测试

上级 aff1716c
显示空白字符变更
内嵌 并排
正在显示 包含 94 行增加 和 13 行删除
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
浏览文件 @ dd47f531
......@@ -945,12 +945,21 @@ public class OrderDetail {
private Object orderTypeName;
private String canOutReturnSum;
private String canUsedReturnSum;
private String canReturnProductSum;
private List<ItemFlowsBean> itemFlows;
private List<StockQuantityDetailMapsBean> stockQuantityDetailMaps;
private String chooseNum;
private double productBeyondCount;
public String getCanReturnProductSum() {
return canReturnProductSum;
}
public void setCanReturnProductSum(String canReturnProductSum) {
this.canReturnProductSum = canReturnProductSum;
}
public double getProductBeyondCount() {
return productBeyondCount;
}
......
app/src/main/java/com/wd/workoffice/bean/workEnum/PagePermissionType.java
浏览文件 @ dd47f531
......@@ -122,6 +122,15 @@ public enum PagePermissionType {
FO_RECEIPT_LIST("order:fo:receipt-invoice-apply:page:list", "收票审请列表"),
FO_RECEIPT_SAVE("order:fo:receipt-invoice-apply:apply:save", "发起收票审请"),
FO_RECEIPT_AUDIT("order:fo:receipt-invoice-apply:audit", "收票审核"),
FO_RETURN_SAVE("order:fo:return-apply:apply:save", "发起申请退货申请"),
FO_RETURN_LIST("order:fo:return-apply:page:list", "退货申请列表"),
FO_RETURN_AUDIT("order:fo:return-apply:edit", "退货审核"),
FO_PICK_RETURN_SAVE("order:fo:pick-return-apply:apply:save", "发起领料退回申请"),
FO_PICK_RETURN_LIST("order:fo:pick-return-apply:page:list", "领料退回申请列表"),
FO_PICK_RETURN_EDIT("order:fo:pikc-return-apply:edit", "领料退回审核"),
FO_PICK_APPLY_SAVE("order:fo:pick-apply:apply:save", "发起领料申请"),
FO_PICK_APPLY_LIST("order:fo:pick-apply:page:list", "领料申请列表"),
FO_PICK_APPLY_AUDIT("order:fo:pick-apply:apply:audit", "领料审核"),
//内部订单
IO_INSIDE_LIST("app:order:inside-order:page:list", "订单列表"),
IO_INSIDE_DETAILS("order:inside-order:details", "订单详情"),
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ dd47f531
......@@ -1445,6 +1445,13 @@ public interface ApiService {
@GET("/returnApply/po/page/list")
Observable<BaseBean> returnPoApplyList(@QueryMap Map<String, Object> param);
/**
* step7_7-退货申请流水列表
*
* @return
*/
@GET("/returnApply/fo/page/list")
Observable<BaseBean> returnFoApplyList(@QueryMap Map<String, Object> param);
/**
* step7_6 发送订单退货申请
*
......@@ -1452,7 +1459,13 @@ public interface ApiService {
*/
@POST("/procedureStart/po/applyReturn/{id}")
Observable<BaseBean> returnPoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* step7_6 发送订单退货申请
*
* @return
*/
@POST("/procedureStart/fo/applyReturn/{id}")
Observable<BaseBean> returnFoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* step7_6 发送订单退货申请
*
......@@ -1704,6 +1717,13 @@ public interface ApiService {
@PUT("/returnApply/po/audit/group/{applyId}")
Observable<BaseBean> poGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 退货审核
*
* @return
*/
@PUT("/returnApply/fo/audit/group/{applyId}")
Observable<BaseBean> foGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 获取一个订单子表的全部流水
*
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnAddActivity.java
浏览文件 @ dd47f531
......@@ -2,11 +2,10 @@ package com.wd.workoffice.ui.activity.bat.order;
import android.content.DialogInterface;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -19,13 +18,11 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckReturnEvent;
import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -74,13 +71,15 @@ public class ReturnAddActivity extends WorkToolBarActivity {
LinearLayout llMoney;
@BindView(R.id.ll_type)
LinearLayout llType;
@BindView(R.id.iv_choose_type)
ImageView ivChooseType;
private Map<String, Object> param;
private String orderType;
private List<String> typeList = new ArrayList<>();
private String enterStockType;
private QMUIDialog.MenuDialogBuilder typeDialog;
private QMUIDialog.MenuDialogBuilder deptDialog;
private int chooseType = 0;//1 从现场库退到内库 3 未结算库核 4 现场库退给供应商
private int chooseType = 0;//1 从现场库退到内库 3 未结算库核 4 现场库退给供应商 （6）从内库退到供应商
private JSONArray deptList;
private List<String> deptNameList;
private Integer chooseDep;
......@@ -94,6 +93,8 @@ public class ReturnAddActivity extends WorkToolBarActivity {
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
typeList.add("从现场库退到内库");
tvReturnType.setText("从现场库退到内库");
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
tvReturnType.setText("从内库退给供应商");
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
switch (enterStockType) {
case "1":
......@@ -140,6 +141,13 @@ public class ReturnAddActivity extends WorkToolBarActivity {
llChooseStock.setVisibility(View.GONE);
llMoney.setVisibility(View.GONE);
break;
case "从内库退给供应商":
chooseType = 6;
llMoney.setVisibility(View.GONE);
llChooseStock.setVisibility(View.GONE);
ivChooseType.setVisibility(View.GONE);
llType.setClickable(false);
break;
default:
llChooseStock.setVisibility(View.GONE);
llMoney.setVisibility(View.GONE);
......@@ -315,7 +323,9 @@ public class ReturnAddActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().returnSoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().returnPoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().returnPoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}else {
observable = RtfUtils.getRtf().returnSoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......@@ -359,4 +369,10 @@ public class ReturnAddActivity extends WorkToolBarActivity {
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnApplyActivity.java
浏览文件 @ dd47f531
......@@ -84,6 +84,8 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().returnApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().returnPoApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().returnFoApplyList(param);
} else {
observable = RtfUtils.getRtf().returnApplyList(param);
}
......@@ -197,6 +199,10 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
if (WorkUtils.hasPermission(PagePermissionType.PO_RETURN_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.FO_RETURN_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnDetailActivity.java
浏览文件 @ dd47f531
......@@ -185,6 +185,17 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
rlHistory.setVisibility(View.GONE);
llProcess.setVisibility(View.GONE);
}
else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (status.startsWith("1") && !status.endsWith("4")) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
} else {
llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.GONE);
}
rlHistory.setVisibility(View.GONE);
llProcess.setVisibility(View.GONE);
}
}
/**
......@@ -305,6 +316,8 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT.getPermission());
}else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_RETURN_AUDIT.getPermission());
}
......@@ -354,6 +367,9 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
param.put("status", status);
param.put("productAmount", info.getProductAmount());
}else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
param.put("status", status);
param.put("productAmount", info.getProductAmount());
}
param.put("auditRemark", remark);
param.put("productAmount", info.getProductAmount());
......@@ -373,6 +389,8 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().soReturnApply(id + "", WorkUtils.convertMapToBody(param));
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ dd47f531
......@@ -325,8 +325,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
"status", dataBean.getStatus() + "",
"enterStockType", dataBean.getEnterStockType(),
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", TextUtils.equals(dataBean.getEnterStockType(), "1") ?
proList.get(position).getCanOutReturnSum() : proList.get(position).getCanUsedReturnSum(),
"returnNum", proList.get(position).getCanReturnProductSum(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
......
app/src/main/java/com/wd/workoffice/ui/adapter/SupplierOrderDetailProductAdapter.java
浏览文件 @ dd47f531
......@@ -65,17 +65,17 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
case 300:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.fl_return, false);
// helper.setGone(R.id.fl_return, false);
break;
case 400:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.fl_return, false);
// helper.setGone(R.id.fl_return, false);
break;
case 500:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.fl_get, false);
helper.setGone(R.id.fl_return, false);
// helper.setGone(R.id.fl_return, false);
break;
case 600:
helper.setGone(R.id.ll_btn, true);
......@@ -88,6 +88,9 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
if (!WorkUtils.hasPermission(PagePermissionType.FO_ENTER_PAGE.getPermission())) {
helper.setGone(R.id.fl_add, false);
}
if (!WorkUtils.hasPermission(PagePermissionType.FO_RETURN_LIST.getPermission())) {
helper.setGone(R.id.fl_return, false);
}
changeStats(helper, item.getProductId());
}
private void changeStats(BaseViewHolder helper, int productId) {
......
app/src/main/res/layout/activity_return_add.xml
浏览文件 @ dd47f531
......@@ -103,6 +103,7 @@
android:textSize="14sp" />
<ImageView
android:id="@+id/iv_choose_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/arrow_right_gray" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论