提交分类： 发布版本；

提交内容：  1、安捷诚外勤计划打包发布
当前版本：  正式版本6.6.4
是否冲突：  否

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectAimActivity.java

@@ -33,7 +33,7 @@ import java.util.List;
 /*选择拜访目的地*/
 public class SelectAimActivity extends OABaseActivity implements ISelectAim {
 
-//    @ViewInject(R.id.search_edit)
+    //    @ViewInject(R.id.search_edit)
     @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
     @ViewInject(R.id.mapView)
@@ -44,7 +44,6 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
     private SelectAimPresenter presenter;
 
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -58,14 +57,20 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
     private void initData() {
         Intent intent = getIntent();
         int type = 0;
+        String search = "";
         if (intent != null) {
             type = intent.getIntExtra("type", 0);
             String title = intent.getStringExtra("title");
             if (!StringUtil.isEmpty(title))
-              setTitle(title);
+                setTitle(title);
+            search = intent.getStringExtra("search");
         }
         presenter = new SelectAimPresenter(this);
         presenter.start(type);
+
+        if (!StringUtil.isEmpty(search)) {
+            voiceSearchView.setText(search);
+        }
     }
 
     private void initEvent() {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Jan 08 11:19:36 CST 2019
+#Fri Jan 11 19:41:29 CST 2019
 debugName=971
-versionName=670
+versionName=664
 debugCode=971
-versionCode=225
+versionCode=219

app_core/common/src/main/java/com/core/app/Constants.java

@@ -571,6 +571,7 @@ public class Constants {
         String MY_DOIT = "isMe";//是否我负责
         String CALLER = "mCaller";
         String STATUS = "mStatus";
+        String BILL_STATUS = "bill_status";
         String CONDITION = "mCondition";
         String ID = "mId";
         String TITLE = "mTitlte";

app_modular/apputils/src/main/java/com/modular/apputils/adapter/BillAdapter.java

@@ -44,6 +44,8 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
     protected List<BillGroupModel.BillModel> mFormBillModels;
     //可更新的字段列表
     protected List<BillGroupModel.BillModel> mUpdateBillModels;
+    //所有字段列表
+    protected List<BillGroupModel.BillModel> mAllBillModels;
     protected OnAdapterListener mOnAdapterListener;
     protected int mTabIndex = -1;
     private int mTabPosition = 0;
@@ -102,6 +104,10 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
         this.mShowBillModels = showBillModels;
     }
 
+    public List<BillGroupModel.BillModel> getmAllBillModels() {
+        return mAllBillModels;
+    }
+
     /**
      * 当外界的因素引起mBillGroupModels变化时候，通过遍历将mBillGroupModels转成mShowBillModels进行显示
      */
@@ -121,6 +127,11 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
         } else {
             mUpdateBillModels.clear();
         }
+        if (mAllBillModels == null) {
+            mAllBillModels = new ArrayList<>();
+        } else {
+            mAllBillModels.clear();
+        }
 
         for (int i = 0; i < mBillGroupModels.size(); i++) {
             BillGroupModel e = mBillGroupModels.get(i);
@@ -162,6 +173,12 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
                         mFormBillModels.addAll(e.getHideBillFields());
                     }
                 }
+                if (e.getShowBillFields() != null && !e.getShowBillFields().isEmpty()) {
+                    mAllBillModels.addAll(e.getShowBillFields());
+                }
+                if (e.getHideBillFields() != null && !e.getHideBillFields().isEmpty()) {
+                    mAllBillModels.addAll(e.getHideBillFields());
+                }
             }
         }
     }

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

