1.组装修改

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

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

 package com.wd.workoffice.ui.activity.bat.order;
 
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
@@ -9,7 +7,6 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
@@ -21,7 +18,6 @@ import com.wd.workoffice.ui.activity.bat.store.StoreOrderSuccessActivity;
 import com.wd.workoffice.ui.adapter.ProAddAdapter;
 import com.wd.workoffice.ui.adapter.ProTargetAddAdapter;
 import com.wd.workoffice.util.MathUtils;
-import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
@@ -213,7 +209,7 @@ public class ProductConfirmActivity extends WorkToolBarActivity {
     private void changeNumAndPrice() {
         String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : toList) {
-            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", recordsBean.getInternalPrice() + "", 3), 3);
+            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum(), recordsBean.getInternalPrice() + "", 3), 3);
         }
         tvPrice.setText("总计: ¥ ".concat(allPrice));
         tvBase5.setText(String.valueOf(allPrice));

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

@@ -197,6 +197,8 @@ public class ProductOrderAddActivity extends WorkToolBarActivity {
                 List<WarehoustBean.RecordsBean> getList = JSON.parseArray(data.getData().toString(), WarehoustBean.RecordsBean.class);
                 stockList = getList;
                 stockNameList.clear();
+                fromStockDialog = DialogUtils.listDialog(ProductOrderAddActivity.this);
+                useStockDialog = DialogUtils.listDialog(ProductOrderAddActivity.this);
                 for (WarehoustBean.RecordsBean process : stockList) {
                     stockNameList.add(process.getName());
                 }

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

@@ -37,7 +37,7 @@ import flexible.xd.android_base.network.rtfhttp.Transformer;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 财务 开票 选择产品
+ * 组装 选择产品
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd

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

@@ -85,6 +85,7 @@ public class ProductOrderProTargetActivity extends WorkToolBarActivity {
         tvDesc.setText("组装单价");
         AddAndReduceView num = view.findViewById(R.id.ar_num);
         EditText etPrice = view.findViewById(R.id.et_price);
+        WorkUtils.addDecimalsListener(etPrice);
         for (ProductBean.RecordsBean recordsBean : carList) {
             if (data.getId() == recordsBean.getId()) {
                 etPrice.setText(recordsBean.getCarPrice());

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

@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.ProAddBean;
 import com.wd.workoffice.bean.TicketAddBean;
+import com.wd.workoffice.util.MathUtils;
 
 import java.util.List;
 
@@ -35,7 +36,7 @@ public class ProAddAdapter extends BaseQuickAdapter<ProAddBean.RecordsBean, Base
         helper.setText(R.id.tv_pd_code, item.getSerialNumber());
         helper.setText(R.id.tv_spec, item.getProductSpec());
         helper.setText(R.id.tv_unit, item.getProductUnit());
-        helper.setText(R.id.tv_apply_num, item.getCanPackageSum() + "");
+        helper.setText(R.id.tv_apply_num, MathUtils.converData(item.getCanPackageSum(),3));
         if (type == 1) {
             helper.setVisible(R.id.iv_cart, false);
         }

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

@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.ProAddBean;
 import com.wd.workoffice.bean.ProductBean;
+import com.wd.workoffice.util.MathUtils;
 
 import java.util.List;
 
@@ -30,10 +31,10 @@ public class ProTargetAddAdapter extends BaseQuickAdapter<ProductBean.RecordsBea
     @Override
     protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) {
         helper.setText(R.id.tv_name, item.getName());
-        helper.setText(R.id.tv_in_price, String.valueOf(item.getInternalPrice()));
+        helper.setText(R.id.tv_in_price,MathUtils.converData(item.getInternalPrice(),3));
         helper.setText(R.id.tv_spec, item.getSpec());
-        helper.setText(R.id.tv_num, item.getCarNum() +"");
-        helper.setText(R.id.tv_price, item.getCarPrice() );
+        helper.setText(R.id.tv_num, MathUtils.converData(item.getCarNum() ,3));
+        helper.setText(R.id.tv_price, MathUtils.converData( item.getCarPrice() ,3));
         if (type == 1) {
             helper.setVisible(R.id.iv_cart, false);
         }