1.修改适配器bug

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleCarActivity.java

@@ -63,7 +63,7 @@ public class StoreSaleCarActivity extends WorkToolBarActivity {
     RecyclerView rvProduct;
     private List<ProductBean.RecordsBean> productList;
     private StoreCarAdapter productAdapter;
-    private int warningFlag;
+    private int warningFlag = 0;
 
     @Override
     protected void initView() {
@@ -121,36 +121,43 @@ public class StoreSaleCarActivity extends WorkToolBarActivity {
             toast("购物车里没有产品哦");
             return;
         }
-        QMUIDialog.MessageDialogBuilder builder = DialogUtils.okAndCancelDialog(this);
-        builder.setTitle("提示").setMessage("包含达到预警数量的产品，是否继续提交").
-                addAction("取消", new QMUIDialogAction.ActionListener() {
-                    @Override
-                    public void onClick(QMUIDialog dialog, int index) {
-                        dialog.dismiss();
-                    }
-                })
-                .addAction("确定", new QMUIDialogAction.ActionListener() {
-                    @Override
-                    public void onClick(QMUIDialog dialog, int index) {
-                        String allPrice = "";
-                        for (ProductBean.RecordsBean recordsBean : productList) {
-                            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum(), MathUtils.converData(recordsBean.getInternalPrice(), 3), 3), 3);
+        if (warningFlag == 1) {
+            QMUIDialog.MessageDialogBuilder builder = DialogUtils.okAndCancelDialog(this);
+            builder.setTitle("提示").setMessage("包含达到预警数量的产品，是否继续提交").
+                    addAction("取消", new QMUIDialogAction.ActionListener() {
+                        @Override
+                        public void onClick(QMUIDialog dialog, int index) {
+                            dialog.dismiss();
                         }
-                        startActivity(StoreSaleConfirmActivity.class, "pro", JSON.toJSONString(productList),
-                                "subProcess", getIntent().getStringExtra("subProcess"),
-                                "supplierId", getIntent().getStringExtra("supplierId"),
-                                "subProcessId", getIntent().getStringExtra("subProcessId"),
-                                "inStockId", getIntent().getStringExtra("inStockId"),
-                                "intoStore", getIntent().getStringExtra("intoStore"),
-                                "outerStore", getIntent().getStringExtra("outerStore"),
-                                "customerId", getIntent().getStringExtra("customerId"),
-                                "receiveDeptId", getIntent().getStringExtra("receiveDeptId"),
-                                "code", getIntent().getStringExtra("code"),
-                                "launchOrderAmount", allPrice);
-                        dialog.dismiss();
-                    }
-                }).show();
+                    })
+                    .addAction("确定", new QMUIDialogAction.ActionListener() {
+                        @Override
+                        public void onClick(QMUIDialog dialog, int index) {
+                            goNext();
+                            dialog.dismiss();
+                        }
+                    }).show();
+        }else {
+            goNext();
+        }
+    }
 
+    private void goNext() {
+        String allPrice = "";
+        for (ProductBean.RecordsBean recordsBean : productList) {
+            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum(), MathUtils.converData(recordsBean.getInternalPrice(), 3), 3), 3);
+        }
+        startActivity(StoreSaleConfirmActivity.class, "pro", JSON.toJSONString(productList),
+                "subProcess", getIntent().getStringExtra("subProcess"),
+                "supplierId", getIntent().getStringExtra("supplierId"),
+                "subProcessId", getIntent().getStringExtra("subProcessId"),
+                "inStockId", getIntent().getStringExtra("inStockId"),
+                "intoStore", getIntent().getStringExtra("intoStore"),
+                "outerStore", getIntent().getStringExtra("outerStore"),
+                "customerId", getIntent().getStringExtra("customerId"),
+                "receiveDeptId", getIntent().getStringExtra("receiveDeptId"),
+                "code", getIntent().getStringExtra("code"),
+                "launchOrderAmount", allPrice);
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/adapter/StoreCarAdapter.java

@@ -48,7 +48,6 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
         helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getInternalPrice(),3)));
         helper.setText(R.id.tv_unit, MathUtils.converData(item.getWeight(),3).concat("吨"));
         helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarNum(), MathUtils.converData(item.getInternalPrice(),3), 3));
-        helper.setGone(R.id.tv_desc, item.getFlag()==1);
         if (type == 1) {
             helper.addOnClickListener(R.id.rl_choose_dep);
             helper.addOnClickListener(R.id.rl_upload);
@@ -59,6 +58,7 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
                 helper.setText(R.id.tv_upload, "已上传，点击替换");
             }
         } else if (type == 2) {
+            helper.setGone(R.id.tv_desc, item.getFlag()==1);
             helper.addOnClickListener(R.id.tv_delete);
             AddAndReduceView num = helper.getView(R.id.ar_num);
             num.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
@@ -75,6 +75,7 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
             helper.setGone(R.id.ll_price, false);
             num.setNumber(item.getCarNum());
         } else {
+            helper.setGone(R.id.tv_desc, item.getFlag()==1);
             helper.addOnClickListener(R.id.tv_delete);
             AddAndReduceView num = helper.getView(R.id.ar_num);
             num.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {