1.修改坩埚下单异常

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

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.wd.workoffice"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0.1"
+        versionCode 2
+        versionName "1.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [
                 JPUSH_PKGNAME: applicationId,

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -559,4 +559,11 @@ public interface MesApiService {
     @POST("/himes/api/msSceneFeedbackHistory/show/getByFeedInfo.json")
     Observable<BaseMesBean> historyDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * 用户信息采集历史详情
+     * @return
+     */
+    @POST("/himes/api/mpsProduct/show/getMpsProductByBasket/list.json")
+    Observable<BaseMesBean> getMpsProductByBasket(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
 }

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

@@ -101,7 +101,7 @@ public class AddCrucibleCarActivity extends WorkToolBarActivity {
     public void onViewClicked() {
         String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : productList) {
-            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarDoubleNum() + "", recordsBean.getInternalPrice()+"", 2), 2);
+            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", recordsBean.getInternalPrice()+"", 3), 3);
         }
 //        startActivity(StoreSaleConfirmActivity.class, "pro", JSON.toJSONString(productList),
 //                "subProcess", getIntent().getStringExtra("subProcess"),
@@ -142,7 +142,7 @@ public class AddCrucibleCarActivity extends WorkToolBarActivity {
         tvNum.setText("共 ".concat(productList.size() + "").concat(" 件"));
         String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : productList) {
-            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarDoubleNum() + "", recordsBean.getInternalPrice()+"", 2), 2);
+            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() , recordsBean.getInternalPrice()+"", 3), 3);
         }
         tvPrice.setText("总计: ¥ ".concat(allPrice));
     }

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

@@ -299,7 +299,8 @@ public class AddCrucibleConfirmActivity extends WorkToolBarActivity {
         tvNum.setText("共 ".concat(proList.size() + "").concat(" 件"));
         String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : proList) {
-            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarDoubleNum() + "", recordsBean.getInternalPrice() + "", 2), 2);
+            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum(), recordsBean.getInternalPrice() + "",
+                    3), 3);
         }
         tvPrice.setText("总计: ¥ ".concat(allPrice));
     }
@@ -336,7 +337,7 @@ public class AddCrucibleConfirmActivity extends WorkToolBarActivity {
                     @Override
                     public void onSuccess(JSONObject jsonObject) {
                         hideLoading();
-                        if (jsonObject.getInteger("status") != 0) {
+                        if (jsonObject.getInteger("code") != 0) {
                             toast(jsonObject.getString("msg"));
                             return;
                         }

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

@@ -67,6 +67,7 @@ public class AddCrucibleProductActivity extends WorkToolBarActivity {
         AddAndReduceView num = view.findViewById(R.id.ar_num);
         num.setMaxNum(data.getCanUseProductSum());
         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/activity/mes/QualityTraceabilityActivity.java

+package com.wd.workoffice.ui.activity.mes;
+
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.bean.WarehouseStockBean;
+import com.wd.workoffice.bean.mesBean.QualityTraceabilityBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseStockDetailActivity;
+import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseStockFlowActivity;
+import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseStockNumActivity;
+import com.wd.workoffice.ui.adapter.QualityTraceabilityAdapter;
+import com.wd.workoffice.ui.adapter.WorkWarhosutStockAdapter;
+import com.wd.workoffice.util.WorkUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class QualityTraceabilityActivity extends WorkBaseActivity {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.tv_search)
+    TextView tvSearch;
+    @BindView(R.id.tb_title)
+    Toolbar tbTitle;
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private int page = 1;
+    private Map<String, Object> param;
+    private List<QualityTraceabilityBean.ListBean> dataList;
+    private QualityTraceabilityAdapter dataAdapter;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        setSupportActionBar(tbTitle);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    }
+
+
+    @Override
+    protected void initData() {
+        dataList = new ArrayList<>();
+        dataAdapter = new QualityTraceabilityAdapter(R.layout.item_quality_traceability, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        param = WorkUtils.pageMesKey();
+        param.put("pageNum", 1);
+        param.put("length", 100);
+        getData();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().getMpsProductByBasket("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<QualityTraceabilityBean.ListBean> getList = JSON.parseObject(data.getData().toString(), QualityTraceabilityBean.class).getList();
+                if (page == 1) {
+                    srlRefresh.finishRefresh();
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page = 1;
+            param.put("current", page);
+            getData();
+        });
+        dataAdapter.setOnLoadMoreListener(() -> {
+            param.put("current", page);
+            getData();
+        }, rvData);
+        dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                switch (view.getId()) {
+                    case R.id.ll_num:
+                        startActivity(WorkWarehouseStockNumActivity.class, "detail",
+                                JSON.toJSONString(dataList.get(position)));
+                        break;
+                    case R.id.tv_detail:
+                        startActivity(WorkWarehouseStockDetailActivity.class, "id", dataList.get(position).getId() + "");
+                        break;
+                    case R.id.tv_flow:
+                        startActivity(WorkWarehouseStockFlowActivity.class, "id", dataList.get(position).getId() + "");
+                        break;
+                }
+            }
+        });
+    }
+
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_quality_traceability;
+    }
+
+
+    @OnClick(R.id.tv_search)
+    public void onViewClicked() {
+        page = 1;
+        param.put("current", page);
+        param.put("searchValue", etKey.getText().toString());
+        getData();
+    }
+
+}

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

