Skip to content

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

1.修改bug 

2.TODO 三个功能测试，下单新增唛头
上级 9243a761
显示空白字符变更
内嵌 并排
正在显示 包含 17 行增加 和 35 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/BackAddActivity.java
浏览文件 @ de195379
......@@ -218,14 +218,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 (TextUtils.isEmpty(enterStockType)) {
tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
} else {
String returnNum = TextUtils.equals(enterStockType, "1") ?
orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(returnNum, 3)));
}
tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanPickReturnProductSum(), 3)));
}
}
}
......@@ -321,7 +314,7 @@ public class BackAddActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().returnPoAdd(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 {
} else {
observable = RtfUtils.getRtf().pickReturnFoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnAddActivity.java
浏览文件 @ de195379
......@@ -211,6 +211,7 @@ public class ReturnAddActivity extends WorkToolBarActivity {
List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
for (OrderDetail.OrderItemsBean orderItem : orderItems) {
if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
if (!TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {// 0805新增 额外判断供应订单 不修改旧逻辑
if (TextUtils.isEmpty(enterStockType)) {
tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
} else {
......@@ -218,6 +219,9 @@ public class ReturnAddActivity extends WorkToolBarActivity {
orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(returnNum, 3)));
}
} else {
tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanReturnProductSum(), 3)));
}
}
}
......@@ -286,6 +290,7 @@ public class ReturnAddActivity extends WorkToolBarActivity {
List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
for (OrderDetail.OrderItemsBean orderItem : orderItems) {
if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
if (!TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {// 0805新增 额外判断供应订单 不修改旧逻辑
if (TextUtils.isEmpty(enterStockType)) {
if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) == 1) {
toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
......@@ -300,6 +305,12 @@ public class ReturnAddActivity extends WorkToolBarActivity {
}
}
} else {
if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(orderItem.getCanReturnProductSum())) == 1) {
toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanReturnProductSum(), 3)));
return;
}
}
}
}
......@@ -324,8 +335,8 @@ public class ReturnAddActivity extends WorkToolBarActivity {
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().returnPoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().returnPoAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}else {
observable = RtfUtils.getRtf().returnFoAdd(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>() {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ de195379
......@@ -336,7 +336,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", proList.get(position).getCanReturnProductSum(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"num", proList.get(position).getCanReturnProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
......@@ -351,7 +351,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", proList.get(position).getCanPickReturnProductSum(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"num", proList.get(position).getCanPickReturnProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
......
app/src/main/res/layout/activity_bat_retrun_detail.xml
浏览文件 @ de195379
......@@ -392,28 +392,6 @@
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<RelativeLayout
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="部门名称" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论