提交分类： 打包版本；

提交内容：  B2B商务报价逻辑修改
当前版本：  正式版本6.2.2
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Mar 12 14:01:59 CST 2018
-debugName=271
-versionName=619
-debugCode=271
-versionCode=158
+#Tue Mar 13 10:32:46 CST 2018
+debugName=282
+versionName=621
+debugCode=282
+versionCode=160

app_core/common/src/main/java/com/core/app/Constants.java

@@ -514,6 +514,8 @@ public class Constants {
         String STATE_PUBLIC_INQUIRY_DONE = "public_done";
         String STATE_PUBLIC_INQUIRY_TODO = "public_todo";
 
+        String GET_LOCAL_ENUU = "get_local_enuu";
+
         int RESULT_PURCHASE_ORDER = 111;
         int RESULT_CUSTOMER_INQUIRY = 112;
         int RESULT_PUBLIC_INQUIRY = 113;

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -34,6 +34,7 @@ import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
 import com.core.utils.DialogUtils;
 import com.core.utils.FlexJsonUtil;
+import com.core.utils.ToastUtil;
 import com.core.widget.crouton.Crouton;
 import com.core.widget.crouton.Style;
 
@@ -360,6 +361,7 @@ public class ViewUtil {
                     break;
                 case Constants.SUCCESS_ERP:
                     String result = msg.getData().getString("result");
+                    Log.d("erp_success", result);
                     //B2B商务以及邀请注册等功能需要用到B2B的个人uu号
                     CommonUtil.setSharedPreferences(ct, "b2b_uu", b2b_uu);
                     CommonUtil.setSharedPreferences(ct, Constants.CACHE.EN_BUSINESS_CODE, mBusinessCode);
@@ -432,13 +434,17 @@ public class ViewUtil {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        //必须补位空，才能不覆盖原有的根路径
+        //必须不为空，才能不覆盖原有的根路径
         if (!StringUtil.isEmpty(erp_baseurl)) {
 
             CommonUtil.setSharedPreferences(ct, "erp_master", erp_master);
             CommonUtil.setSharedPreferences(ct, "erp_commpany", erp_company);
-            CommonUtil.setSharedPreferences(ct, "erp_uu", String.valueOf(dataMap.get("uu")));
-            LogUtil.d("ERPLOGIN", "erp_uu1:" + String.valueOf(dataMap.get("uu")));
+            String enuu = String.valueOf(dataMap.get("uu"));
+            if ("null".equals(enuu) || "(null)".equals(enuu)) {
+                enuu = "";
+            }
+            CommonUtil.setSharedPreferences(ct, "erp_uu", enuu);
+            LogUtil.d("ERPLOGIN", "erp_uu1:" + enuu);
             LogUtil.d("ERPLOGIN", "erp_uu2:" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu"));
             CommonUtil.setSharedPreferences(ct, "erp_masterId", erp_masterId);
             CommonUtil.setSharedPreferences(ct, "erp_login", true);
@@ -678,6 +684,10 @@ public class ViewUtil {
                                     @Override
                                     public boolean onSelection(MaterialDialog dialog,
                                                                View view, int which, CharSequence text) {
+                                        if (!CommonUtil.isNetWorkConnected(ct)) {
+                                            ToastUtil.showToast(ct, R.string.networks_out);
+                                            return true;
+                                        }
                                         if (!StringUtil.isEmpty(text.toString())) {
                                             LoginEntity entity = erpEntities.get(which);
                                             erp_phone = phone;
@@ -1081,5 +1091,6 @@ public class ViewUtil {
         CommonUtil.clearSharedPreferences(ct, Constants.B2B_SESSION_CACHE);
         CommonUtil.clearSharedPreferences(ct, Constants.B2B_UID_CACHE);
         CommonUtil.clearSharedPreferences(ct, Constants.CACHE.EN_BUSINESS_CODE);
+        CommonUtil.clearSharedPreferences(ct, Constants.CACHE.B2B_BUSINESS_ENUU);
     }
 }

app_modular/apputils/src/main/java/com/modular/apputils/IntentUrlActivity.java

@@ -46,7 +46,8 @@ public class IntentUrlActivity extends Activity {
                 if (uri != null) {
                     String pagekind = uri.getQueryParameter("pagekind");
                     String id = uri.getQueryParameter("id");
-                    String enuu = uri.getQueryParameter("uu");
+//                    String enuu = uri.getQueryParameter("uu");
+                    String enuu = Constants.FLAG.GET_LOCAL_ENUU;
                     String phone = uri.getQueryParameter("telephone");
 
                     LogUtil.d(TAG, "pagekind:" + pagekind + " id:" + id + " enuu:" + enuu);
@@ -55,7 +56,6 @@ public class IntentUrlActivity extends Activity {
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, id);
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO);
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU, enuu);
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_TEL, phone);
                         startActivity(intent);
                     }
                     if ("B".equals(pagekind)) {//公共询价单
@@ -63,7 +63,6 @@ public class IntentUrlActivity extends Activity {
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, id);
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO);
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU, enuu);
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_TEL, phone);
                         startActivity(intent);
                     }
                     if ("C".equals(pagekind)) {
@@ -71,7 +70,6 @@ public class IntentUrlActivity extends Activity {
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, id);
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, Constants.FLAG.STATE_PURCHASE_ORDER_TODO);
                         intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU, enuu);
-                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_TEL, phone);
                         startActivity(intent);
                     }
                     if (TextUtils.isEmpty(pagekind) || "null".equals(pagekind)) {

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

@@ -1,6 +1,7 @@
 package com.uas.appworks.OA.platform.activity;
 
 import android.content.Intent;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -8,6 +9,8 @@ import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -89,7 +92,10 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
             mJson = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON);
             enUU = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU);
             mPhone = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_TEL);
