一会记得清空

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java

@@ -39,6 +39,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
@@ -103,7 +104,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         initView();
-        initDate();
     }
 
     @Override
@@ -287,6 +287,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
      * @param msg_result
      */
     public void AMshow(String msg_result){
+
         try{
             JSONObject amresultJsonObject = new JSONObject(msg_result);
             JSONObject dataObjecty = amresultJsonObject.optJSONObject("datas");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DailydetailsActivity.java

@@ -420,6 +420,8 @@ public class DailydetailsActivity extends BaseActivity {
                                             intent.putExtra("UC_Summary",summary);
                                             intent.putExtra("UC_Plan",plan);
                                             intent.putExtra("UC_Experience",experience);
+                                            intent.putExtra("id",mkeyValue);
+                                            intent.putExtra("resubmit","resubmit");
                                             startActivity(intent);
                                             finish();
                                         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyAddActivity.java

@@ -154,6 +154,7 @@ public class WorkDailyAddActivity extends BaseActivity {
     private String last_change_experience;
     private String last_change_plan;
     private String last_change_summary;
+    private String un_submit;
 
     public void jumptododetail(int mkeyValue) {
         Intent intent = new Intent(activity, DailydetailsActivity.class);
@@ -318,6 +319,9 @@ public class WorkDailyAddActivity extends BaseActivity {
         });
         // 判断有没从详情界面返回的 未提交单据的数据
         Intent intent = getIntent();
+        if (intent.getStringExtra("resubmit") !=null && intent.getStringExtra("resubmit").equals("resubmit")){
+            un_submit = intent.getStringExtra("resubmit");
+        }
         if (intent.getStringExtra("UC_Summary") != null) {
             add_summary.setText(intent.getStringExtra("UC_Summary"));
         } else {
@@ -424,7 +428,8 @@ public class WorkDailyAddActivity extends BaseActivity {
 
 
         //执行重新提交之更改单据状态操作
-        if (!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit") && mkeyValue != 0) {
+        if ((!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit") && mkeyValue != 0) ||
+                (!TextUtils.isEmpty(un_submit) && un_submit.equals("resubmit"))) {
             String sb_summary = string2Json(last_change_summary);
             String sb_plan = string2Json(last_change_plan);
             String sb_experience = string2Json(last_change_experience);