提交分类： 发布版本；

提交内容：  新建拜访计划时主表默认插入设备标识字段
当前版本：  正式版本6.6.4
是否冲突：  否

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitBillInputActivity.java

@@ -437,6 +437,13 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
             return;
         }
 
+        BillGroupModel latLngGroupModel = new BillGroupModel();
+        latLngGroupModel.setForm(true);
+
+        BillGroupModel.BillModel deviceModel = new BillGroupModel.BillModel();
+        deviceModel.setField("mp_sourceequipment");
+        deviceModel.setDisplay("Android");
+        latLngGroupModel.addHide(deviceModel);
         if (address != null && address.getLatLng() != null) {
             Map<String, Object> map = new HashMap<>();
             map.put("company", address.getName());
@@ -446,12 +453,10 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
             map.put("longitude", address.getLatLng().longitude);
             saveOutAddress(map);
 
-            BillGroupModel latLngGroupModel = new BillGroupModel();
-            latLngGroupModel.setForm(true);
-
             BillGroupModel.BillModel latBillModel = new BillGroupModel.BillModel();
             latBillModel.setField("mp_latitude");
             latBillModel.setDisplay(address.getLatLng().latitude + "");
+
             BillGroupModel.BillModel lngBillModel = new BillGroupModel.BillModel();
             lngBillModel.setField("mp_longitude");
             lngBillModel.setDisplay(address.getLatLng().longitude + "");
@@ -459,8 +464,8 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
             latLngGroupModel.addHide(latBillModel);
             latLngGroupModel.addHide(lngBillModel);
 
-            billGroupModels.add(latLngGroupModel);
         }
+        billGroupModels.add(latLngGroupModel);
 
         mBillPresenter.saveAndSubmit(billGroupModels);
     }

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitDetailsActivity.java

@@ -398,13 +398,14 @@ public class CustomerVisitDetailsActivity extends OABaseActivity implements Bill
             }
             if (mBillModel.getIsdefault() == -1 && !mBillModel.getType().equals("H")) {
                 mGroupModel.addShow(mBillModel);
+
+                if ("T".equals(updatable)) {
+                    mGroupModel.addUpdate(mBillModel);
+                }
             } else {
                 mGroupModel.addHide(mBillModel);
             }
 
-            if ("T".equals(updatable)) {
-                mGroupModel.addUpdate(mBillModel);
-            }
         }
     }
 
@@ -514,6 +515,13 @@ public class CustomerVisitDetailsActivity extends OABaseActivity implements Bill
             return;
         }*/
 
+        BillGroupModel latLngGroupModel = new BillGroupModel();
+        latLngGroupModel.setForm(true);
+
+        BillGroupModel.BillModel deviceModel = new BillGroupModel.BillModel();
+        deviceModel.setField("mp_sourceequipment");
+        deviceModel.setDisplay("Android");
+        latLngGroupModel.addHide(deviceModel);
         if (address != null && address.getLatLng() != null) {
             Map<String, Object> map = new HashMap<>();
             map.put("company", address.getName());
@@ -523,21 +531,19 @@ public class CustomerVisitDetailsActivity extends OABaseActivity implements Bill
             map.put("longitude", address.getLatLng().longitude);
             saveOutAddress(map);
 
-            BillGroupModel latLngGroupModel = new BillGroupModel();
-            latLngGroupModel.setForm(true);
 
             BillGroupModel.BillModel latBillModel = new BillGroupModel.BillModel();
             latBillModel.setField("mp_latitude");
             latBillModel.setDisplay(address.getLatLng().latitude + "");
             BillGroupModel.BillModel lngBillModel = new BillGroupModel.BillModel();
+            
             lngBillModel.setField("mp_longitude");
             lngBillModel.setDisplay(address.getLatLng().longitude + "");
 
             latLngGroupModel.addHide(latBillModel);
             latLngGroupModel.addHide(lngBillModel);
-
-            billGroupModels.add(latLngGroupModel);
         }
+        billGroupModels.add(latLngGroupModel);
 
         saveAndSubmit(billGroupModels);
     }