提交分类： 打包版本；

提交内容：  通用表单多从表的dbfind取值caller
当前版本：  正式版本6.6.1
是否冲突：  否

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -107,7 +107,7 @@ public class CommonUtil {
 //        }
 //        baseUrl = "http://192.168.253.12/APP/";
 //        baseUrl = "http://192.168.253.52:8080/ERP/";
-//        baseUrl = "http://192.168.253.63:8080/ERP/";
+        baseUrl = "http://192.168.253.63:8080/ERP/";
         return baseUrl;
     }
 

app_modular/apputils/src/main/java/com/modular/apputils/activity/BillInputActivity.java

@@ -24,13 +24,13 @@ import com.common.data.CalendarUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.data.TextUtil;
 import com.common.file.FileUtils;
 import com.common.ui.CameraUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
+import com.core.utils.CommonUtil;
 import com.core.utils.StatusBarUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.DateTimePicker;
@@ -142,9 +142,13 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.saveAndSubmit) {
-            mBillPresenter.saveAndSubmit(mBillAdapter.getBillGroupModels());
+            if (!CommonUtil.isRepeatClick(3000)) {
+                mBillPresenter.saveAndSubmit(mBillAdapter.getBillGroupModels());
+            }
         } else if (item.getItemId() == R.id.list) {
-            toDataFormList();
+            if (!CommonUtil.isRepeatClick()) {
+                toDataFormList();
+            }
         }
         return super.onOptionsItemSelected(item);
     }
@@ -396,7 +400,8 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
         }
         startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                         .putExtra("fieldKey", fieldKey)
-                        .putExtra("caller", mBillPresenter.getFormCaller())
+                        .putExtra("caller", mGroupModel == null ? mBillPresenter.getFormCaller()
+                                : mGroupModel.getBillCaller())
                         .putExtra("gCaller", gridCaller)
                         .putExtra("mCondition", mCondition)
                         .putExtra("isDevice", false)
