Skip to content

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

1.入库税率和价格改到审核里

上级 4e50aaed
隐藏空白字符变更
内嵌 并排
正在显示 包含 184 行增加 和 11 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyAddActivity.java
浏览文件 @ 451327b1
......@@ -109,8 +109,8 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
//外采购订单入库,添加照片（必传）。供应订单入库取消箱号
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
llBoxNum.setVisibility(View.GONE);
llPrice.setVisibility(View.VISIBLE);
llTax.setVisibility(View.VISIBLE);
// llPrice.setVisibility(View.VISIBLE);
// llTax.setVisibility(View.VISIBLE);
}
if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
llBoxNum.setVisibility(View.GONE);
......@@ -118,7 +118,6 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
} else {
llPhoto.setVisibility(View.GONE);
}
// tvNum.setText(String.format("入库数量(%s)", getIntent().getStringExtra("num")));
param = new HashMap<>();
param.put("productId", getIntent().getStringExtra("productId"));
param.put("simpleCode", getIntent().getStringExtra("simpleCode"));
......@@ -263,8 +262,8 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
param.put("boxCode", boxCode);
param.put("orderItemId", getIntent().getStringExtra("orderItemId"));
param.put("applyRemark", remark);
param.put("tax", etTax.getText().toString());
param.put("foPrice", etPrice.getText().toString());
// param.put("tax", etTax.getText().toString());
// param.put("foPrice", etPrice.getText().toString());
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyDetailActivity.java
浏览文件 @ 451327b1
......@@ -138,10 +138,10 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
rlBoxNum.setVisibility(View.GONE);
llSupplier.setVisibility(View.VISIBLE);
tvTax.setText(MathUtils.converData(info.getTax(),3));
tvPrice.setText(MathUtils.converData(info.getFoPrice(),3));
tvTax.setText(MathUtils.converData(info.getTax(), 3));
tvPrice.setText(MathUtils.converData(info.getFoPrice(), 3));
}
tvNum.setText(MathUtils.converData(info.getProductAmount(),3));
tvNum.setText(MathUtils.converData(info.getProductAmount(), 3));
tvBoxNum.setText(info.getBoxCode());
tvPerson.setText(info.getCreatedByName());
tvTime.setText(info.getCreatedTime());
......@@ -230,7 +230,16 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
private void checkDialog(int status, int id) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
View view;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
view = LayoutInflater.from(this).inflate(R.layout.view_supply_stock, null);
EditText etPrice = view.findViewById(R.id.et_price);
EditText etTax = view.findViewById(R.id.et_tax);
WorkUtils.addDecimalsListener(etPrice);
WorkUtils.addDecimalsListener(etTax);
} else {
view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
}
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
tvDesc.setText(status == 1 ? "通过" : "拒绝");
......@@ -243,11 +252,27 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String price = "";
String tax = "";
if (status == 1 && TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
EditText etPrice = view.findViewById(R.id.et_price);
EditText etTax = view.findViewById(R.id.et_tax);
price = etPrice.getText().toString();
tax = etTax.getText().toString();
if (TextUtils.isEmpty(price)) {
toast("请填写价格");
return;
}
if (TextUtils.isEmpty(tax)) {
toast("请填写税率");
return;
}
}
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
check(status, etRemark.getText().toString(), id);
check(status, etRemark.getText().toString(), id, price, tax);
addCartDialog.dismiss();
}
});
......@@ -261,10 +286,12 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
}
private void check(int status, String remark, int id) {
private void check(int status, String remark, int id, String price, String tax) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("result", status);
param.put("comment", remark);
param.put("tax", tax);
param.put("foPrice", price);
param.put("id", id);
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
......@@ -305,4 +332,5 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
});
}
}
app/src/main/res/layout/view_supply_stock.xml 0 → 100644
浏览文件 @ 451327b1
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#d1f8f8f8"
android:orientation="vertical">
<TextView
android:id="@+id/tv_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20mm"
android:gravity="center"
android:textSize="17sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="10mm"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="税 率"
android:textSize="17sp" />
<EditText
android:id="@+id/et_tax"
android:layout_width="match_parent"
android:layout_height="30mm"
android:layout_marginLeft="10mm"
android:background="@drawable/shape_add_cart"
android:gravity="right|center_vertical"
android:hint="输入税率"
android:inputType="numberDecimal"
android:paddingHorizontal="10mm"
android:paddingVertical="4mm"
android:textColor="@color/flexible_text_sup"
android:textColorHint="#91ABBA"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="10mm"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="产品单价"
android:textSize="17sp" />
<EditText
android:id="@+id/et_price"
android:layout_width="match_parent"
android:layout_height="30mm"
android:layout_marginLeft="10mm"
android:background="@drawable/shape_add_cart"
android:gravity="right|center_vertical"
android:hint="产品单价"
android:inputType="numberDecimal"
android:paddingHorizontal="10mm"
android:paddingVertical="4mm"
android:textColor="@color/flexible_text_sup"
android:textColorHint="#91ABBA"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_marginTop="10mm"
android:background="@drawable/shape_confirm_order"
android:orientation="vertical">
<EditText
android:id="@+id/et_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@null"
android:gravity="top"
android:hint="请输入原因"
android:minLines="4"
android:padding="5mm"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="4mm"
android:text="0/140"
android:textColor="@color/flexible_text_gray" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30mm"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:paddingVertical="15mm"
android:text="取消"
android:textColor="#007AFF"
android:textSize="17sp" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="#D8DCE6" />
<TextView
android:id="@+id/tv_ok"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:paddingVertical="15mm"
android:text="确定"
android:textColor="#007AFF"
android:textSize="17sp" />
</LinearLayout>
</LinearLayout>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论