-            if (TextUtils.isEmpty(enUU)) {
+
+            if (Constants.FLAG.GET_LOCAL_ENUU.equals(enUU)) {
+                enUU = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu");
+            } else {
                 enUU = CommonUtil.getSharedPreferences(mContext, Constants.CACHE.B2B_BUSINESS_ENUU);
             }
             if (TextUtils.isEmpty(mPhone)) {
@@ -161,6 +167,19 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     private boolean replyed;
 
     private void verifiReply(List<Purchase> purchases) {
+        if (TextUtils.isEmpty(enUU)) {
+            new MaterialDialog.Builder(this)
+                    .title(R.string.prompt_title)
+                    .content(R.string.notice_cannot_quote)
+                    .positiveText(R.string.have_knew)
+                    .onPositive(new MaterialDialog.SingleButtonCallback() {
+                        @Override
+                        public void onClick(@NonNull MaterialDialog materialDialog, @NonNull DialogAction dialogAction) {
+                            materialDialog.dismiss();
+                        }
+                    }).build().show();
+            return;
+        }
         List<Map<String, Object>> mapList = new ArrayList<>();
         for (int i = 1; i < purchases.size(); i++) {
             Purchase purchase = purchases.get(i);

app_modular/appworks/src/main/java/com/uas/appworks/activity/CustomerInquiryDetailActivity.java

@@ -2,6 +2,7 @@ package com.uas.appworks.activity;
 
 import android.content.Intent;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -9,6 +10,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -105,7 +108,9 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             mEnuu = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU);
             mPhone = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_TEL);
 
-            if (TextUtils.isEmpty(mEnuu)) {
+            if (Constants.FLAG.GET_LOCAL_ENUU.equals(mEnuu)) {
+                mEnuu = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu");
+            } else {
                 mEnuu = CommonUtil.getSharedPreferences(mContext, Constants.CACHE.B2B_BUSINESS_ENUU);
             }
 
@@ -254,8 +259,8 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
                 String title = JSONUtil.getText(productObject, "title");
                 String spec = JSONUtil.getText(productObject, "spec");
                 String code = JSONUtil.getText(productObject, "code");
-                material = code + (TextUtils.isEmpty(title) ? "" : (",\n" + title)
-                        + (TextUtils.isEmpty(spec) ? "" : (",\n" + spec)));//物料
+                material = code + (TextUtils.isEmpty(title) ? "" : ((TextUtils.isEmpty(code) ? "" : ",\n") + title)
+                        + (TextUtils.isEmpty(spec) ? "" : ((TextUtils.isEmpty(code) ? "" : ",\n") + spec)));//物料
             }
 
             String currency = JSONUtil.getText(detailObject, "currency");//币别
@@ -373,6 +378,19 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             mB2BQuotePriceBeans.add(createB2BQuotePriceBean(0, "", ""));
             mB2BQuotePriceAdapter.notifyDataSetChanged();
         } else if (i == R.id.customer_inquiry_detail_quote_btn) {
+            if (TextUtils.isEmpty(mEnuu)) {
+                new MaterialDialog.Builder(this)
+                        .title(R.string.prompt_title)
+                        .content(R.string.notice_cannot_quote)
+                        .positiveText(R.string.have_knew)
+                        .onPositive(new MaterialDialog.SingleButtonCallback() {
+                            @Override
+                            public void onClick(@NonNull MaterialDialog materialDialog, @NonNull DialogAction dialogAction) {
+                                materialDialog.dismiss();
+                            }
+                        }).build().show();
+                return;
+            }
             List<B2BQuotePriceBean> b2BQuotePriceBeans = mB2BQuotePriceAdapter.getB2BQuotePriceBeans();
             List<B2BDetailListBean> b2BDetailListBeans = mB2BDetailListAdapter.getB2BDetailListBeans();
 
@@ -450,6 +468,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
             params.put("useruu", CommonUtil.getSharedPreferences(mContext, "b2b_uu"));
 
+            LogUtil.d("inquiryparam", params.toString());
             showLoading(null);
             String url = "mobile/sale/inquiry/items/" + mId + "/reply";
             String host = new ApiPlatform().getBaseUrl();

app_modular/appworks/src/main/res/values-en/strings.xml

@@ -133,4 +133,6 @@
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
     <string name="please_select_currency">请选择币别</string>
     <string name="public_inquiry_taxrate">税率(%)</string>
+    <string name="have_knew">我知道了</string>
+    <string name="notice_cannot_quote">您当前登录的账套未开通B2B服务，无法报价，请切换账套后重试</string>
 </resources>

app_modular/appworks/src/main/res/values-zh-rCN/strings.xml

@@ -132,4 +132,6 @@
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
     <string name="please_select_currency">请选择币别</string>
     <string name="public_inquiry_taxrate">税率(%)</string>
+    <string name="have_knew">我知道了</string>
+    <string name="notice_cannot_quote">您当前登录的账套未开通B2B服务，无法报价，请切换账套后重试</string>
 </resources>

app_modular/appworks/src/main/res/values-zh-rTW/strings.xml

@@ -132,4 +132,6 @@
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
     <string name="please_select_currency">请选择币别</string>
     <string name="public_inquiry_taxrate">税率(%)</string>
+    <string name="have_knew">我知道了</string>
+    <string name="notice_cannot_quote">您当前登录的账套未开通B2B服务，无法报价，请切换账套后重试</string>
 </resources>

app_modular/appworks/src/main/res/values/strings.xml

@@ -165,6 +165,8 @@
     <string name="register_unsuccessed_sure_to_exit">注册未完成，确定退出？</string>
     <string name="please_select_currency">请选择币别</string>
     <string name="public_inquiry_taxrate">税率(%)</string>
+    <string name="have_knew">我知道了</string>
+    <string name="notice_cannot_quote">您当前登录的账套未开通B2B服务，无法报价，请切换账套后重试</string>
 
 
 </resources>