@@ -563,17 +568,17 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
     }
 
     protected void handlerSelectDbFind(JSONObject object, int groupId, boolean isForm) {
-        if (isForm){
+        if (isForm) {
             List<BillGroupModel.BillModel> formBillModels = mBillAdapter.getFormBillModels();
 
-            if (!ListUtils.isEmpty(formBillModels)){
+            if (!ListUtils.isEmpty(formBillModels)) {
                 for (BillGroupModel.BillModel billModel : formBillModels) {
                     if (object.containsKey(billModel.getField())) {
                         billModel.setValue(JSONUtil.getText(object, billModel.getField()));
                     }
                 }
             }
-        }else {
+        } else {
             BillGroupModel mBillGroupModel = mBillAdapter.getBillGroupModel(groupId);
             if (mBillGroupModel != null) {
                 if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {

app_modular/apputils/src/main/java/com/modular/apputils/model/BillGroupModel.java

@@ -24,6 +24,8 @@ public class BillGroupModel {
     private String keyField;//提交时候主表或明细表id字段名称
     private Map<String, Object> mTagMap;//附带信息
 
+    private String billCaller;//表caller
+
     private List<BillModel> hideBillFields;//当前组隐藏的字段列表
     private List<BillModel> showBillFields;//当前组显示的字段列表
 
@@ -116,6 +118,13 @@ public class BillGroupModel {
         this.group = group;
     }
 
+    public String getBillCaller() {
+        return billCaller;
+    }
+
+    public void setBillCaller(String billCaller) {
+        this.billCaller = billCaller;
+    }
 
     public String getKeyField() {
         return keyField;

app_modular/apputils/src/main/java/com/modular/apputils/presenter/BillPresenter.java

@@ -575,7 +575,12 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
             Map<String, BillGroupModel> formdeMap = handlerFormdetail(formdetail);
             if (formdeMap != null && !formdeMap.isEmpty()) {
                 for (Map.Entry<String, BillGroupModel> entry : formdeMap.entrySet()) {
-                    showBillModels.add(entry.getValue());
+                    BillGroupModel entryValue = entry.getValue();
+                    if (entryValue != null) {
+                        //主表caller为单据caller
+                        entryValue.setBillCaller(mCaller);
+                        showBillModels.add(entryValue);
+                    }
                 }
                 if (!ListUtils.isEmpty(showBillModels)) {
                     Collections.sort(showBillModels, mComparator);
@@ -602,8 +607,11 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
                 Map<String, BillGroupModel> gridGroupModelMap = handlerGridetail(showBillModels.size(), gridetail);
                 if (gridGroupModelMap != null && !gridGroupModelMap.isEmpty()) {
                     for (Map.Entry<String, BillGroupModel> entry : gridGroupModelMap.entrySet()) {
-                        if (entry.getValue() != null) {
-                            showBillModels.add(entry.getValue());
+                        BillGroupModel entryValue = entry.getValue();
+                        if (entryValue != null) {
+                            //单从表的情况下，从表caller和主表一样
+                            entryValue.setBillCaller(mCaller);
+                            showBillModels.add(entryValue);
                         }
                     }
                 }
@@ -623,16 +631,20 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
                 JSONArray detailgrid = otherGrid.getJSONArray("detailgrid");
                 if (detailgrid != null && detailgrid.size() > 0) {
                     BillGroupModel.GridTab gridTab = new BillGroupModel.GridTab();
+                    String dgcaller = JSONUtil.getText(otherGrid, "dgcaller");
                     gridTab.setTitle(JSONUtil.getText(otherGrid, "dgtitle"));
-                    gridTab.setCaller(JSONUtil.getText(otherGrid, "dgcaller"));
+                    gridTab.setCaller(dgcaller);
                     gridTab.setPosition(i);
 
                     Map<String, BillGroupModel> gridGroupModelMap = handlerGridetail(index, detailgrid);
                     if (gridGroupModelMap != null && !gridGroupModelMap.isEmpty()) {
                         List<BillGroupModel> billGroupModels = new ArrayList<>();
                         for (Map.Entry<String, BillGroupModel> entry : gridGroupModelMap.entrySet()) {
-                            if (entry.getValue() != null) {
-                                billGroupModels.add(entry.getValue());
+                            BillGroupModel entryValue = entry.getValue();
+                            if (entryValue != null) {
+                                //多从表的情况下，从表caller与主表不同
+                                entryValue.setBillCaller(dgcaller);
+                                billGroupModels.add(entryValue);
                             }
                         }
                         gridTab.setBillGroupModels(billGroupModels);

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

@@ -19,7 +19,6 @@ import android.widget.ScrollView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
-import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.TextUtil;
@@ -33,12 +32,10 @@ import com.core.widget.view.MyGridView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.modular.apputils.activity.BillDetailsActivity;
-import com.modular.apputils.activity.BillInputActivity;
 import com.modular.apputils.activity.BillListActivity;
 import com.modular.apputils.adapter.EasyBaseAdapter;
 import com.modular.apputils.model.BillListConfig;
 import com.modular.apputils.model.EasyBaseModel;
-import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.CustomerCareListAdapter;
 import com.uas.appworks.presenter.CustomerManagePresenter;
@@ -249,9 +246,9 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
         map.put("item_name", "客户联系人");
         list.add(map);
 
-        /*map = new HashMap<>();
+        map = new HashMap<>();
         map.put("item_name", "拜访报告");
-        list.add(map);*/
+        list.add(map);
 
 //        map = new HashMap<>();
 //        map.put("item_name", "正式客户");
@@ -424,11 +421,11 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
                 mId = -1;
                 clazz = CustomerContactActivity.class;
                 break;
-            /*case 2:
+            case 2:
                 mCaller = "VisitRecord";
                 mTitle = "拜访报告";
                 clazz = VisitRecordBillInputActivity.class;
-                break;*/
+                break;
         }
         startActivity(new Intent(ct, clazz)
                 .putExtra(Constants.Intents.CALLER, mCaller)

app_modular/appworks/src/main/res/layout/activity_business_manage_home.xml

@@ -59,7 +59,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
-                        android:text="公司商机库"
+                        android:text="公共商机"
                         android:textColor="#333333"
                         android:textSize="12sp" />
                 </LinearLayout>