提交分类： 功能优化；

提交内容：  公共询价报价页面逻辑修改
当前版本：  正式版本6.2.3
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Mar 13 17:23:11 CST 2018
-debugName=282
+#Thu Mar 15 16:31:15 CST 2018
+debugName=286
 versionName=622
-debugCode=282
+debugCode=286
 versionCode=161

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

@@ -244,7 +244,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             String customer = JSONUtil.getText(enterpriseObject, "enName");//客户
             String customerAddress = JSONUtil.getText(enterpriseObject, "enAddress");//客户地址
 
-            String userTel = "", userName = "";
+            String userTel = "", userName = "", material = "", productCode = "", productName = "", productCmpcode = "", productBrand = "", productSpec = "";
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
                     || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState)) {
                 userTel = JSONUtil.getText(detailObject, "userTel");
@@ -254,15 +254,24 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             }
             String billNum = JSONUtil.getText(inquiryObject, "code");//单据
 
-            String material = "";
             if (productObject != null) {
                 String title = JSONUtil.getText(productObject, "title");
                 String spec = JSONUtil.getText(productObject, "spec");
                 String code = JSONUtil.getText(productObject, "code");
                 material = code + (TextUtils.isEmpty(title) ? "" : ((TextUtils.isEmpty(code) ? "" : ",\n") + title)
                         + (TextUtils.isEmpty(spec) ? "" : ((TextUtils.isEmpty(code) ? "" : ",\n") + spec)));//物料
+
+                productCode = JSONUtil.getText(productObject, "code");//产品编号
+                productName = JSONUtil.getText(productObject, "title");//产品名称
+                productCmpcode = JSONUtil.getText(productObject, "cmpCode");//产品型号
+                productBrand = JSONUtil.getText(productObject, "brand");//品牌
+                productSpec = JSONUtil.getText(productObject, "spec");//产品规格
             }
 
+            String encapsulation = JSONUtil.getText(detailObject, "encapsulation");//封装
+            String needquantity = JSONUtil.getText(detailObject, "needquantity");//采购数量
+            String unitPrice = JSONUtil.getText(detailObject, "unitPrice");//单价
+            String produceDate = JSONUtil.getText(detailObject, "produceDate");//生产日期
             String currency = JSONUtil.getText(detailObject, "currency");//币别
             String taxrate = JSONUtil.getText(detailObject, "taxrate");//税率
             String environment = JSONUtil.getText(inquiryObject, "environment");//环保要求
@@ -280,10 +289,38 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             }
             mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_customer_phone), userTel, "", "联系电话", "", 0, null));
             mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_bill_num), billNum, "", "单据", "", 0, null));
-            mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_material), material, "", "物料", "", 0, null));
 
-            if (!(Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
-                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState))) {
+            if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)
+                    || Constants.FLAG.STATE_PUBLIC_INQUIRY_DONE.equals(mState)) {
+                if (!TextUtils.isEmpty(productCode)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_product_code), productCode, "", "产品编号", "", 0, null));
+                }
+                if (!TextUtils.isEmpty(productName)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_product_name), productName, "", "产品名称", "", 0, null));
+                }
+                if (!TextUtils.isEmpty(productCmpcode)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_product_cmpcode), productCmpcode, "", "产品型号", "", 0, null));
+                }
+                if (!TextUtils.isEmpty(productBrand)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_product_brand), productBrand, "", "品牌", "", 0, null));
+                }
+                if (!TextUtils.isEmpty(productSpec) && !productSpec.equals(productCmpcode)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_product_spec), productSpec, "", "产品规格", "", 0, null));
+                }
+                if (!TextUtils.isEmpty(encapsulation)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_encapsulation), encapsulation, "", "封装", "", 0, null));
+                }
+                if (!TextUtils.isEmpty(needquantity)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_needquantity), needquantity, "", "采购数量", "", 0, null));
+                }
+                if (!TextUtils.isEmpty(unitPrice) && !TextUtils.isEmpty(currency)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_unitPrice), unitPrice + "(" + currency + ")", "", "单价预算", "", 0, null));
+                }
+                if (!TextUtils.isEmpty(produceDate)) {
+                    mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_produceDate), produceDate, "", "生产日期", "", 0, null));
+                }
+            } else {
+                mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_material), material, "", "物料", "", 0, null));
                 mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_currency), currency, "", "币别", "", 0, null));
                 mB2BDetailListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT, getString(R.string.customer_inquiry_taxrate), taxrate, "", "税率", "", 0, null));
             }

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

