提交类型 修改需求

提交内容
1.添加消息模块数据库两个字段，将数据库版本提高到89
2.修改采购单详情界面内容，现还有回复接口需要调节一下
3.修改通用单据详情界面，避免一场出现
4.修改消息模块相关内容，针对审批知会消息进行第三层处理

冲突文件 版本文件、ViewUtil  取网络

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 17 16:30:39 CST 2018
-debugName=472
+#Wed Jan 17 17:15:10 CST 2018
+debugName=474
 versionName=624
-debugCode=472
+debugCode=474
 versionCode=163

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/MsgThirdWebActivity.java

@@ -13,11 +13,7 @@ import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
 /**
  * Created by Bitlike on 2018/1/16.
  */
-
 public class MsgThirdWebActivity extends MessageWebActivity {
-
-
-
     @Override
     protected WebChromeClient getWebChromeClient() {
         return new WebChromeClient() {

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PurchaseDetailsActivity.java

@@ -16,6 +16,7 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -145,7 +146,8 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
         builder.mode(Method.POST)
                 .url("mobile/sale/orders/items/" + purchases.getId() + "/reply")
                 .addParams("en_uu", enuu)
-                .addParams("body", json)
+                .addParams("json", json)
+                .record(0x12)
                 .showLog(true)
                 .autoProgress(true)
                 .addParams("user_tel", phone);
@@ -172,6 +174,10 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
             case 0x11:
                 handleMessage(message);
                 break;
+            case 0x12:
+                Toast.makeText(ct, "回复成功", Toast.LENGTH_SHORT).show();
+                finish();
+                break;
         }
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/BusinessTravelAdapter.java

@@ -322,12 +322,15 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     }
 
     private void reserve(BusinessTravel model) {
-        LogUtil.i("点击了预约/订票");
         Map<String, Object> map = new HashMap<>();
-        map.put("traverorderno",model.getCode());
-        map.put("product",model.getTitleCode());
-        map.put("costname","成本中心");
-        map.put("proname","UU互联出差单申报");
+        map.put("traverorderno", model.getCode());
+        map.put("product", model.getTitleCode());
+        map.put("costname", "成本中心");
+        map.put("proname", "UU互联差旅订票");
+        map.put("fpd_id", model.getId());
+        map.put("master", CommonUtil.getMaster());
+        map.put("baseUrl", CommonUtil.getAppBaseUrl(ct));
+        map.put("emCode", CommonUtil.getEmcode());
         String p = JSONUtil.map2JSON(map);
         turn2Web(p);
     }
@@ -339,6 +342,7 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
     private void turn2Web(String p) {
         //TODO 测试数据
+        LogUtil.i("p="+p);
         String appkey = "y8gd87dsdkencgzk394k7s5c78io35c";
         String username = "huangx";
         String appSceret = "e212e142a5c9e0590eefb7d9f1bc91d7";