提交类型 修改需求

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

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

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

@@ -122,8 +122,10 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
         requestHttp(builder, this);
     }
 
+    private int replyNumber;
 
     private void verifiReply(List<Purchase> purchases) {
+        replyNumber = 0;
         for (Purchase purchase : purchases) {
             if (!TextUtils.isEmpty(purchase.getDate()) &&
                     !TextUtils.isEmpty(purchase.getNumber()) &&
@@ -134,12 +136,13 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     }
 
     private void reply(Purchase purchases) {
+        replyNumber++;
         int enuu = 10041559;
         String phone = "15671616315";
         Parameter.Builder builder = new Parameter.Builder();
         Map<String, Object> map = new HashMap<>();
         map.put("qty", purchases.getNumber());
-        map.put("delivery", 10);//DateFormatUtil.str2Long(purchases.getDate(),DateFormatUtil.YMD)
+        map.put("delivery", DateFormatUtil.str2Long(purchases.getDate(), DateFormatUtil.YMD));//
         map.put("remark", purchases.getRemarksInput());
         String json = JSONUtil.map2JSON(map);
         LogUtil.i("json=" + json);
@@ -175,8 +178,13 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
                 handleMessage(message);
                 break;
             case 0x12:
-                Toast.makeText(ct, "回复成功", Toast.LENGTH_SHORT).show();
-                finish();
+                replyNumber--;
+                if (replyNumber == 0) {
+                    Toast.makeText(MyApplication.getInstance(), "回复成功", Toast.LENGTH_SHORT).show();
+                    if (this != null) {
+                        this.finish();
+                    }
+                }
                 break;
         }
     }
@@ -221,7 +229,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
         String remarks = JSONUtil.getText(object, "remark");//备注
         String alls = JSONUtil.getText(object, "amount");//总额
         String number = JSONUtil.getText(object, "qty");//数量
-        String date = DateFormatUtil.long2Str(JSONUtil.getLong(object, "delivery"), DateFormatUtil.YMD);//交货日期
+        String date = DateFormatUtil.long2Str(JSONUtil.getLong(object, "replyDelivery", "delivery"), DateFormatUtil.YMD);//交货日期
         String replyRemark = JSONUtil.getText(object, "replyRemark");//采购单号
         purchase.setId(id);
         purchase.setCode(code);