Skip to content

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

1.物流回款收款，最大金额显示

上级 20bbf81a
隐藏空白字符变更
内嵌 并排
正在显示 包含 129 行增加 和 20 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ c3af98bc
......@@ -936,6 +936,22 @@ public interface ApiService {
@POST("/moneyPayApply/apply")
Observable<BaseBean> moneyPayApply(@Body RequestBody requestBody);
/**
* 可申请回款金额的最大值
*
* @return
*/
@POST("/moneyBackApply/enableAmount")
Observable<BaseBean> backEnableAmount(@Body RequestBody requestBody);
/**
* 可申请付款金额的最大值
*
* @return
*/
@POST("/moneyPayApply/enableAmount")
Observable<BaseBean> payEnableAmount(@Body RequestBody requestBody);
/**
* 审批回款
* orderType
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialMoneyAddActivity.java
浏览文件 @ c3af98bc
......@@ -3,9 +3,7 @@ package com.wd.workoffice.ui.activity.bat.work;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
......@@ -22,11 +20,13 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
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;
import java.math.BigDecimal;
import java.util.Map;
import androidx.annotation.Nullable;
......@@ -64,12 +64,17 @@ public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
EditText etPrice;
@BindView(R.id.tv_desc)
TextView tvDesc;
@BindView(R.id.tv_can_price)
TextView tvCanPrice;
@BindView(R.id.ll_can_price)
LinearLayout llCanPrice;
private Map<String, Object> param;
private Integer clientId;
private QMUIDialog.MenuDialogBuilder typeDialog;
String[] typeList = new String[]{"销售订单", "外采购订单", "组装订单"};
String[] supplierTypeList = new String[]{"外采购订单", "供应订单"};
private String chooseType;
private String maxPrice;
@Override
protected void initView() {
......@@ -86,6 +91,7 @@ public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
chooseType = WorkUtils.getOrderCode(supplierTypeList[which]);
tvOrder.setText(supplierTypeList[which]);
dialog.dismiss();
getMaxPrice();
}
});
} else {
......@@ -95,10 +101,11 @@ public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
chooseType = WorkUtils.getOrderCode(typeList[which]);
tvOrder.setText(typeList[which]);
dialog.dismiss();
getMaxPrice();
}
});
}
WorkUtils.addNumListener(etRemark,tvRemarkNum);
WorkUtils.addNumListener(etRemark, tvRemarkNum);
}
@Override
......@@ -157,7 +164,7 @@ public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
case R.id.rl_client:
if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
startActivityForResult(StoreSaleClientActivity.class, 10002,
"code", "SUPPLIER","supplier","选择供应商","depId",UserKeeper.getInstance().getUserDepId(), "flag", "1");
"code", "SUPPLIER", "supplier", "选择供应商", "depId", UserKeeper.getInstance().getUserDepId(), "flag", "1");
} else {
startActivityForResult(MoneyAddClientActivity.class, 10001);
}
......@@ -178,6 +185,14 @@ public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
toast("请输入金额");
return;
}
if (TextUtils.isEmpty(maxPrice)) {
BigDecimal maxPriceDecimal = new BigDecimal(Double.valueOf(maxPrice));
BigDecimal priceDecimal = new BigDecimal(Double.valueOf(etPrice.getText().toString()));
if (maxPriceDecimal.compareTo(priceDecimal) == 1) {
toast(String.format("可申请金额最大为%s", MathUtils.converData(maxPrice, 3)));
return;
}
}
param.put("applyRemark", etRemark.getText().toString());
param.put("applyDept", UserKeeper.getInstance().getUserDepId());
param.put("orderType", chooseType);
......@@ -194,11 +209,53 @@ public class WorkFinancialMoneyAddActivity extends WorkToolBarActivity {
String clientName = data.getStringExtra("clientName");
clientId = data.getIntExtra("id", 0);
tvClient.setText(clientName);
getMaxPrice();
} else if (requestCode == 10002 && resultCode == 10002) {
String depName = data.getStringExtra("clientName");
clientId = data.getIntExtra("id", 0);
tvClient.setText(depName);
getMaxPrice();
}
}
private void getMaxPrice() {
if (clientId == null || TextUtils.isEmpty(chooseType)) {
return;
}
Map<String, Object> param = WorkUtils.simpleParam();
param.put("applyDept", UserKeeper.getInstance().getUserDepId());
param.put("orderType", chooseType);
Observable<BaseBean> observable;
if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
param.put("supplierId", clientId);
observable = RtfUtils.getRtf().payEnableAmount((WorkUtils.convertMapToBody(param)));
} else {
param.put("customerId", clientId);
observable = RtfUtils.getRtf().backEnableAmount((WorkUtils.convertMapToBody(param)));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
maxPrice = MathUtils.converData(data.getData().toString(), 3);
tvCanPrice.setText(maxPrice);
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialOutActivity.java
浏览文件 @ c3af98bc
......@@ -62,7 +62,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override
protected void initView() {
ButterKnife.bind(this);
FinancialOutFilterData filterData = new FinancialOutFilterData(this,ddmChoose, new ThreeMenuClickListener() {
FinancialOutFilterData filterData = new FinancialOutFilterData(this, ddmChoose, new ThreeMenuClickListener() {
@Override
public void clickOne(String value) {
param.put("orderType", WorkUtils.getOrderCode(value));
......@@ -100,7 +100,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkFinancialOutAdapter(R.layout.item_financial_out, dataList,1);
dataAdapter = new WorkFinancialOutAdapter(R.layout.item_financial_out, dataList, 1);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
......@@ -172,18 +172,18 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class,
"type","1","detail",JSON.toJSONString(dataList.get(position)));
"type", "1", "detail", JSON.toJSONString(dataList.get(position)));
}
});
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
switch (view.getId()){
switch (view.getId()) {
case R.id.btn_agree:
checkDialog(i,1);
checkDialog(i, 1);
break;
case R.id.btn_refuse:
checkDialog(i,2);
checkDialog(i, 2);
break;
}
}
......@@ -199,7 +199,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -209,7 +209,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
toast("请填写备注");
return;
}
check(status, etRemark.getText().toString(),position);
check(status, etRemark.getText().toString(), position);
addCartDialog.dismiss();
}
});
......@@ -225,10 +225,10 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
private void check(int status, String remark, int position) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("status",status);
param.put("auditRemark",remark);
param.put("status", status);
param.put("auditRemark", remark);
param.put("id", dataList.get(position).getId());
param.put("applyAmount", dataList.get(position).getApplyAmount());
param.put("applyAmount", dataList.get(position).getApplyAmount());
RtfUtils.getRtf().checkMoneyBack(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
......@@ -248,11 +248,12 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
return;
}
toast("操作成功");
dataList.get(position).setStatus(status+"");
dataList.get(position).setStatus(status + "");
dataAdapter.notifyItemChanged(position);
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_work_pro;
......@@ -260,9 +261,9 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_APPLY.getPermission())){
if (!WorkUtils.hasPermission(PagePermissionType.MONEY_BACK_APPLY.getPermission())) {
return super.onCreateOptionsMenu(menu);
}else {
} else {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
return super.onCreateOptionsMenu(menu);
......@@ -272,7 +273,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
startActivity(WorkFinancialMoneyAddActivity.class);
startActivity(WorkFinancialMoneyAddActivity.class);
break;
}
return super.onOptionsItemSelected(item);
......
app/src/main/res/layout/activity_financial_money_add.xml
浏览文件 @ c3af98bc
......@@ -98,7 +98,41 @@
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_can_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="可申请金额"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_can_price"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:inputType="numberDecimal"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/rl_price"
android:layout_width="match_parent"
......
app/src/main/res/layout/activity_work_warehouse_order_detail.xml
浏览文件 @ c3af98bc
......@@ -216,7 +216,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
android:paddingHorizontal="10mm"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论