通用表单多从表备份

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.12/ERP/";
-//        baseUrl = "http://192.168.253.228:8080/ERP/";
+//        baseUrl = "http://192.168.253.63:8080/ERP/";
         return baseUrl;
     }
 

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

@@ -42,7 +42,7 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
     protected List<BillGroupModel.BillModel> mShowBillModels;
     protected OnAdapterListener mOnAdapterListener;
     protected int mTabIndex = -1;
-    private int mTabPosition;
+    private int mTabPosition = 0;
     private List<BillGroupModel> mOldTabModels;
 
     public BillAdapter(Context ct, List<BillGroupModel> mBillGroupModels, OnAdapterListener mOnAdapterListener) {
@@ -482,10 +482,17 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
     protected void addGroups(int mGroupIndex) {
         BillGroupModel mBillGroupModel = mBillGroupModels.get(mGroupIndex);
         mBillGroupModel.setLastInType(false);
+        int oldGridIndex = mBillGroupModel.getGridIndex();
+        boolean isForm = mBillGroupModel.isForm();
 
         BillGroupModel newBillGroupModel = new BillGroupModel();
-        newBillGroupModel.setForm(mBillGroupModel.isForm());
-        newBillGroupModel.setGroup(mBillGroupModel.getGroup());
+        newBillGroupModel.setForm(isForm);
+        if (isForm) {
+            newBillGroupModel.setGroup(mBillGroupModel.getGroup());
+        } else {
+            newBillGroupModel.setGroup("明细" + (oldGridIndex + 1));
+        }
+        newBillGroupModel.setGridIndex(oldGridIndex + 1);
         newBillGroupModel.setDeleteAble(true);
         newBillGroupModel.setLastInType(true);
         for (BillGroupModel.BillModel e : mBillGroupModel.getShowBillFields()) {
@@ -498,7 +505,7 @@ public class BillAdapter extends RecyclerView.Adapter<BillAdapter.BaseViewHolder
             BillGroupModel.BillModel tabModel = mShowBillModels.get(mTabIndex);
             if (tabModel != null) {
                 tabModel.getTabList().get(mTabPosition)
-                        .setBillGroupModels(mBillGroupModels.subList(mGroupIndex, mBillGroupModels.size()));
+                        .setBillGroupModels(mBillGroupModels.subList(tabModel.getGroupIndex() + 1, mBillGroupModels.size()));
             }
         }
 

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

@@ -18,6 +18,7 @@ public class BillGroupModel {
     private boolean isForm;//是否为主表
     private boolean lastInType;//是否当前单据明细的最后一个
     private int groupIndex;//当前组所在的整个显示集合里面的索引
+    private int gridIndex;//当前组在明细表内的索引
     private float minDetno = 10000000;//最小的序号
     private String group;//组名
     private String keyField;//提交时候主表或明细表id字段名称
@@ -91,6 +92,14 @@ public class BillGroupModel {
         this.groupIndex = groupIndex;
     }
 
+    public int getGridIndex() {
+        return gridIndex;
+    }
+
+    public void setGridIndex(int gridIndex) {
+        this.gridIndex = gridIndex;
+    }
+
     public boolean isLastInType() {
         return lastInType;
     }

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

@@ -48,6 +48,7 @@ public class BillDetailsPresenter extends BaseNetPresenter {
     private String statusField;//状态字段
     private String detailMainKeyField;//从表
     private boolean multidetailgrid = false;
+    private String mStatusKey;
 
     public String getCaller() {
         return mCaller;
@@ -390,6 +391,7 @@ public class BillDetailsPresenter extends BaseNetPresenter {
                     if (mBillGroupModel == null) {
                         mBillGroupModel = new BillGroupModel();
                         mBillGroupModel.setGroupIndex(index + modelMap.size() - 1);
+                        mBillGroupModel.setGridIndex(modelMap.size() + 1);
                         mBillGroupModel.setGroup("明细" + (modelMap.size() + 1));
                         mBillGroupModel.setLastInType(true);
                         mBillGroupModel.setForm(false);
@@ -440,7 +442,6 @@ public class BillDetailsPresenter extends BaseNetPresenter {
     }
 
     private BillGroupModel.BillModel getBillModelByObject(JSONObject object) {
-        String statusKey = null;
         String status = null;
 
         BillGroupModel.BillModel mBillModel = new BillGroupModel.BillModel();
@@ -463,9 +464,9 @@ public class BillDetailsPresenter extends BaseNetPresenter {
             allowBlank = "F";
         }
 
-        if (TextUtils.isEmpty(statusKey) && ("单据状态".equals(caption) || "状态".equals(caption))) {
-            statusKey = field;
-            status = JSONUtil.getText(object, "cu_auditstatus", statusKey);
+        if (TextUtils.isEmpty(mStatusKey) && ("单据状态".equals(caption) || "状态".equals(caption))) {
+            mStatusKey = field;
+            status = value;
 
             if (!TextUtils.isEmpty(status)) {
                 mIBillDetails.updateStatus(status);

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

@@ -735,7 +735,8 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
             if (mId <= 0) {
                 BillGroupModel mBillGroupModel = new BillGroupModel();
                 mBillGroupModel.setGroupIndex(index);
-                mBillGroupModel.setGroup("明细表");
+                mBillGroupModel.setGridIndex(1);
+                mBillGroupModel.setGroup("明细1");
                 mBillGroupModel.setLastInType(true);
                 mBillGroupModel.setForm(false);
                 List<BillGroupModel.BillModel> hideBillFields = new ArrayList<>();//当前组隐藏的字段列表
@@ -752,7 +753,7 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
                 mBillGroupModel.setHideBillFields(hideBillFields);
                 mBillGroupModel.setShowBillFields(showBillFields);
 
-                modelMap.put("明细表", mBillGroupModel);
+                modelMap.put("明细1", mBillGroupModel);
             } else {
                 JSONObject object = null;
                 String oldGroup = null;
@@ -766,6 +767,7 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
                         if (mBillGroupModel == null) {
                             mBillGroupModel = new BillGroupModel();
                             mBillGroupModel.setGroupIndex(index + modelMap.size() - 1);
+                            mBillGroupModel.setGridIndex(modelMap.size() + 1);
                             mBillGroupModel.setGroup("明细" + (modelMap.size() + 1));
                             mBillGroupModel.setLastInType(true);
                             mBillGroupModel.setForm(false);
@@ -786,6 +788,7 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
                     } else {
                         BillGroupModel mBillGroupModel = new BillGroupModel();
                         mBillGroupModel.setGroupIndex(index + modelMap.size());
+                        mBillGroupModel.setGridIndex(modelMap.size() + 1);
                         mBillGroupModel.setGroup("明细" + (modelMap.size() + 1));
                         mBillGroupModel.setLastInType(true);
                         mBillGroupModel.setForm(false);

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

@@ -4,24 +4,15 @@ package com.uas.appworks.crm3_0.activity;
 import android.content.Intent;
 import android.os.Handler;
 
-import com.common.LogUtil;
-import com.common.data.ListUtils;
-import com.common.data.StringUtil;
 import com.core.app.Constants;
-import com.core.model.OAConfig;
-import com.core.model.SelectCollisionTurnBean;
-import com.core.model.SelectEmUser;
 import com.core.utils.CommonUtil;
 import com.modular.apputils.activity.BillDetailsActivity;
 import com.modular.apputils.activity.BillInputActivity;
 import com.modular.apputils.activity.BillListActivity;
-import com.modular.apputils.adapter.BillAdapter;
-import com.modular.apputils.model.BillGroupModel;
 import com.modular.apputils.model.BillListConfig;
 import com.uas.appworks.R;
 
 import java.util.ArrayList;
-import java.util.List;
 
 //拜访报告录入界面
 public class VisitRecordBillInputActivity extends BillInputActivity {
@@ -78,7 +69,9 @@ public class VisitRecordBillInputActivity extends BillInputActivity {
                 startActivity(new Intent(ct, BillDetailsActivity.class)
                         .putExtra(Constants.Intents.CALLER, mBillPresenter.getFormCaller())
                         .putExtra(Constants.Intents.TITLE, getToolBarTitle())
-                        .putExtra(Constants.Intents.ID, keyValue));
+                        .putExtra(Constants.Intents.ID, keyValue)
+                        .putExtra(Constants.Intents.INPUT_CLASS, VisitRecordBillInputActivity.class)
+                        .putExtra(Constants.Intents.MY_DOIT, true));
                 finish();
                 overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
             }