@@ -13,6 +13,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.bean.ProductBean;
 import com.wd.workoffice.bean.event.ModifyCarEvent;
 import com.wd.workoffice.util.MathUtils;
+import com.wd.workoffice.util.WorkUtils;
 import com.wd.workoffice.widget.AddAndReduceDoubleView;
 import com.wd.workoffice.widget.AddAndReduceView;
 
@@ -39,22 +40,23 @@ public class AddCrucibleCarAdapter extends BaseQuickAdapter<ProductBean.RecordsB
         helper.setText(R.id.tv_card, item.getSoleCode());
         helper.setText(R.id.tv_card_name, item.getName());
         helper.setText(R.id.tv_spec, item.getSpec());
-        helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInternalPrice())));
-        helper.setText(R.id.tv_unit, String.valueOf(item.getWeight()).concat("吨"));
-        helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarDoubleNum() + "", item.getInternalPrice() + "", 2));
+        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(), item.getInternalPrice() + "", 3));
         helper.addOnClickListener(R.id.tv_delete);
         AddAndReduceView num = helper.getView(R.id.ar_num);
         num.setMaxNum(item.getCanUseProductSum());
         num.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
             @Override
             public void OnNumberChanged(String vs) {
-                item.setCarDoubleNum(Double.valueOf(vs));
-                helper.setText(R.id.tv_all_price, MathUtils.multiply(vs + "", item.getCarPrice(), 2));
+                item.setCarNum(vs);
+                helper.setText(R.id.tv_all_price, MathUtils.multiply(vs , item.getCarPrice(), 3));
                 EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(getData())));
             }
         });
         EditText etPrice = helper.getView(R.id.et_price);
         etPrice.setText(item.getCarPrice());
+        WorkUtils.addDecimalsListener(etPrice);
         etPrice.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -73,7 +75,7 @@ public class AddCrucibleCarAdapter extends BaseQuickAdapter<ProductBean.RecordsB
                     return;
                 }
                 item.setCarPrice(s.toString());
-                helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarNum() + "", item.getCarPrice(), 2));
+                helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarNum(), item.getCarPrice(), 3));
                 EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(getData())));
             }
         });

app/src/main/java/com/wd/workoffice/widget/AddAndReduceView.java

@@ -50,13 +50,13 @@ public class AddAndReduceView extends LinearLayout implements View.OnClickListen
             public void afterTextChanged(Editable s) {
                 try {
                     Double.valueOf(s.toString());
-                    if (new BigDecimal(Double.valueOf(s.toString())).compareTo(new BigDecimal(maxNum)) == -1) {
+                    if (new BigDecimal(s.toString()).compareTo(new BigDecimal(maxNum)) == -1) {
                         num = MathUtils.converData(s.toString(), 3);
                         if (mOnNumberChangedListener != null)
                             mOnNumberChangedListener.OnNumberChanged(num);
                         return;
                     }
-                    if (new BigDecimal(Double.valueOf(s.toString())).compareTo(new BigDecimal(maxNum)) == 1) {
+                    if (new BigDecimal(s.toString()).compareTo(new BigDecimal(maxNum)) == 1) {
                         ToastUtil.showShort("目前已选择最大数量");
                         num = MathUtils.converData(maxNum, 3);
                         tvNum.setText(MathUtils.converData(maxNum, 3));
@@ -67,7 +67,7 @@ public class AddAndReduceView extends LinearLayout implements View.OnClickListen
                         return;
                     }
                     BigDecimal result = new BigDecimal(maxNum).subtract(new BigDecimal(Double.valueOf(num)));
-                    if (result.compareTo(new BigDecimal("1")) == -1) {
+                    if (result.compareTo(new BigDecimal("1")) <= 0) {
                         num = MathUtils.converData(maxNum, 3);
                         tvNum.setText(MathUtils.converData(maxNum, 3));
                         if (mOnNumberChangedListener != null)

app/src/main/res/layout/view_add_cart_double.xml

@@ -65,7 +65,7 @@
             android:textColor="@color/flexible_text_sup"
             android:textSize="17sp" />
 
-        <com.wd.workoffice.widget.AddAndReduceDoubleView
+        <com.wd.workoffice.widget.AddAndReduceView
             android:id="@+id/ar_num"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"