oa

WeiChat/version.properties

@@ -1,8 +1,8 @@
-#Fri Jan 05 14:38:37 CST 2018
-debugName=395
+#Fri Jan 05 17:41:42 CST 2018
+debugName=396
 >>>>>>>=ee498070608d5e9e61ea28c6cea1571216fbad83
-versionName=613
-debugCode=395
-versionCode=152
+versionName=618
+debugCode=396
+versionCode=157
 =\=\=\=\=\=\=
 <<<<<<<=HEAD

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -1075,7 +1075,7 @@ public class DeviceDataFormAddActivity extends BaseActivity implements View.OnCl
                                 startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                                                 .putExtra("fieldKey", data.getField())
                                                 .putExtra("caller", caller)
-                                                .putExtra("isForm", true)
+                                                .putExtra("isForm", true)//是否是主表
                                         , 90);
 
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -43,15 +43,16 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.ListViewInScroller;
 import com.core.widget.view.model.SelectAimModel;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.widget.view.selectcalendar.bean.Data;
 import com.lidroid.xutils.ViewUtils;
+import com.modular.apputils.activity.SelectNetAcitivty;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
-import com.core.widget.view.selectcalendar.bean.Data;
 import com.uas.appworks.OA.erp.model.form.GroupData;
 import com.uas.appworks.R;
 
@@ -1177,6 +1178,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     fields = new String[]{"ama_customer"};
                                 }
                                 param.put("caller", caller);
+                                LogUtil.d("DataFormDetailActivity","SelectNetAcitivty:"+caller);
                                 if (caller.equals("MainTain")) {
                                     if ("mt_custcode".equals(data.getField())) {
                                         fields = new String[]{"mt_custname"};
@@ -1191,7 +1193,15 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                         fields = new String[]{"mtd_proname", "mtd_remark", "mtd_unit"};
                                         param.put("caller", "sProduct");
                                     }
-
+                                }else{
+                                    //SF类型需求更改，支持联动
+                                    LogUtil.d("DataFormDetailActivity","SelectNetAcitivty:"+caller);
+                                    startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
+                                                    .putExtra("fieldKey", data.getField())
+                                                    .putExtra("caller", caller)
+                                                    .putExtra("isForm", true)//是否是主表
+                                            , 90);
+                                    return;//不处理下面旧的处理逻辑
                                 }
                                 param.put("page", "1");
                                 param.put("which", "form");
@@ -1512,6 +1522,31 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 break;
         }
 
+
+        if (90 == requestCode && data != null) {
+            String json = data.getStringExtra("data");
+            LogUtil.d("DataFormDetailActivity","json=" + json);
+            try {
+                paseSelectDbFind(JSON.parseObject(json));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+
+
+    private void paseSelectDbFind(JSONObject object) throws Exception {
+        List<Data> tempLists = mAdapter.getmListData().get(0).getDatas();
+        if (!ListUtils.isEmpty(tempLists) && object != null && !object.isEmpty()) {
+            for (Data e : tempLists) {
+                if (object.containsKey(e.getField())) {
+                    e.setValue(JSONUtil.getText(object, e.getField()));
+                }
+            }
+            mAdapter.notifyDataSetChanged();
+        }
     }
 
     private void parseResultByField(Intent data) {