1.修改维修下单页面

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

@@ -259,7 +259,6 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                 );
                 break;
             case R.id.ll_client:
-                //TODO 确认接口
                 switch (type) {
                     case "1":
                         startActivityForResult(StoreSaleClientActivity.class, 10001,
@@ -290,12 +289,11 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     case "2":
                         startActivityForResult(StoreSaleClientActivity.class, 10002,
                                 "depId", getIntent().getStringExtra("deptId"),
-                                "flag", "1", "code", "SUPPLIER", "supplier", "选择供应商",
+                                "code", "SUPPLIER", "supplier", "选择供应商",
                                 "processes", "PROCESS_PACKAGE");
                         break;
                     case "3":
                         startActivityForResult(StoreSaleClientActivity.class, 10002,
-                                "flag", "1",
                                 "depId", getIntent().getStringExtra("deptId"),
                                 "code", "SUPPLIER", "supplier", "选择供应商",
                                 "processes", "PROCESS_PACKAGE");
@@ -745,7 +743,6 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
         WorkUtils.addDecimalsListener(etPrice);
         etPrice.setText(MathUtils.converData(data.getInternalPrice(), 3));
         etInnerPrice.setText(MathUtils.converData(data.getInternalPrice(), 3));
-        //TODO 供应价格显示文案，渠道价格是InternalPrice吗？
         if (TextUtils.equals(permissionCode, PermissionType.PROCESS_PURCHASE.getCode())) {
             llInnerPrice.setVisibility(View.VISIBLE);
         } else {

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

@@ -38,11 +38,11 @@ public class StoreProductAdapter extends BaseQuickAdapter<ProductBean.RecordsBea
         helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getInternalPrice(), 3)));
         helper.setText(R.id.tv_unit, String.valueOf(item.getWeight()).concat("吨"));
         if (!TextUtils.isEmpty(item.getCarNum())) {
-            helper.setVisible(R.id.ll_car,true);
+            helper.setVisible(R.id.ll_car, true);
             helper.setText(R.id.tv_sale_price, MathUtils.converData(item.getCarPrice(), 3));
             helper.setText(R.id.tv_car_num, MathUtils.converData(item.getCarNum(), 3));
-        }else{
-            helper.setVisible(R.id.ll_car,false);
+        } else {
+            helper.setVisible(R.id.ll_car, false);
         }
         helper.addOnClickListener(R.id.tv_cart);
         if (type == 1) {
@@ -50,8 +50,8 @@ public class StoreProductAdapter extends BaseQuickAdapter<ProductBean.RecordsBea
             helper.setText(R.id.tv_num, String.valueOf(item.getCanUseProductSum()));
         }
         if (type == 2) {
-            //TODO 外采购显示内部价格desc
-//            helper.setGone(R.id.tv_inner_price_desc, true);
+            //TODO 外采购显示内部价格desc，暂时不修改
+            //helper.setGone(R.id.tv_inner_price_desc, true);
 //            helper.setGone(R.id.tv_inner_price, true);
 //            helper.setText(R.id.tv_inner_price, "￥".concat(MathUtils.converData(item.getCarInnerPrice(), 3)));
         }