1.修改bug

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

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

@@ -1559,7 +1559,7 @@ public interface ApiService {
      *
      * @return
      */
-    @PUT("/crucible/apply/{orderId}")
+    @PUT("/crucibleOrder/apply/{orderId}")
     Observable<BaseBean> crucibleApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
     /**
      * step3-接单
@@ -1667,7 +1667,7 @@ public interface ApiService {
      *
      * @return
      */
-    @PUT("/crucible/audit/{orderId}")
+    @PUT("/crucibleOrder/audit/{orderId}")
     Observable<BaseBean> crucibleOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
 
     /**

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

@@ -240,6 +240,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
                 tvTime.setText(dataBean.getCreatedTime());
                 tvSendTime.setText(dataBean.getRequireTime());
                 tvDesc.setText(dataBean.getAttrName());
+                tvOrderDesc.setText(dataBean.getAttrName());
                 tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
 
                 OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();

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

@@ -197,6 +197,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
                 tvOrderNo.setText(dataBean.getId());
                 tvTime.setText(dataBean.getCreatedTime());
                 tvSendTime.setText(dataBean.getRequireTime());
+                tvDesc.setText(dataBean.getAttrName());
                 tvOrderDesc.setText(dataBean.getAttrName());
                 tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
 

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

@@ -102,7 +102,6 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
                 tvOrderNo.setText(dataBean.getId());
                 tvTime.setText(dataBean.getCreatedTime());
                 tvOrderPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
-
             }
         });
     }

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

@@ -623,6 +623,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         AddAndReduceView num = view.findViewById(R.id.ar_num);
         EditText etPrice = view.findViewById(R.id.et_price);
+        WorkUtils.addDecimalsListener(etPrice);
         if (TextUtils.equals(permissionCode, PermissionType.PROCESS_SUPPLY.getCode())) {
             llPrice.setVisibility(View.GONE);
         } else {

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

@@ -17,6 +17,7 @@ import com.wd.workoffice.bean.workEnum.PermissionType;
 import com.wd.workoffice.ui.adapter.StoreCarAdapter;
 import com.wd.workoffice.util.DialogUtils;
 import com.wd.workoffice.util.MathUtils;
+import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -106,7 +107,7 @@ public class StoreSaleCarActivity extends WorkToolBarActivity {
     public void onViewClicked() {
         String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : productList) {
-            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", recordsBean.getInternalPrice() + "", 3), 3);
+            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() , recordsBean.getInternalPrice() + "", 3), 3);
         }
         if (productList.size() == 0) {
             toast("购物车里没有产品哦");

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

@@ -28,7 +28,7 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
- * 商店-销售-购物车
+ * 商店-内部交易-购物车
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -118,7 +118,8 @@ public class StoreTradingCarActivity extends WorkToolBarActivity {
     public void onViewClicked() {
         String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : productList) {
-            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", recordsBean.getInternalPrice() + "", 3), 3);
+            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum()
+                    , recordsBean.getInternalPrice() + "", 3), 3);
         }
         startActivity(StoreTradingConfirmActivity.class, "pro", getIntent().getStringExtra("pro"),
                 "subProcess", getIntent().getStringExtra("subProcess"),
@@ -151,7 +152,8 @@ public class StoreTradingCarActivity extends WorkToolBarActivity {
         tvNum.setText("共 ".concat(productList.size() + "").concat(" 件"));
         String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : productList) {
-            allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", 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/store/StoreTradingConfirmActivity.java

@@ -351,7 +351,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
         tvNum.setText("共 ".concat(proList.size() + "").concat(" 件"));
         String allPrice = "";
         for (ProductBean.RecordsBean recordsBean : proList) {
-            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));
     }
@@ -388,7 +388,7 @@ public class StoreTradingConfirmActivity 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/adapter/OrderProcessAdapter.java

@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.adapter;
 
 
 import android.graphics.Color;
+import android.text.TextUtils;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 
@@ -47,7 +48,7 @@ public class OrderProcessAdapter extends BaseQuickAdapter<OrderDetail.OrderFlows
         }
         helper.setText(R.id.tv_status, item.getOptUserName() + item.getEventCodeName());
         helper.setText(R.id.tv_time, item.getCreatedTime());
-        helper.setText(R.id.tv_remark, "备注：" + item.getOptComment());
+        helper.setText(R.id.tv_remark, "备注：" .concat(TextUtils.isEmpty( item.getOptComment())?"":item.getOptComment()));
     }
 
 }

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

@@ -14,6 +14,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.AddAndReduceView;
 
 import org.greenrobot.eventbus.EventBus;
@@ -44,8 +45,8 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
         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_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));
         if (type == 1) {
             helper.addOnClickListener(R.id.rl_choose_dep);
@@ -83,6 +84,7 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
             });
             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) {

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

@@ -36,14 +36,14 @@ public class TradingProCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBe
         helper.setText(R.id.tv_card_name, item.getSoleCode());
         helper.setText(R.id.tv_spec, item.getSpec());
         helper.setText(R.id.tv_price, String.valueOf(item.getInternalPrice()));
-        helper.setText(R.id.tv_all_price, "小计:"+MathUtils.multiply(item.getCarNum() + "", item.getInternalPrice() + "", 2));
+        helper.setText(R.id.tv_all_price, "小计:"+MathUtils.multiply(item.getCarNum() + "", item.getInternalPrice() + "", 3));
         AddAndReduceView num = helper.getView(R.id.ar_num);
         num.setNumber(item.getCarNum());
         num.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
             @Override
             public void OnNumberChanged(String vs) {
                 item.setCarNum(vs);
-                helper.setText(R.id.tv_all_price, "小计:"+MathUtils.multiply(vs + "", item.getInternalPrice() + "", 2));
+                helper.setText(R.id.tv_all_price, "小计:"+MathUtils.multiply(vs + "", item.getInternalPrice() + "", 3));
                 EventBus.getDefault().post(new ModifyCarEvent(JSON.toJSONString(getData())));
             }
 

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

@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10mm"
-            android:text="同意"
+            android:text=""
             android:textColor="@color/white"
             android:textSize="16sp" />
 
@@ -396,7 +396,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="15mm"
-                        android:text="对方发起提前结束"
+                        android:text=""
                         android:textColor="@color/red_btn_bg"
                         android:textSize="13sp" />
 

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

@@ -52,7 +52,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_pro"
         android:layout_width="match_parent"
-        android:layout_height="200mm"
+        android:layout_height="wrap_content"
         android:layout_marginTop="5mm" />
 
     <LinearLayout