8:02

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

@@ -169,6 +169,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         params.put("update","cb_attch = '"+update+"'");
         params.put("condition","cb_id = '"+cb_id+"'");
         params.put("type","添加附件");
+        params.put("master", "USOFTSYS");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         if (platform){
             headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
@@ -239,19 +240,20 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             }
         });
         if (!platform){
-            getCode();
+//            getCode();
         }
 
         getCommonId();
     }
 
     private void getCommonId() {
-        CommonUtil.getCommonId("http://218.18.115.198:8888/ERP/",ct, "Commentsback_mobile_SEQ", mHandler, common_id_request);
+//        CommonUtil.getCommonId("http://218.18.115.198:8888/ERP/",ct, "Commentsback_mobile_SEQ", mHandler, common_id_request);
         cb_emcode = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
     }
 
     private void getCode() {
         String url = Constants.getAppBaseUrl(ct) + "common/getCodeString.action";
+//        String url = "http://218.18.115.198:8888/ERP/common/getCodeString.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", "Commentsback_mobile");
         params.put("type", 2);
@@ -459,9 +461,9 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
             }
             String formStore = "{\n" +
-                    " \"cb_id\":\"" + cb_id + "\",\n" +
+//                    " \"cb_id\":\"" + cb_id + "\",\n" +
                     " \"cb_emcode\":\"" + cb_emcode + "\",\n" +
-                    " \"cb_code\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu") + "\",\n" +
+//                    " \"cb_code\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu") + "\",\n" +
                     " \"cb_company\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyName") + "\",\n" +
                     " \"cb_whichsys\":\"" + "USOFTSYS" + "\",\n" +
                     " \"cb_kind\":\"问题\",\n" +
@@ -622,9 +624,9 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
             }
             String formStore = "{\n" +
-                    " \"cb_id\":\"" + cb_id + "\",\n" +
+//                    " \"cb_id\":\"" + cb_id + "\",\n" +
                     " \"cb_emcode\":\"" + cb_emcode + "\",\n" +
-                    " \"cb_code\":\"" + cb_code + "\",\n" +
+//                    " \"cb_code\":\"" + cb_code + "\",\n" +
                     " \"cb_company\":\"" + CommonUtil.getSharedPreferences(ct, "erp_commpany") + "\",\n" +
                     " \"cb_whichsys\":\"" + CommonUtil.getSharedPreferences(ct, "erp_master") + "\",\n" +
                     " \"cb_kind\":\"问题\",\n" +
@@ -640,6 +642,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
             ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, http_commit, null, null, "post");
+            release_btn.setEnabled(false);
         } else {
             ToastMessage(getString(R.string.suggest_hink));
         }

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

@@ -254,7 +254,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                         try {
                             JSONObject resultObject = JSON.parseObject(result);
                             if (resultObject != null){
-                                CostUpdatePModel mCostUpdatePModel = new CostUpdatePModel();
+                                mCostUpdatePModel = new CostUpdatePModel();
                                 mCostUpdatePModel = JSON.parseObject(JSON.toJSONString(resultObject),CostUpdatePModel.class);
                                 doShowUpP(mCostUpdatePModel);
                             }
@@ -329,8 +329,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             }
         }
     };
-
-
+    private CostUpdatePModel mCostUpdatePModel;
 
 
     private void doShowUpP(CostUpdatePModel mCostUpdatePModel) {
@@ -607,7 +606,6 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
 
     private void doShowFormData(JSONArray formdataArray, List<CommonDocAMBean.DatasBean.FormconfigsBean> mFormconfigsList) {
         if (!ListUtils.isEmpty(mFormconfigsList)  &&  !ListUtils.isEmpty(formdataArray)){
-            Log.i("fb_attach_ss",fb_attach+"?");
             for (int i = 0; i < mFormconfigsList.size(); i++) {
                 String key = mFormconfigsList.get(i).getFD_FIELD();
                 if (StringUtils.isEmpty(key)) return;
@@ -630,6 +628,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             }
 
             fb_attach = formdataArray.getJSONObject(0).getString("fb_attach");
+            Log.i("fb_attach_ss",fb_attach+"?");
             if (!StringUtils.isEmpty(fb_attach)) {
                 getUpdatePicture(); //获取发票图片
             }else {
@@ -1599,14 +1598,16 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 int viewType = mAdapter.getItemViewType(position);
-                position = (int) parent.getItemIdAtPosition(position);
+                int mPosition = (int) parent.getItemIdAtPosition(position);
                 if (viewType == 1) {
                     showSelectPictureDialog();//第一个
                     //TODO 选择图片页面
 //                    startActivityForResult(new Intent(ct, PhoneSelectActivity.class), 222);
                 } else {
-                    showPictureActionDialog(position);
+                    showPictureActionDialog(mPosition);
                 }
+
+                Log.i("P_position",mPosition+"");
             }
         });
     }
