Skip to content

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

1.修改领用逻辑 

2.修改红点样式
上级 c91ccd13
显示空白字符变更
内嵌 并排
正在显示 包含 164 行增加 和 37 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 984fc0a7
......@@ -970,7 +970,7 @@
<activity
android:name=".ui.activity.bat.order.UseApplyActivity"
android:configChanges="keyboardHidden|orientation"
android:label="领用申请详情"
android:label="领用申请列表"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
......
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
浏览文件 @ 984fc0a7
......@@ -91,6 +91,24 @@ public class OrderDetail {
private String supplierName;
private String enterStockType;
private String inStockName;
private String usedStore;
private String usedStoreName;
public String getUsedStoreName() {
return usedStoreName;
}
public void setUsedStoreName(String usedStoreName) {
this.usedStoreName = usedStoreName;
}
public String getUsedStore() {
return usedStore;
}
public void setUsedStore(String usedStore) {
this.usedStore = usedStore;
}
public String getInStockName() {
return inStockName;
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 984fc0a7
......@@ -2017,4 +2017,28 @@ public interface ApiService {
@GET("order/wait-approval-status")
Observable<BaseBean> orderProCheckStatus(@Query("orderId") String orderId);
/**
* 设置销售订单领用仓库
*
* @return
*/
@PUT("/useApply/so/usedStore")
Observable<BaseBean> soUsedStore(@Body RequestBody requestBody);
/**
* 设置外采购订单领用仓库
*
* @return
*/
@PUT("/useApply/po/usedStore")
Observable<BaseBean> poUsedStore(@Body RequestBody requestBody);
/**
* 组装订单领用仓库
*
* @return
*/
@PUT("/useApply/ao/usedStore")
Observable<BaseBean> aoUsedStore(@Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 984fc0a7
......@@ -325,6 +325,8 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 984fc0a7
......@@ -282,6 +282,8 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 984fc0a7
......@@ -338,6 +338,8 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @ 984fc0a7
......@@ -125,6 +125,8 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnAddActivity.java
浏览文件 @ 984fc0a7
......@@ -279,14 +279,14 @@ public class ReturnAddActivity extends WorkToolBarActivity {
for (OrderDetail.OrderItemsBean orderItem : orderItems) {
if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
if (TextUtils.isEmpty(enterStockType)) {
if (new BigDecimal(num).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) == 1) {
if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) == 1) {
toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
return;
}
} else {
String returnNum = TextUtils.equals(enterStockType, "1") ?
orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
if (new BigDecimal(num).compareTo(new BigDecimal(returnNum)) == 1) {
if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(returnNum)) == 1) {
toast(String.format("可申请退货数量最大为%s", MathUtils.converData(returnNum, 3)));
return;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ 984fc0a7
......@@ -314,6 +314,8 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 984fc0a7
......@@ -298,6 +298,8 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"usedStore",dataBean.getUsedStore(),
"usedStoreName",dataBean.getUsedStore(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyActivity.java
浏览文件 @ 984fc0a7
......@@ -61,6 +61,7 @@ public class UseApplyActivity extends WorkToolBarActivity {
bundle.putString("simpleCode", getIntent().getStringExtra("simpleCode"));
bundle.putString("product", getIntent().getStringExtra("product"));
bundle.putString("orderItemId", getIntent().getStringExtra("orderItemId"));
bundle.putString("usedStore", getIntent().getStringExtra("usedStore"));
saleFragment.setArguments(bundle);
data.add(saleFragment);
......@@ -115,6 +116,7 @@ public class UseApplyActivity extends WorkToolBarActivity {
"productId", getIntent().getStringExtra("productId"),
"orderItemId", getIntent().getStringExtra("orderItemId"),
"simpleCode", getIntent().getStringExtra("simpleCode"),
"usedStoreName", getIntent().getStringExtra("usedStoreName"),
"id", getIntent().getStringExtra("orderId"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyAddActivity.java
浏览文件 @ 984fc0a7
......@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -13,7 +14,6 @@ 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;
......@@ -63,10 +63,14 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
TextView tvStockContent;
@BindView(R.id.ll_stock)
LinearLayout llStock;
@BindView(R.id.iv_stock_arrow)
ImageView ivStockArrow;
private Map<String, Object> param;
private String orderType;
private OrderDetail dataBean;
private StockBean chooseStock;
private String usedStore;
private String usedStoreName;
@Override
protected void initView() {
......@@ -79,10 +83,9 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
@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")));
usedStore = getIntent().getStringExtra("usedStore");
usedStoreName = getIntent().getStringExtra("usedStoreName");
changeStockView();
param = new HashMap<>();
param.put("productId", getIntent().getStringExtra("productId"));
param.put("orderItemId", getIntent().getStringExtra("orderItemId"));
......@@ -91,6 +94,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
getNum();
}
@Override
protected void initEvent() {
}
......@@ -143,6 +147,9 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
}
}
usedStore = dataBean.getUsedStore();
usedStoreName = dataBean.getUsedStoreName();
changeStockView();
}
});
}
......@@ -156,32 +163,9 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
private void submit() {
String num = etNum.getText().toString();
String remark = etRemark.getText().toString();
if (TextUtils.isEmpty(num)) {
toast("请输入领用数量");
return;
}
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)));
return;
}
}
}
}
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));
......@@ -222,11 +206,42 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_bottom:
String num = etNum.getText().toString();
if (TextUtils.isEmpty(num)) {
toast("请输入领用数量");
return;
}
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(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) == 1) {
toast(String.format("可申请领用数量最大为%s", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
return;
}
}
}
}
if (TextUtils.equals(orderType, OrderType.SALE.getCode()) || TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())
|| TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
if (TextUtils.isEmpty(usedStore)) {
addStock();
} else {
submit();
}
}
break;
case R.id.ll_stock:
if (TextUtils.equals(orderType, OrderType.SALE.getCode()) || TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())
|| TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
if (TextUtils.isEmpty(usedStore)) {
startActivityForResult(ChooseStockActivity.class, 10001,
"siteType","OUT","customerId",getIntent().getStringExtra("customerId"));
"siteType", "OUT", "customerId", getIntent().getStringExtra("customerId"));
}
}
break;
}
}
......@@ -243,4 +258,59 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
break;
}
}
private void changeStockView() {
if (TextUtils.equals(orderType, OrderType.SALE.getCode()) || TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())
|| TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
if (TextUtils.isEmpty(usedStore)) {
ivStockArrow.setVisibility(View.VISIBLE);
} else {
ivStockArrow.setVisibility(View.GONE);
tvStockContent.setText(usedStoreName);
}
llStock.setVisibility(View.VISIBLE);
}
}
private void addStock() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("orderId", getIntent().getStringExtra("id"));
if (chooseStock == null) {
toast("请选择领用仓库");
return;
}
param.put("usedStore", chooseStock.getId());
showLoading();
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().soUsedStore(WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().poUsedStore(WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
observable = RtfUtils.getRtf().aoUsedStore(WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().aoUsedStore(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;
}
submit();
}
});
}
}
app/src/main/res/layout/activity_crucible_order.xml
浏览文件 @ 984fc0a7
......@@ -100,7 +100,7 @@
android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:layout_marginTop="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
......
app/src/main/res/layout/activity_inside_order.xml
浏览文件 @ 984fc0a7
......@@ -107,7 +107,7 @@
android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:layout_marginTop="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
......
app/src/main/res/layout/activity_out_order.xml
浏览文件 @ 984fc0a7
......@@ -108,7 +108,7 @@
android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:layout_marginTop="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
......
app/src/main/res/layout/activity_sale_order.xml
浏览文件 @ 984fc0a7
......@@ -109,7 +109,7 @@
android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
......
app/src/main/res/layout/activity_supplier_order.xml
浏览文件 @ 984fc0a7
......@@ -106,7 +106,7 @@
android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:layout_marginTop="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
......
app/src/main/res/layout/activity_use_apply_add.xml
浏览文件 @ 984fc0a7
......@@ -58,6 +58,7 @@
android:textSize="14sp" />
<ImageView
android:id="@+id/iv_stock_arrow"
android:layout_width="20mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_blue" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论