Skip to content

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

1.外采购添加领料退回和领料申请

上级 3312053c
显示空白字符变更
内嵌 并排
正在显示 包含 201 行增加 和 20 行删除
app/src/main/java/com/wd/workoffice/bean/workEnum/PagePermissionType.java
浏览文件 @ f79987f0
......@@ -116,6 +116,11 @@ public enum PagePermissionType {
PO_RECEIPT_AUDIT("order:po:receipt-invoice-apply:audit", "收票审核"),
PO_RETURN_FLOW_LIST("order:return-apply-flow:list", "退货流水"),//po无展示
PO_RETURN_SAVE("order:po:return-apply:apply:save", "发起退货申请"),
PO_PICK_RETURN_LIST("order:po:pick-return-apply:page:list", "领料退回申请列表"),
PO_PICK_APPLY_LIST("order:po:pick-apply:page:list", "领料申请列表"),
PO_PICK_RETURN_SAVE("order:po:pick-return-apply:apply:save", "发起领料退回申请"),
PO_PICK_APPLY_AUDIT("order:po:pick-apply:apply:audit", "领料审核"),
PO_PICK_RETURN_EDIT("order:po:pikc-return-apply:edit", "领料退回审核"),
//供应订单
FO_SUPPLIER_LIST("app:order:supplier-order:page:list", "订单列表"),
FO_SUPPLIER_DETAILS("order:suppplier-order:details", "订单详情"),
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ f79987f0
......@@ -1289,6 +1289,13 @@ public interface ApiService {
*/
@GET("/pick-apply/io/page/list")
Observable<BaseBean> pickIoApplyList(@QueryMap Map<String, Object> param);
/**
* 获取供应订单领料申请分页列表
*
* @return
*/
@GET("/pick-apply/po/page/list")
Observable<BaseBean> pickPoApplyList(@QueryMap Map<String, Object> param);
/**
* 获取发货申请分页列表
......@@ -1337,6 +1344,13 @@ public interface ApiService {
*/
@PUT("/pick-apply/io/status")
Observable<BaseBean> pickIoApplyCheck(@Body RequestBody requestBody);
/**
* 审批领料申请
*
* @return
*/
@PUT("/pick-apply/po/status")
Observable<BaseBean> pickPoApplyCheck(@Body RequestBody requestBody);
/**
* 审批发货申请
......@@ -1387,6 +1401,14 @@ public interface ApiService {
@GET("/pick-apply/io/item/list")
Observable<BaseBean> pickIoApplyDetail(@Query("applyId") String applyId);
/**
* _获取领料申请详细信息列表
*
* @return
*/
@GET("/pick-apply/po/item/list")
Observable<BaseBean> pickPoApplyDetail(@Query("applyId") String applyId);
/**
* _step6_1发起发货申请
*
......@@ -1420,6 +1442,14 @@ public interface ApiService {
@POST("/procedureStart/io/applyOutStock/{orderId}")
Observable<BaseBean> pickIoApply(@Path("orderId")String orderId, @Body RequestBody requestBody);
/**
* 领料
*
* @return
*/
@POST("/procedureStart/po/applyPick/{orderId}")
Observable<BaseBean> pickPoApply(@Path("orderId")String orderId, @Body RequestBody requestBody);
/**
* _step6_1发起发货申请
*
......@@ -1571,6 +1601,13 @@ public interface ApiService {
*/
@GET("returnApply/fo/pick-return/page/list")
Observable<BaseBean> returnPickList(@QueryMap Map<String, Object> param);
/**
* 领料退回
*
* @return
*/
@GET("returnApply/po/pick-return/page/list")
Observable<BaseBean> returnPoPickList(@QueryMap Map<String, Object> param);
/**
* step7_6 发送订单退货申请
......@@ -1588,6 +1625,14 @@ public interface ApiService {
*/
@POST("/procedureStart/fo/pickReturn/{id}")
Observable<BaseBean> pickReturnFoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* 领料退回申请
* f
*
* @return
*/
@POST("/procedureStart/po/pickReturn/{id}")
Observable<BaseBean> pickReturnPoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* step7_6 发送订单退货申请
......@@ -1605,6 +1650,7 @@ public interface ApiService {
@POST("/procedureStart/so/applyReturn/{id}")
Observable<BaseBean> returnSoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* 退货新增查询部门
*
......@@ -1913,6 +1959,15 @@ public interface ApiService {
@PUT("/returnApply/fo/pick-return/audit/group/{applyId}")
Observable<BaseBean> foGroupPickReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 集团审核
*
* @return
*/
@PUT("/returnApply/po/pick-return/audit/group/{applyId}")
Observable<BaseBean> poGroupPickReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 获取一个订单子表的全部流水
*
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/BackActivity.java
浏览文件 @ f79987f0
......@@ -82,6 +82,8 @@ public class BackActivity extends WorkToolBarActivity {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().returnPickList(param);
}else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())){
observable = RtfUtils.getRtf().returnPoPickList(param);
} else {
observable = RtfUtils.getRtf().returnPickList(param);
}
......@@ -184,13 +186,17 @@ public class BackActivity extends WorkToolBarActivity {
public boolean onCreateOptionsMenu(Menu menu) {
String orderType = getIntent().getStringExtra("orderType");
String num = getIntent().getStringExtra("num");
if (Double.valueOf(num) == 0d) {
if (Double.parseDouble(num) == 0d) {
return super.onCreateOptionsMenu(menu);
}
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.FO_PICK_RETURN_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())){
if (WorkUtils.hasPermission(PagePermissionType.PO_PICK_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/BackAddActivity.java
浏览文件 @ f79987f0
......@@ -41,7 +41,7 @@ import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* 添加领料退回-只有供应订单用到了
* 添加领料退回-只有供应订单和外采购用到了
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......@@ -77,6 +77,16 @@ public class BackAddActivity extends WorkToolBarActivity {
EditText etLot;
@BindView(R.id.ll_lot)
LinearLayout llLot;
@BindView(R.id.tv_action)
TextView tvAction;
@BindView(R.id.ll_action)
LinearLayout llAction;
@BindView(R.id.tv_return_type_desc)
TextView tvReturnTypeDesc;
@BindView(R.id.tv_stock_desc)
TextView tvStockDesc;
@BindView(R.id.tv_remark_desc)
TextView tvRemarkDesc;
private Map<String, Object> param;
private String orderType;
private List<String> typeList = new ArrayList<>();
......@@ -124,6 +134,7 @@ public class BackAddActivity extends WorkToolBarActivity {
deptDialog = DialogUtils.listDialog(this);
WorkUtils.addDecimalsListener(etNum);
WorkUtils.addNumListener(etRemark, tvRemarkNum);
llAction.setVisibility(View.GONE);
}
private void changeView() {
......@@ -291,7 +302,7 @@ public class BackAddActivity extends WorkToolBarActivity {
List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
for (OrderDetail.OrderItemsBean orderItem : orderItems) {
if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(Double.valueOf(orderItem.getCanPickReturnProductSum()))) == 1) {
if (new BigDecimal(Double.parseDouble(num)).compareTo(new BigDecimal(Double.parseDouble(orderItem.getCanPickReturnProductSum()))) == 1) {
toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanPickReturnProductSum(), 3)));
return;
}
......@@ -317,11 +328,13 @@ public class BackAddActivity extends WorkToolBarActivity {
}
param.put("backStockId", chooseDep);
}
param.put("action", 1);
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
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));
// if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
// observable = RtfUtils.getRtf().returnSoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
// } else
if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().pickReturnPoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().pickReturnFoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/BackDetailActivity.java
浏览文件 @ f79987f0
......@@ -37,7 +37,7 @@ import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* 领料退回详情-只有供应订单用到了
* 领料退回详情-只有供应订单和外采购用到了
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......@@ -175,7 +175,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
llCheck.setVisibility(View.GONE);
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (status.startsWith("1") && !status.endsWith("4")) {
if (status.startsWith("1") && !status.endsWith("5")) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
} else {
......@@ -185,7 +185,7 @@ public class BackDetailActivity 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")) {
if (status.startsWith("1") && !status.endsWith("5")) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
} else {
......@@ -314,7 +314,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
// }
// }
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT.getPermission());
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_PICK_RETURN_EDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_PICK_RETURN_EDIT.getPermission());
}
......@@ -362,7 +362,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
private void check(int status, String remark, int id) {
Map<String, Object> param = WorkUtils.simpleParam();
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
param.put("status", status == 1 ? Integer.valueOf(info.getStatus()) + 1 : Integer.valueOf(info.getStatus()) + 11);
param.put("status", status == 1 ? Integer.parseInt(info.getStatus()) + 1 : Integer.parseInt(info.getStatus()) + 11);
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
param.put("status", status);
param.put("productAmount", info.getProductAmount());
......@@ -387,7 +387,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().soReturnApply(id + "", WorkUtils.convertMapToBody(param));
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
observable = RtfUtils.getRtf().poGroupPickReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().foGroupPickReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ f79987f0
......@@ -137,6 +137,12 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
TextView tvSaleType;
@BindView(R.id.ll_sale_type)
LinearLayout llSaleType;
@BindView(R.id.tv_pick_apply)
TextView tvPickApply;
@BindView(R.id.view_pick_apply)
View viewPickApply;
@BindView(R.id.fl_pick_apply)
FrameLayout flPickApply;
private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter;
......@@ -247,7 +253,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
tvTime.setText(dataBean.getCreatedTime());
tvSendTime.setText(dataBean.getRequireTime());
tvOrderDesc.setText(dataBean.getAttrName());
tvSaleType.setText(TextUtils.equals(dataBean.getSaleType(),"1")?"直接销货":"生产领用");
tvSaleType.setText(TextUtils.equals(dataBean.getSaleType(), "1") ? "直接销货" : "生产领用");
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
tvSupplier.setText(dataBean.getSupplierName());
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
......@@ -387,7 +393,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "",
_TITLE,"退货/报废申请列表");
_TITLE, "退货/报废申请列表");
break;
case R.id.tv_flow:
startActivity(ProFlowActivity.class,
......@@ -400,6 +406,21 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
"orderItemId", proList.get(position).getId(),
"info", JSON.toJSONString(proList.get(position)));
break;
case R.id.tv_back:
startActivity(BackActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"enterStockType", dataBean.getEnterStockType(),
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", proList.get(position).getCanPickReturnProductSum(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanPickReturnProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
}
}
});
......@@ -411,7 +432,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.ll_see_more, R.id.rl_set, 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.rl_set, R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_see_more:
......@@ -465,6 +486,16 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
}
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;
case R.id.tv_finish_apply:
if (dataBean == null) {
toast("正在加载中，请稍后");
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/PickApplyActivity.java
浏览文件 @ f79987f0
......@@ -89,6 +89,10 @@ public class PickApplyActivity extends WorkToolBarActivity {
if (WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_LIST.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_PICK_APPLY_LIST.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/PickApplyAddActivity.java
浏览文件 @ f79987f0
......@@ -162,6 +162,7 @@ public class PickApplyAddActivity extends WorkToolBarActivity {
}
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
param.put("orderType", dataBean.getExpandInfo().getOrderType());
dataAdapter.setOrderType(dataBean.getExpandInfo().getOrderType());
dataList.addAll(dataBean.getOrderItems());
dataAdapter.notifyDataSetChanged();
......@@ -241,6 +242,8 @@ public class PickApplyAddActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().pickApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().pickIoApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().pickPoApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().pickApply(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/PickApplyDetailActivity.java
浏览文件 @ f79987f0
......@@ -91,10 +91,10 @@ public class PickApplyDetailActivity extends WorkToolBarActivity {
boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_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())) {
// else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
// hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getPermission());
// }
if (!hasPermission) {
......@@ -137,6 +137,8 @@ public class PickApplyDetailActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().pickApplyDetail(id);
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().pickIoApplyDetail(id);
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().pickPoApplyDetail(id);
}else {
observable = RtfUtils.getRtf().pickApplyDetail(id);
}
......@@ -230,6 +232,8 @@ public class PickApplyDetailActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.IN.getCode())){
observable = RtfUtils.getRtf().pickIoApplyCheck(WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())){
observable = RtfUtils.getRtf().pickPoApplyCheck(WorkUtils.convertMapToBody(param));
}else {
observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param));
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java
浏览文件 @ f79987f0
......@@ -50,6 +50,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow);
helper.addOnClickListener(R.id.tv_add);
helper.addOnClickListener(R.id.tv_back);
switch (status) {
// "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"};
......@@ -100,7 +101,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
helper.setGone(R.id.fl_get, false);
}
helper.setGone(R.id.fl_back, WorkUtils.hasPermission(PagePermissionType.PO_PICK_RETURN_LIST.getPermission()));
changeStats(helper, item.getProductId());
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkSendApplyAddAdapter.java
浏览文件 @ f79987f0
package com.wd.workoffice.ui.adapter;
import android.text.TextUtils;
import android.widget.CheckBox;
import android.widget.CompoundButton;
......@@ -9,7 +10,10 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.SendWeightEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.widget.AddAndReduceView;
import org.greenrobot.eventbus.EventBus;
......@@ -26,6 +30,7 @@ public class WorkSendApplyAddAdapter extends BaseQuickAdapter<OrderDetail.OrderI
Map<Integer, Boolean> isChoose = new HashMap<>();
int type;// 0发货 1 领料
String orderType;
public WorkSendApplyAddAdapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -61,7 +66,19 @@ public class WorkSendApplyAddAdapter extends BaseQuickAdapter<OrderDetail.OrderI
helper.setText(R.id.tv_send_num, String.format("已发货：%s", MathUtils.converData(item.getShipSum(), 3)));
}
AddAndReduceView nrcNum = helper.getView(R.id.arv_num);
if (type==1){
if (!TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
nrcNum.setMaxNum(item.getCanOutStoreProductSum());
helper.setText(R.id.tv_apply_send_num, MathUtils.converData(item.getCanOutStoreProductSum(), 3));
} else {
nrcNum.setMaxNum(item.getCanUseProductSum());
helper.setText(R.id.tv_apply_send_num, MathUtils.converData(item.getCanUseProductSum(), 3));
}
}else {
nrcNum.setMaxNum(item.getCanOutStoreProductSum());
helper.setText(R.id.tv_apply_send_num, MathUtils.converData(item.getCanOutStoreProductSum(), 3));
}
nrcNum.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
@Override
public void OnNumberChanged(String vs) {
......@@ -87,5 +104,13 @@ public class WorkSendApplyAddAdapter extends BaseQuickAdapter<OrderDetail.OrderI
public void setIsChoose(Map<Integer, Boolean> isChoose) {
this.isChoose = isChoose;
}
public String getOrderType() {
return orderType;
}
public void setOrderType(String orderType) {
this.orderType = orderType;
}
}
app/src/main/java/com/wd/workoffice/ui/fg/PickApplyFragment.java
浏览文件 @ f79987f0
......@@ -92,6 +92,9 @@ public class PickApplyFragment extends WorkBaseFg {
} 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_PICK_APPLY_LIST.getPermission()) &&
WorkUtils.hasPermission(PagePermissionType.PO_PICK_APPLY_AUDIT.getPermission());
}
dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged();
......@@ -114,6 +117,8 @@ public class PickApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().pickApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().pickIoApplyList(param);
}else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().pickPoApplyList(param);
}else {
observable = RtfUtils.getRtf().pickApplyList(param);
}
......@@ -238,6 +243,8 @@ public class PickApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.IN.getCode())){
observable = RtfUtils.getRtf().pickIoApplyCheck(WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())){
observable = RtfUtils.getRtf().pickPoApplyCheck(WorkUtils.convertMapToBody(param));
}else {
observable = RtfUtils.getRtf().pickApplyCheck(WorkUtils.convertMapToBody(param));
}
......
app/src/main/res/layout/activity_out_order.xml
浏览文件 @ f79987f0
......@@ -150,7 +150,34 @@
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_pick_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:tag="order:fo:pick-apply:page:list">
<TextView
android:id="@+id/tv_pick_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="申请领料"
android:textColor="@color/white" />
<View
android:id="@+id/view_pick_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle"
android:visibility="gone" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论