@@ -1626,20 +1627,21 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                 });
         builder.show();
     }
-    private void showPictureActionDialog(final int position) {
+    private void showPictureActionDialog(final int mPosition) {
         String[] items = new String[]{getString(R.string.look_over), getString(R.string.common_delete)};
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.pictures)
                 .setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
+                        Log.i("dP_position",mPosition+"");
                         if (which == 0) {// 查看
                             Intent intent = new Intent(ct, MultiImagePreviewActivity.class);
                             intent.putExtra(AppConstant.EXTRA_IMAGES, mPhotoList);
-                            intent.putExtra(AppConstant.EXTRA_POSITION, position);
+                            intent.putExtra(AppConstant.EXTRA_POSITION, mPosition);
                             intent.putExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
                             startActivity(intent);
                         } else {// 删除
-                            deletePhoto(position);
+                            deletePhoto(mPosition);
                         }
                         dialog.dismiss();
                     }
@@ -1649,10 +1651,10 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
     private void deletePhoto(final int position) {
         if (!StringUtils.isEmpty(fb_attach)) {
             doDeletePAttach(position);
-            LogUtil.prinlnLongMsg("fb_attach",fb_attach);
+            LogUtil.prinlnLongMsg("dfb_attach",fb_attach);
         }
-        mPhotoList.remove(position);
-        mAdapter.notifyDataSetInvalidated();
+            mPhotoList.remove(position);
+            mAdapter.notifyDataSetInvalidated();
     }
 
     /**
@@ -1666,18 +1668,26 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         String[] split = fb_attach.split(";");
             if (posi < split.length) {
                 for (int i = 0; i < split.length; i++) {
-                    fb_attach_list.add(split[i]);
-                    if (i == (split.length-1)){
-                        fb_attach_list.remove(posi);
+                    if (i != posi){
+                        fb_attach_list.add(split[i]);
+                    }
+
+                    if (i == split.length-1){
                         fb_attach = "";
                         for (int j = 0; j < fb_attach_list.size(); j++) {
-                            fb_attach = fb_attach_list.get(j)+";";
+                            fb_attach = fb_attach +fb_attach_list.get(j)+";";
+
+                            if (j == fb_attach_list.size()-1){
+                                Log.i("now_fb_attach", fb_attach.toString());
+                                mCostUpdatePModel.getFiles().remove(posi);
+                                mAdapter.notifyDataSetInvalidated();
+                            }
                         }
                     }
                 }
+            }else {
+                return;
             }
-            Log.i("now_fb_attach", fb_attach.toString());
-
     }
 
     private void takePhoto() {
@@ -1730,7 +1740,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
 
     private void sendPicture() {
         if (ListUtils.isEmpty(mPhotoList))  {
-            if (!StringUtils.isEmpty(fb_attach) && formid != 0){//TODO 跟新操作时带有图片过去却被删掉了，做删除图片附件操作
+            if (!StringUtils.isEmpty(fb_attach) && formid != 0){//TODO 更新操作时带有图片过去却被删掉了，做删除图片附件操作
                 doDeleteUp_fb_attach();
             }else {
 //                commitSuccess(keyValue);
@@ -1755,13 +1765,13 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         if (com.xzjmyk.pm.activity.ui.erp.util.StringUtils.isEmpty(path)) return;
         File waterBitmapToFile=  new File(path);
         if (!waterBitmapToFile.isFile()){
-            if (now_p == mPhotoList.size()-1 && now_p > 0){
+            Log.i("now_p",now_p+"");
+            if (now_p == mPhotoList.size()-1){
                 doUpdateId(update);
-            }else if (now_p == mPhotoList.size()-1 && now_p == 0){
-                commitSuccess(keyValue);
             }else if (now_p < mPhotoList.size()-1){
                 return;
             }
+
         }
         RequestParams params = new RequestParams();
         if (platform){