1.入库修改

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyDetailActivity.java

@@ -254,7 +254,7 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
             public void onClick(View v) {
                 String price = "";
                 String tax = "";
-                if (status == 1 && TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+                if (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();

app/src/main/java/com/wd/workoffice/ui/fg/AddStockApplyFragment.java

@@ -208,7 +208,16 @@ public class AddStockApplyFragment extends WorkBaseFg {
 
     private void checkDialog(int status, int id) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        View view = LayoutInflater.from(getActivity()).inflate(R.layout.view_check, null);
+        View view;
+        if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            view = LayoutInflater.from(getActivity()).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(getActivity()).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 ? "通过" : "拒绝");
@@ -221,11 +230,27 @@ public class AddStockApplyFragment extends WorkBaseFg {
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
+                String price = "";
+                String tax = "";
+                if (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();
             }
         });
@@ -239,10 +264,12 @@ public class AddStockApplyFragment extends WorkBaseFg {
     }
 
 
-    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())) {