Skip to content

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

1.修改仓库选择 

2.//todo  回款管理的客户接口
上级 e8f6fbed
隐藏空白字符变更
内嵌 并排
正在显示 包含 112 行增加 和 18 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 4de10c3e
......@@ -295,6 +295,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"customerId", dataBean.getCustomerId()+"",
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 4de10c3e
......@@ -249,6 +249,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"customerId", dataBean.getCustomerId()+"",
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 4de10c3e
......@@ -310,6 +310,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"customerId", dataBean.getCustomerId()+"",
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @ 4de10c3e
......@@ -119,6 +119,7 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"from", "1",
"customerId", dataBean.getCustomerId()+"",
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ 4de10c3e
......@@ -285,6 +285,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"customerId", dataBean.getCustomerId()+"",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 4de10c3e
......@@ -263,6 +263,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"customerId", dataBean.getCustomerId()+"",
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyActivity.java
浏览文件 @ 4de10c3e
......@@ -110,6 +110,7 @@ public class UseApplyActivity extends WorkToolBarActivity {
case R.id.add:
startActivity(UseApplyAddActivity.class,
"num", getIntent().getStringExtra("num"),
"customerId",getIntent().getStringExtra("customerId"),
"orderType", getIntent().getStringExtra("orderType"),
"productId", getIntent().getStringExtra("productId"),
"orderItemId", getIntent().getStringExtra("orderItemId"),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyAddActivity.java
浏览文件 @ 4de10c3e
package com.wd.workoffice.ui.activity.bat.order;
import android.text.Editable;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
......@@ -11,10 +13,13 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.bean.event.CheckUseEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.store.ChooseStockActivity;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -25,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
......@@ -51,20 +57,31 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
EditText etRemark;
@BindView(R.id.tv_remark_num)
TextView tvRemarkNum;
@BindView(R.id.tv_stock)
TextView tvStock;
@BindView(R.id.tv_stock_content)
TextView tvStockContent;
@BindView(R.id.ll_stock)
LinearLayout llStock;
private Map<String, Object> param;
private String orderType;
private OrderDetail dataBean;
private StockBean chooseStock;
@Override
protected void initView() {
ButterKnife.bind(this);
WorkUtils.addDecimalsListener(etNum);
WorkUtils.addNumListener(etRemark, tvRemarkNum);
}
@Override
protected void initData() {
orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(orderType, OrderType.SALE.getCode())||TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
llStock.setVisibility(View.VISIBLE);
}
// tvNum.setText(String.format("最大领用数量(%s)", getIntent().getStringExtra("num")));
param = new HashMap<>();
param.put("productId", getIntent().getStringExtra("productId"));
......@@ -96,7 +113,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
observable = RtfUtils.getRtf().productOrderDetail(getIntent().getStringExtra("id"), "1");
}else {
} else {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "1");
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......@@ -136,12 +153,6 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
}
@OnClick(R.id.tv_bottom)
public void onViewClicked() {
submit();
}
private void submit() {
String num = etNum.getText().toString();
String remark = etRemark.getText().toString();
......@@ -149,12 +160,12 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
toast("请输入领用数量");
return;
}
if (dataBean!=null) {
if (dataBean != null) {
List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
for (OrderDetail.OrderItemsBean orderItem : orderItems) {
if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
if (new BigDecimal(num).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) ==1){
toast(String.format("可申请领用数量最大为%s",MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
if (new BigDecimal(num).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) == 1) {
toast(String.format("可申请领用数量最大为%s", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
return;
}
}
......@@ -164,6 +175,13 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
param.put("productAmount", num);
param.put("orderId", getIntent().getStringExtra("id"));
param.put("applyRemark", remark);
if (TextUtils.equals(orderType, OrderType.SALE.getCode())||TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (chooseStock==null){
toast("请选择领用仓库");
return;
}
param.put("usedStockId", chooseStock.getId());
}
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().useApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
......@@ -200,5 +218,29 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
});
}
@OnClick({R.id.tv_bottom, R.id.ll_stock})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_bottom:
submit();
break;
case R.id.ll_stock:
startActivityForResult(ChooseStockActivity.class, 10001,
"siteType","OUT","customerId",getIntent().getStringExtra("customerId"));
break;
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10005) {
chooseStock = JSON.parseObject(data.getStringExtra("stock"), StockBean.class);
tvStockContent.setText(chooseStock.getName());
}
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseInfoActivity.java
浏览文件 @ 4de10c3e
......@@ -344,10 +344,20 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_send_stock:
startActivityForResult(ChooseStockActivity.class, 10005);
if (clientId == null) {
toast("请选择客户");
return;
}
startActivityForResult(ChooseStockActivity.class, 10005,"siteType","OUT"
,"customerId",clientId.toString());
break;
case R.id.ll_in_stock:
startActivityForResult(ChooseStockActivity.class, 10004);
// if (clientId == null) {
// toast("请选择客户");
// return;
// }
startActivityForResult(ChooseStockActivity.class, 10004,"siteType","IN"
);
break;
case R.id.ll_client:
switch (type) {
......@@ -394,13 +404,13 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
switch (type) {
case "1":
if (clientId == null) {
toast("请选择用户");
toast("请选择客户");
return;
}
break;
case "2":
if (clientId == null) {
toast("请选择用户");
toast("请选择客户");
return;
}
break;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseStockActivity.java
浏览文件 @ 4de10c3e
......@@ -46,6 +46,7 @@ public class ChooseStockActivity extends WorkToolBarActivity {
SmartRefreshLayout srlRefresh;
private List<StockBean> dataList;
private StockAdapter dataAdapter;
private Map<String, Object> param;
@Override
protected void initView() {
......@@ -60,12 +61,15 @@ public class ChooseStockActivity extends WorkToolBarActivity {
dataAdapter = new StockAdapter(R.layout.item_store_client, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.simpleParam();
param.put("deptId", UserKeeper.getInstance().getUserDepId());
param.put("siteType", getIntent().getStringExtra("siteType"));
param.put("customerId", getIntent().getStringExtra("customerId"));
param.put("sign","");
getData();
}
private void getData() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("deptId", UserKeeper.getInstance().getUserDepId());
RtfUtils.getRtf().getStock(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
......
app/src/main/res/layout/activity_use_apply_add.xml
浏览文件 @ 4de10c3e
......@@ -30,7 +30,38 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_stock"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:background="@color/white"
android:gravity="center_vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:id="@+id/tv_stock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="领用仓库"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_stock_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="请选择领用仓库"
android:textColor="#FF5E6D82"
android:textSize="14sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_blue" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论