1.修改mes bug

2.炼钢厂 钢包 不带小数，后面带小数

app/src/main/java/com/wd/workoffice/app/Config.java

@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public interface Config {
-    Boolean DEBUG = false;
+    Boolean DEBUG = true;
 
     String REGEX_USERNAME = "^[\\w]{4,16}(?<!_)$";
     String REGEX_PASSWORD = "^[\\w]{6,16}(?<!_)$";

app/src/main/java/com/wd/workoffice/bean/mesBean/MachineDetailBean.java

@@ -400,7 +400,7 @@ public class MachineDetailBean {
         private String liquidSteelTemperature;
         private String bakingMethod;
         private String bakingTemperature;
-        private long bakingDateTime;
+        private String bakingDateTime;
         private String createUserId;
         private Object createUserName;
         private String updateUserId;
@@ -488,11 +488,11 @@ public class MachineDetailBean {
             this.bakingTemperature = bakingTemperature;
         }
 
-        public long getBakingDateTime() {
+        public String getBakingDateTime() {
             return bakingDateTime;
         }
 
-        public void setBakingDateTime(long bakingDateTime) {
+        public void setBakingDateTime(String bakingDateTime) {
             this.bakingDateTime = bakingDateTime;
         }
 

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

 package com.wd.workoffice.retrofit;
 
 
-import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.Config;
-import com.wd.workoffice.ui.activity.mes.user.MesChooseClientActivity;
 
 import io.reactivex.Observable;
 import okhttp3.MultipartBody;
@@ -25,7 +23,7 @@ import retrofit2.http.Query;
 public interface MesApiService {
 //    String DOMAIN = Config.DEBUG ? "http://121.36.41.30:9001/" : "http://zwang.bat100.net.cn:8000/";
 
-    String DOMAIN = Config.DEBUG ? "http://114.116.55.221/" : "http://114.116.55.221/";
+    String DOMAIN = Config.DEBUG ? "http://114.116.55.221/" : "http://192.168.3.32/";
 
 
     /**

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java

@@ -290,7 +290,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         castLadle.setBakingTemperature(tvMiddle7.getText().toString());
         String time = tvMiddle8.getText().toString();
         if (!TextUtils.isEmpty(time)) {
-            castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
+            castLadle.setBakingDateTime(tvMiddle8.getText().toString());
         }
 
 //        MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineModifyActivity.java

@@ -494,7 +494,7 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
         castLadle.setBakingMethod(tvMiddle6.getText().toString());
         castLadle.setBakingTemperature(tvMiddle7.getText().toString());
         if (!TextUtils.isEmpty(tvMiddle8.getText().toString())) {
-            castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
+            castLadle.setBakingDateTime(tvMiddle8.getText().toString());
         }
 
 //        MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailAddActivity.java

@@ -874,7 +874,7 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
         castLadle.setBakingTemperature(tvMiddle7.getText().toString());
         String time = tvMiddle8.getText().toString();
         if (!TextUtils.isEmpty(time)) {
-            castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
+            castLadle.setBakingDateTime(tvMiddle8.getText().toString());
         }
 
 //        MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();

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

@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.adapter;
 
 
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 import android.widget.EditText;
@@ -96,8 +97,10 @@ public class UserDataAdd3LabelAddAdapter extends BaseQuickAdapter<FactoryDetailB
 
             @Override
             public void afterTextChanged(Editable s) {
+                if (!TextUtils.isEmpty(s.toString())) {
                     item.setCastingDateTime(Long.valueOf(s.toString()));
                 }
+            }
         });
     }
 }

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

@@ -746,6 +746,7 @@
                         android:id="@+id/tv_middle8"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:inputType="numberDecimal"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"

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

@@ -780,6 +780,7 @@
                         android:id="@+id/tv_middle8"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:inputType="numberDecimal"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"

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

@@ -392,6 +392,7 @@
                     android:id="@+id/tv_middle8"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:inputType="numberDecimal"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"