@@ -19,6 +19,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.common.data.DateFormatUtil;
 import com.core.app.Constants;
 import com.core.base.activity.BaseMVPActivity;
 import com.core.base.presenter.BasePresenter;
@@ -132,7 +133,8 @@ public class InviteRegisterActivity extends BaseMVPActivity {
     protected void initData() {
         mRegisterUrl = "https://account.ubtob.com/sso/register?inviteUserCode="
                 + CommonUtil.getSharedPreferences(mContext, "b2b_uu")
-                + "&inviteuid=" + CommonUtil.getSharedPreferences(mContext, Constants.CACHE.EN_BUSINESS_CODE);
+                + "&inviteuid=" + CommonUtil.getSharedPreferences(mContext, Constants.CACHE.EN_BUSINESS_CODE)
+                + "&invitationTime=" + DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMMdd");
         mWebView.loadUrl(mRegisterUrl);
     }
 

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

@@ -135,4 +135,13 @@
     <string name="public_inquiry_taxrate">税率(%)</string>
     <string name="have_knew">我知道了</string>
     <string name="notice_cannot_quote">您当前登录的账套未开通B2B服务，无法报价，请切换账套后重试</string>
+    <string name="customer_inquiry_product_code">产品编号</string>
+    <string name="customer_inquiry_product_name">产品名称</string>
+    <string name="customer_inquiry_product_cmpcode">产品型号</string>
+    <string name="customer_inquiry_product_brand">品牌</string>
+    <string name="customer_inquiry_product_spec">产品规格</string>
+    <string name="customer_inquiry_encapsulation">封装</string>
+    <string name="customer_inquiry_needquantity">采购数量</string>
+    <string name="customer_inquiry_unitPrice">单价预算</string>
+    <string name="customer_inquiry_produceDate">生产日期</string>
 </resources>

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

@@ -134,4 +134,13 @@
     <string name="public_inquiry_taxrate">税率(%)</string>
     <string name="have_knew">我知道了</string>
     <string name="notice_cannot_quote">您当前登录的账套未开通B2B服务，无法报价，请切换账套后重试</string>
+    <string name="customer_inquiry_product_code">产品编号</string>
+    <string name="customer_inquiry_product_name">产品名称</string>
+    <string name="customer_inquiry_product_cmpcode">产品型号</string>
+    <string name="customer_inquiry_product_brand">品牌</string>
+    <string name="customer_inquiry_product_spec">产品规格</string>
+    <string name="customer_inquiry_encapsulation">封装</string>
+    <string name="customer_inquiry_needquantity">采购数量</string>
+    <string name="customer_inquiry_unitPrice">单价预算</string>
+    <string name="customer_inquiry_produceDate">生产日期</string>
 </resources>

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

@@ -134,4 +134,13 @@
     <string name="public_inquiry_taxrate">税率(%)</string>
     <string name="have_knew">我知道了</string>
     <string name="notice_cannot_quote">您当前登录的账套未开通B2B服务，无法报价，请切换账套后重试</string>
+    <string name="customer_inquiry_product_code">产品编号</string>
+    <string name="customer_inquiry_product_name">产品名称</string>
+    <string name="customer_inquiry_product_cmpcode">产品型号</string>
+    <string name="customer_inquiry_product_brand">品牌</string>
+    <string name="customer_inquiry_product_spec">产品规格</string>
+    <string name="customer_inquiry_encapsulation">封装</string>
+    <string name="customer_inquiry_needquantity">采购数量</string>
+    <string name="customer_inquiry_unitPrice">单价预算</string>
+    <string name="customer_inquiry_produceDate">生产日期</string>
 </resources>

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

@@ -167,6 +167,15 @@
     <string name="public_inquiry_taxrate">税率(%)</string>
     <string name="have_knew">我知道了</string>
     <string name="notice_cannot_quote">您当前登录的账套未开通B2B服务，无法报价，请切换账套后重试</string>
+    <string name="customer_inquiry_product_code">产品编号</string>
+    <string name="customer_inquiry_product_name">产品名称</string>
+    <string name="customer_inquiry_product_cmpcode">产品型号</string>
+    <string name="customer_inquiry_product_brand">品牌</string>
+    <string name="customer_inquiry_product_spec">产品规格</string>
+    <string name="customer_inquiry_encapsulation">封装</string>
+    <string name="customer_inquiry_needquantity">采购数量</string>
+    <string name="customer_inquiry_unitPrice">单价预算</string>
+    <string name="customer_inquiry_produceDate">生产日期</string>
 
 
 </resources>