@@ -23,6 +23,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
+import com.core.base.BaseToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.me.network.app.http.Method;
@@ -243,6 +244,8 @@ public class CustomerVisitActivity extends BaseActivity {
                 String status = JSONUtil.getText(object, "mpd_zdstatus", "status");
                 String doman = JSONUtil.getText(object, "doman");
                 String domanCode = JSONUtil.getText(object, "domanCode");
+                String billstatus = JSONUtil.getText(object, "mp_status");
+
                 mVisitPlan.setId(id);
                 mVisitPlan.setCode(code);
                 mVisitPlan.setRecordDay(DateFormatUtil.long2Str(entryDate, DateFormatUtil.YMD));
@@ -255,6 +258,8 @@ public class CustomerVisitActivity extends BaseActivity {
                 mVisitPlan.setStatus(status);
                 mVisitPlan.setDoman(doman);
                 mVisitPlan.setDomanCode(domanCode);
+                mVisitPlan.setBillStatus(billstatus);
+
                 visitPlanArrayList.add(mVisitPlan);
             }
             datas.put(monthInt, visitPlanArrayList);
@@ -359,7 +364,13 @@ public class CustomerVisitActivity extends BaseActivity {
             }
 //            holder.dateTv.setText(mVisitPlan.getRecordDay());
             holder.doManTv.setText(mVisitPlan.getDoman());
-            holder.statusTv.setText(mVisitPlan.getStatus());
+            String status = mVisitPlan.getStatus();
+            String billStatus = mVisitPlan.getBillStatus();
+            if ("已转单".equals(status)) {
+                holder.statusTv.setText(status);
+            } else {
+                holder.statusTv.setText(billStatus);
+            }
             holder.itemView.setTag(mVisitPlan);
             holder.itemView.setOnClickListener(mOnItemClickListener);
         }
