1.修改奇怪的bug

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

@@ -171,8 +171,8 @@ public class MachineDetailBean {
 
         private String id;
         private Object isDelete;
-        private long createDateTime;
-        private long updateDateTime;
+        private Long createDateTime;
+        private Long updateDateTime;
         private String continuousCasterCode;
         private String continuousCasterName;
         private String steelmakingWorksCode;
@@ -208,19 +208,19 @@ public class MachineDetailBean {
             this.isDelete = isDelete;
         }
 
-        public long getCreateDateTime() {
+        public Long getCreateDateTime() {
             return createDateTime;
         }
 
-        public void setCreateDateTime(long createDateTime) {
+        public void setCreateDateTime(Long createDateTime) {
             this.createDateTime = createDateTime;
         }
 
-        public long getUpdateDateTime() {
+        public Long getUpdateDateTime() {
             return updateDateTime;
         }
 
-        public void setUpdateDateTime(long updateDateTime) {
+        public void setUpdateDateTime(Long updateDateTime) {
             this.updateDateTime = updateDateTime;
         }
 
@@ -392,7 +392,7 @@ public class MachineDetailBean {
 
         private String id;
         private Object createDateTime;
-        private long updateDateTime;
+        private Long updateDateTime;
         private String ladleCode;
         private String capacity;
         private String lifeSpan;
@@ -406,7 +406,7 @@ public class MachineDetailBean {
         private String updateUserId;
         private String updateUserName;
         private Object remark;
-        private boolean delete;
+        private Boolean delete;
 
         public String getId() {
             return id;
@@ -424,11 +424,11 @@ public class MachineDetailBean {
             this.createDateTime = createDateTime;
         }
 
-        public long getUpdateDateTime() {
+        public Long getUpdateDateTime() {
             return updateDateTime;
         }
 
-        public void setUpdateDateTime(long updateDateTime) {
+        public void setUpdateDateTime(Long updateDateTime) {
             this.updateDateTime = updateDateTime;
         }
 
@@ -536,11 +536,11 @@ public class MachineDetailBean {
             this.remark = remark;
         }
 
-        public boolean isDelete() {
+        public Boolean isDelete() {
             return delete;
         }
 
-        public void setDelete(boolean delete) {
+        public void setDelete(Boolean delete) {
             this.delete = delete;
         }
     }
@@ -566,8 +566,8 @@ public class MachineDetailBean {
          */
 
         private String id;
-        private long createDateTime;
-        private long updateDateTime;
+        private Long createDateTime;
+        private Long updateDateTime;
         private String continuousCasterCode;
         private String steelGrade;
         private String castingSpeed;
@@ -580,7 +580,7 @@ public class MachineDetailBean {
         private String createUserName;
         private String updateUserId;
         private String updateUserName;
-        private boolean delete;
+        private Boolean delete;
 
         public String getId() {
             return id;
@@ -590,19 +590,19 @@ public class MachineDetailBean {
             this.id = id;
         }
 
-        public long getCreateDateTime() {
+        public Long getCreateDateTime() {
             return createDateTime;
         }
 
-        public void setCreateDateTime(long createDateTime) {
+        public void setCreateDateTime(Long createDateTime) {
             this.createDateTime = createDateTime;
         }
 
-        public long getUpdateDateTime() {
+        public Long getUpdateDateTime() {
             return updateDateTime;
         }
 
-        public void setUpdateDateTime(long updateDateTime) {
+        public void setUpdateDateTime(Long updateDateTime) {
             this.updateDateTime = updateDateTime;
         }
 
@@ -702,11 +702,11 @@ public class MachineDetailBean {
             this.updateUserName = updateUserName;
         }
 
-        public boolean isDelete() {
+        public Boolean isDelete() {
             return delete;
         }
 
-        public void setDelete(boolean delete) {
+        public void setDelete(Boolean delete) {
             this.delete = delete;
         }
 
@@ -1053,8 +1053,8 @@ public class MachineDetailBean {
          */
 
         private String id;
-        private long createDateTime;
-        private long updateDateTime;
+        private Long createDateTime;
+        private Long updateDateTime;
         private String continuousCasterCode;
         private String productsCode;
         private String productsName;
@@ -1075,7 +1075,7 @@ public class MachineDetailBean {
         private String updateUserId;
         private String updateUserName;
         private String remark;
-        private boolean delete;
+        private Boolean delete;
         private List<ImageBean> attachments;
 
         public String getId() {
@@ -1086,19 +1086,19 @@ public class MachineDetailBean {
             this.id = id;
         }
 
-        public long getCreateDateTime() {
+        public Long getCreateDateTime() {
             return createDateTime;
         }
 
-        public void setCreateDateTime(long createDateTime) {
+        public void setCreateDateTime(Long createDateTime) {
             this.createDateTime = createDateTime;
         }
 
-        public long getUpdateDateTime() {
+        public Long getUpdateDateTime() {
             return updateDateTime;
         }
 
-        public void setUpdateDateTime(long updateDateTime) {
+        public void setUpdateDateTime(Long updateDateTime) {
             this.updateDateTime = updateDateTime;
         }
 
@@ -1262,11 +1262,11 @@ public class MachineDetailBean {
             this.remark = remark;
         }
 
-        public boolean isDelete() {
+        public Boolean isDelete() {
             return delete;
         }
 
-        public void setDelete(boolean delete) {
+        public void setDelete(Boolean delete) {
             this.delete = delete;
         }
 
@@ -1300,13 +1300,13 @@ public class MachineDetailBean {
          */
 
         private String id;
-        private long createDateTime;
-        private long updateDateTime;
+        private Long createDateTime;
+        private Long updateDateTime;
         private String continuousCasterCode;
         private String productsCode;
         private String productsName;
         private String figureNumber;
-        private long deliveryDateTime;
+        private Long deliveryDateTime;
         private int deliveryNumber;
         private String createUserId;
         private Object createUserName;
@@ -1314,7 +1314,7 @@ public class MachineDetailBean {
         private String updateUserName;
         private Object remark;
         private Object custCode;
-        private boolean delete;
+        private Boolean delete;
 
         public String getId() {
             return id;
@@ -1324,19 +1324,19 @@ public class MachineDetailBean {
             this.id = id;
         }
 
-        public long getCreateDateTime() {
+        public Long getCreateDateTime() {
             return createDateTime;
         }
 
-        public void setCreateDateTime(long createDateTime) {
+        public void setCreateDateTime(Long createDateTime) {
             this.createDateTime = createDateTime;
         }
 
-        public long getUpdateDateTime() {
+        public Long getUpdateDateTime() {
             return updateDateTime;
         }
 
-        public void setUpdateDateTime(long updateDateTime) {
+        public void setUpdateDateTime(Long updateDateTime) {
             this.updateDateTime = updateDateTime;
         }
 
@@ -1372,11 +1372,11 @@ public class MachineDetailBean {
             this.figureNumber = figureNumber;
         }
 
-        public long getDeliveryDateTime() {
+        public Long getDeliveryDateTime() {
             return deliveryDateTime;
         }
 
-        public void setDeliveryDateTime(long deliveryDateTime) {
+        public void setDeliveryDateTime(Long deliveryDateTime) {
             this.deliveryDateTime = deliveryDateTime;
         }
 
@@ -1436,11 +1436,11 @@ public class MachineDetailBean {
             this.custCode = custCode;
         }
 
-        public boolean isDelete() {
+        public Boolean isDelete() {
             return delete;
         }
 
-        public void setDelete(boolean delete) {
+        public void setDelete(Boolean delete) {
             this.delete = delete;
         }
     }
@@ -1466,7 +1466,7 @@ public class MachineDetailBean {
          */
 
         private String id;
-        private long createDateTime;
+        private Long createDateTime;
         private Object updateDateTime;
         private String continuousCasterCode;
         private String productsCode;
@@ -1480,7 +1480,7 @@ public class MachineDetailBean {
         private Object updateUserName;
         private Object remark;
         private Object custCode;
-        private boolean delete;
+        private Boolean delete;
 
         public String getId() {
             return id;
@@ -1490,11 +1490,11 @@ public class MachineDetailBean {
             this.id = id;
         }
 
-        public long getCreateDateTime() {
+        public Long getCreateDateTime() {
             return createDateTime;
         }
 
-        public void setCreateDateTime(long createDateTime) {
+        public void setCreateDateTime(Long createDateTime) {
             this.createDateTime = createDateTime;
         }
 
@@ -1602,11 +1602,11 @@ public class MachineDetailBean {
             this.custCode = custCode;
         }
 
-        public boolean isDelete() {
+        public Boolean isDelete() {
             return delete;
         }
 
-        public void setDelete(boolean delete) {
+        public void setDelete(Boolean delete) {
             this.delete = delete;
         }
     }
@@ -1634,8 +1634,8 @@ public class MachineDetailBean {
          */
 
         private String id;
-        private long createDateTime;
-        private long updateDateTime;
+        private Long createDateTime;
+        private Long updateDateTime;
         private String continuousCasterCode;
         private String supplierCode;
         private String supplierName;
@@ -1649,7 +1649,7 @@ public class MachineDetailBean {
         private String updateUserId;
         private String updateUserName;
         private String remark;
-        private boolean delete;
+        private Boolean delete;
         private List<ImageBean> attachments;
 
         public String getId() {
@@ -1660,19 +1660,19 @@ public class MachineDetailBean {
             this.id = id;
         }
 
-        public long getCreateDateTime() {
+        public Long getCreateDateTime() {
             return createDateTime;
         }
 
-        public void setCreateDateTime(long createDateTime) {
+        public void setCreateDateTime(Long createDateTime) {
             this.createDateTime = createDateTime;
         }
 
-        public long getUpdateDateTime() {
+        public Long getUpdateDateTime() {
             return updateDateTime;
         }
 
-        public void setUpdateDateTime(long updateDateTime) {
+        public void setUpdateDateTime(Long updateDateTime) {
             this.updateDateTime = updateDateTime;
         }
 
@@ -1780,11 +1780,11 @@ public class MachineDetailBean {
             this.remark = remark;
         }
 
-        public boolean isDelete() {
+        public Boolean isDelete() {
             return delete;
         }
 
-        public void setDelete(boolean delete) {
+        public void setDelete(Boolean delete) {
             this.delete = delete;
         }
 
@@ -1820,8 +1820,8 @@ public class MachineDetailBean {
          */
 
         private String id;
-        private long createDateTime;
-        private long updateDateTime;
+        private Long createDateTime;
+        private Long updateDateTime;
         private String continuousCasterCode;
         private String refractoryName;
         private String figureNumber;
@@ -1835,7 +1835,7 @@ public class MachineDetailBean {
         private String updateUserId;
         private String updateUserName;
         private String remark;
-        private boolean delete;
+        private Boolean delete;
         private List<ImageBean> attachments;
 
         public String getId() {
@@ -1846,19 +1846,19 @@ public class MachineDetailBean {
             this.id = id;
         }
 
-        public long getCreateDateTime() {
+        public Long getCreateDateTime() {
             return createDateTime;
         }
 
-        public void setCreateDateTime(long createDateTime) {
+        public void setCreateDateTime(Long createDateTime) {
             this.createDateTime = createDateTime;
         }
 
-        public long getUpdateDateTime() {
+        public Long getUpdateDateTime() {
             return updateDateTime;
         }
 
-        public void setUpdateDateTime(long updateDateTime) {
+        public void setUpdateDateTime(Long updateDateTime) {
             this.updateDateTime = updateDateTime;
         }
 
@@ -1966,11 +1966,11 @@ public class MachineDetailBean {
             this.remark = remark;
         }
 
-        public boolean isDelete() {
+        public Boolean isDelete() {
             return delete;
         }
 
-        public void setDelete(boolean delete) {
+        public void setDelete(Boolean delete) {
             this.delete = delete;
         }
 
@@ -2003,8 +2003,8 @@ public class MachineDetailBean {
 
         private String id;
         private Object isDelete;
-        private long createDateTime;
-        private long updateDateTime;
+        private Long createDateTime;
+        private Long updateDateTime;
         private String continuousCasterCode;
         private String ladleContractSituation;
         private String continuousCastingContractSituation;
@@ -2032,19 +2032,19 @@ public class MachineDetailBean {
             this.isDelete = isDelete;
         }
 
-        public long getCreateDateTime() {
+        public Long getCreateDateTime() {
             return createDateTime;
         }
 
-        public void setCreateDateTime(long createDateTime) {
+        public void setCreateDateTime(Long createDateTime) {
             this.createDateTime = createDateTime;
         }
 
-        public long getUpdateDateTime() {
+        public Long getUpdateDateTime() {
             return updateDateTime;
         }
 
-        public void setUpdateDateTime(long updateDateTime) {
+        public void setUpdateDateTime(Long updateDateTime) {
             this.updateDateTime = updateDateTime;
         }
 

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

@@ -22,7 +22,7 @@ import retrofit2.http.Query;
  **/
 public interface MesApiService {
 
-    String DOMAIN = Config.DEBUG ? "http://192.168.3.32/" : "http://124.129.27.194:81/";
+    String DOMAIN = Config.DEBUG ? "http://192.168.3.33/" : "http://124.129.27.194:81/";
 
 
     /**

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java

@@ -271,7 +271,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
 
 
     @OnClick({R.id.rl_mark_code, R.id.btn_add, R.id.btn_submit, R.id.rl_machine, R.id.rl_client, R.id.rl_box, R.id.rl_defect,
-            R.id.rl_pro, R.id.rl_mark_code})
+            R.id.rl_pro})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.btn_add:

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

@@ -80,6 +80,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         param.put("paramMap", paramMap);
         param.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
+        paramMap.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
         getData();
     }
 

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

@@ -301,6 +301,12 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
         data6Adapter.notifyDataSetChanged();
         if (machineDetailBean.getSpeeds() != null) {
             for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
+                if (null == productListBean.getCovAgent()) {
+                    productListBean.setCovAgent(new MachineDetailBean.SpeedsBean.CovAgentBean());
+                }
+                if (null == productListBean.getMouldFlu()) {
+                    productListBean.setMouldFlu(new MachineDetailBean.SpeedsBean.MouldFluBean());
+                }
                 data7List.add(productListBean.getSteelGrade());
             }
         }
@@ -313,28 +319,28 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position))
-                        ,"user",data.getCustomerUserCode());
+                        , "user", data.getCustomerUserCode());
             }
         });
         data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position))
-                        ,"user",data.getCustomerUserCode());
+                        , "user", data.getCustomerUserCode());
             }
         });
         data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position))
-                        ,"user",data.getCustomerUserCode());
+                        , "user", data.getCustomerUserCode());
             }
         });
         data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position))
-                        ,"user",data.getCustomerUserCode());
+                        , "user", data.getCustomerUserCode());
 
             }
         });
@@ -342,7 +348,7 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 startActivity(MesStockModifyActivity.class,
-                        "id",data.getCustomerUserCode(),
+                        "id", data.getCustomerUserCode(),
                         "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
             }
         });
@@ -350,14 +356,14 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position))
-                        ,"user",data.getCustomerUserCode());
+                        , "user", data.getCustomerUserCode());
             }
         });
         data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position))
-                        ,"user",data.getCustomerUserCode());
+                        , "user", data.getCustomerUserCode());
             }
         });
     }
@@ -368,7 +374,7 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.rl_cover4, R.id.rl_protection4,R.id.tv_add2,
+    @OnClick({R.id.rl_cover4, R.id.rl_protection4, R.id.tv_add2,
             R.id.tv_add7, R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
             R.id.tv_add4})
     public void onViewClicked(View view) {