@@ -369,13 +380,24 @@ public class CustomerVisitActivity extends BaseActivity {
             public void onClick(View view) {
                 if (view.getTag() != null && view.getTag() instanceof VisitPlan) {
                     VisitPlan mVisitPlan = (VisitPlan) view.getTag();
-                    startActivity(new Intent(ct, CustomerVisitDetailsActivity.class)
-                            .putExtra(Constants.Intents.TITLE, "客户拜访详情")
-                            .putExtra(Constants.Intents.MY_DOIT, myVisitRb.isChecked())
-                            .putExtra(Constants.Intents.STATUS, mVisitPlan.getStatus())
-                            .putExtra(Constants.Intents.ID, mVisitPlan.getId())
-                            .putExtra(Constants.Intents.CALLER, "MobileOutPlans")
-                    );
+                    String billStatus = mVisitPlan.getBillStatus();
+                    if ("在录入".equals(billStatus)) {
+                        startActivity(new Intent(ct, CustomerVisitBillInputActivity.class)
+                                .putExtra(Constants.Intents.CALLER, "MobileOutPlans")
+                                .putExtra(Constants.Intents.TITLE, "客户拜访计划")
+                                .putExtra(Constants.Intents.DETAILS_CLASS, CustomerVisitDetailsActivity.class)
+                                .putExtra(Constants.Intents.INPUT_CLASS, CustomerVisitBillInputActivity.class)
+                                .putExtra(Constants.Intents.ID, mVisitPlan.getId()));
+                    } else {
+                        startActivity(new Intent(ct, CustomerVisitDetailsActivity.class)
+                                .putExtra(Constants.Intents.TITLE, "客户拜访详情")
+                                .putExtra(Constants.Intents.MY_DOIT, myVisitRb.isChecked())
+                                .putExtra(Constants.Intents.STATUS, mVisitPlan.getStatus())
+                                .putExtra(Constants.Intents.BILL_STATUS, billStatus)
+                                .putExtra(Constants.Intents.ID, mVisitPlan.getId())
+                                .putExtra(Constants.Intents.CALLER, "MobileOutPlans")
+                        );
+                    }
                     dataUpdate = true;
                 }
             }

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

@@ -2,6 +2,7 @@ package com.uas.appworks.crm3_0.activity;
 
 import android.content.Intent;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.PopupWindow;
@@ -71,14 +72,24 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
     private void submitBill() {
         String mp_cuname = "";
         String mp_address = "";
-        List<BillGroupModel.BillModel> showBillModels = mBillAdapter.getShowBillModels();
-        for (BillGroupModel.BillModel billModel : showBillModels) {
-            if ("mp_address".equals(billModel.getField())) {
+        String mp_longitude = "";
+        String mp_latitude = "";
+
+        List<BillGroupModel.BillModel> allBillModels = mBillAdapter.getmAllBillModels();
+        for (BillGroupModel.BillModel billModel : allBillModels) {
+            if ("mp_address".equals(billModel.getField()) && isShow(billModel)) {
                 mp_address = billModel.getValue();
             }
-            if (StringUtil.hasOneEqual(billModel.getField(), "mp_cuname", "mp_xmmc_user")) {
+            if (StringUtil.hasOneEqual(billModel.getField(), "mp_cuname", "mp_xmmc_user") &&
+                    !TextUtils.isEmpty(billModel.getValue()) && isShow(billModel)) {
                 mp_cuname = billModel.getValue();
             }
+            if ("mp_longitude".equals(billModel.getField())) {
+                mp_longitude = billModel.getValue();
+            }
+            if ("mp_latitude".equals(billModel.getField())) {
+                mp_latitude = billModel.getValue();
+            }
         }
 
         if (StringUtil.isEmpty(mp_address)) {
@@ -92,11 +103,27 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
         }
         address.setName(mp_cuname);
         address.setAddress(mp_address);
+        if (address.getLatLng() == null) {
+            try {
+                float lng = Float.parseFloat(mp_longitude);
+                float lat = Float.parseFloat(mp_latitude);
+                if (lat != 0 || lat != 0) {
+                    LatLng latLng = new LatLng(lat, lng);
+                    address.setLatLng(latLng);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
 
 //        loadLatLng(StringUtil.isEmpty(mp_address) ? mp_cuname : mp_address);
         saveAddressAndSubmit();
     }
 
+    private boolean isShow(BillGroupModel.BillModel mBillModel) {
+        return mBillModel.getIsdefault() == -1 && !mBillModel.getType().equals("H");
+    }
+
     @Override
     public void setAdapter(List<BillGroupModel> groupModels) {
         if (!ListUtils.isEmpty(groupModels)) {
@@ -175,8 +202,17 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
             Intent intent = new Intent("com.modular.form.SelectAimActivity");
             startActivityForResult(intent, TAG_COMPANY_SELECT);
         } else if (("mp_address".equals(model.getField()))) {
+            List<BillGroupModel.BillModel> allBillModels = mBillAdapter.getmAllBillModels();
+            String companyName = "";
+            for (BillGroupModel.BillModel billModel : allBillModels) {
+                if (StringUtil.hasOneEqual(billModel.getField(), "mp_cuname", "mp_xmmc_user") &&
+                        !TextUtils.isEmpty(billModel.getValue()) && isShow(billModel)) {
+                    companyName = billModel.getValue();
+                }
+            }
             selectPosition = model.getGroupIndex();
             Intent intent = new Intent("com.modular.form.SelectAimActivity");
+            intent.putExtra("search", companyName);
             startActivityForResult(intent, TAG_ADDRESS_SELECT);
         } else {
             super.toSelect(position, model);

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

@@ -99,13 +99,17 @@ public class CustomerVisitDetailsActivity extends OABaseActivity implements Bill
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
-//        if (isMe) {
-        if (TextUtils.isEmpty(status) || (!"已完成".equals(status) && !"已转单".equals(status))) {
-            if (mListAdapter != null && !ListUtils.isEmpty(mListAdapter.getUpdateBillModels())) {
-                getMenuInflater().inflate(com.modular.apputils.R.menu.menu_input_update, menu);
+        if (TextUtils.isEmpty(mBillStatus)) {
+            return super.onPrepareOptionsMenu(menu);
+        } else if ("已审核".equals(mBillStatus)) {
+            if (TextUtils.isEmpty(status) || (!"已完成".equals(status) && !"已转单".equals(status))) {
+                if (mListAdapter != null && !ListUtils.isEmpty(mListAdapter.getUpdateBillModels())) {
+                    getMenuInflater().inflate(com.modular.apputils.R.menu.menu_input_update, menu);
+                }
             }
+        } else {
+            getMenuInflater().inflate(com.modular.apputils.R.menu.menu_input_edit, menu);
         }
-//        }
         return super.onPrepareOptionsMenu(menu);
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/model/VisitPlan.java

@@ -10,10 +10,11 @@ public class VisitPlan {
     private String customerAddress;
     private long startTime;
     private long endTime;
-    private String status;
+    private String status;//转单状态
     private String doman;
     private String domanCode;
     private String recordDay;
+    private String billStatus;//单据状态
 
     public String getRecordDay() {
         return recordDay == null ? "" : recordDay;
@@ -110,4 +111,12 @@ public class VisitPlan {
     public void setDomanCode(String domanCode) {
         this.domanCode = domanCode;
     }
+
+    public String getBillStatus() {
+        return billStatus;
+    }
+
+    public void setBillStatus(String billStatus) {
+        this.billStatus = billStatus;
+    }
 }