提交分类： 功能开发；

提交内容：  增加币种字段
当前版本：  测试版本6.1.1
是否冲突：  否

WeiChat/build.gradle

@@ -120,7 +120,7 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
 
-    applicationVariants.all { variant ->
+    /*applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def outputFile = output.outputFile
             def fileName
@@ -142,7 +142,7 @@ android {
                 output.outputFile = new File(outputFile.parent, fileName)
             }
         }
-    }
+    }*/
 }
 
 dependencies {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Jan 23 17:51:35 CST 2018
-debugName=135
+#Wed Jan 24 15:21:30 CST 2018
+debugName=142
 versionName=613
-debugCode=135
+debugCode=142
 versionCode=152

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

@@ -17,6 +17,7 @@ public class Constants {
         String url = "";
         if (BaseConfig.isDebug()) {
             url = IM_BASE_URL_TEST;
+            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }
@@ -487,9 +488,6 @@ public class Constants {
          */
         String B2B_COMPANY_BEAN = "b2b_company_bean";
 
-        String KEY_PURCHASE_ID = "key_purchase_id";
-        String KEY_PURCHASE_STATUS = "key_purchase_status";
-
         String EXTRA_B2B_LIST_ID = "extra_b2b_list_id";
         String EXTRA_B2B_LIST_STATE = "extra_b2b_list_state";
         String EXTRA_B2B_LIST_ENUU = "extra_b2b_list_enuu";

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -58,7 +58,6 @@ import com.modular.appmessages.util.ApprovalUtil;
 import com.modular.apputils.utils.SwitchUtil;
 import com.modular.booking.activity.services.BServiceListActivity;
 import com.modular.booking.model.SBMenuModel;
-import com.uas.appworks.CRM.erp.activity.DeviceManageActivity;
 import com.uas.appworks.OA.platform.activity.BusinessTravelActivity;
 import com.uas.appworks.OA.platform.activity.PurchaseDetailsActivity;
 
@@ -1273,7 +1272,7 @@ public class MessagePresenter implements OnHttpResultListener {
                 ct.startActivity(intent);
                 break;
             case 10:
-                intent = new Intent(ct, PurchaseDetailsActivity.class).putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, "待回复");
+                intent = new Intent(ct, PurchaseDetailsActivity.class).putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, "待回复");
                 ct.startActivity(intent);
                 break;
             default:

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

@@ -68,8 +68,8 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     protected void init() throws Exception {
         Intent intent = getIntent();
         if (intent != null) {
-            varId = intent.getStringExtra(Constants.FLAG.KEY_PURCHASE_ID);
-            varStatus = intent.getStringExtra(Constants.FLAG.KEY_PURCHASE_STATUS);
+            varId = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_ID);
+            varStatus = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE);
             enUU = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU);
             if (TextUtils.isEmpty(enUU)) {
                 enUU = CommonUtil.getSharedPreferences(mContext, Constants.CACHE.B2B_BUSINESS_ENUU);
@@ -317,7 +317,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             if (changeStatus) {
-                setResult(Constants.FLAG.RESULT_PURCHASE_ORDER, new Intent().putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, varStatus));
+                setResult(Constants.FLAG.RESULT_PURCHASE_ORDER, new Intent().putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, varStatus));
             }
         }
         return super.onOptionsItemSelected(item);
@@ -326,7 +326,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK && changeStatus) {
-            setResult(Constants.FLAG.RESULT_PURCHASE_ORDER, new Intent().putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, varStatus));
+            setResult(Constants.FLAG.RESULT_PURCHASE_ORDER, new Intent().putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, varStatus));
         }
         return super.onKeyDown(keyCode, event);
     }

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

@@ -175,8 +175,9 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 mSelectPosition = i;
                 Intent intent = new Intent();
                 intent.setClass(mContext, PurchaseDetailsActivity.class);
-                intent.putExtra(Constants.FLAG.KEY_PURCHASE_ID, mPurchaseOrderBeans.get(i).getId());
-                intent.putExtra(Constants.FLAG.KEY_PURCHASE_STATUS, mPurchaseOrderBeans.get(i).getBillState());
+                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID, mPurchaseOrderBeans.get(i).getId());
+                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE, mPurchaseOrderBeans.get(i).getBillState());
+                intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_JSON, mPurchaseOrderBeans.get(i).getJsonData());
                 startActivityForResult(intent, REQUEST_PURCHASE_DETAIL);
             }
         });
@@ -329,7 +330,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_PURCHASE_DETAIL
                 && resultCode == Constants.FLAG.RESULT_PURCHASE_ORDER && data != null) {
-            String purchaseStatus = data.getStringExtra(Constants.FLAG.KEY_PURCHASE_STATUS);
+            String purchaseStatus = data.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE);
             B2BBusinessListBean b2BBusinessListBean = mPurchaseOrderBeans.get(mSelectPosition);
             if (b2BBusinessListBean != null) {
                 b2BBusinessListBean.setBillState(purchaseStatus);
@@ -536,7 +537,8 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                     b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
                 }
                 b2BBusinessListBean.setBillNum(JSONUtil.getText(contentObject, "code"));
-                b2BBusinessListBean.setMaterialNum("ddd");
+                b2BBusinessListBean.setCurrency(JSONUtil.getText(contentObject, "currency"));
+
                 JSONArray orderItems = contentObject.getJSONArray("orderItems");
                 if (orderItems == null || orderItems.size() == 0) {
                     b2BBusinessListBean.setMoney("0");

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

@@ -229,8 +229,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(spec) ? "" : (",\n" + spec)
-                        + (TextUtils.isEmpty(title) ? "" : (",\n" + title)));//物料
+                material = code + (TextUtils.isEmpty(title) ? "" : (",\n" + title)
+                        + (TextUtils.isEmpty(spec) ? "" : (",\n" + spec)));//物料
             }
 
             String currency = JSONUtil.getText(detailObject, "currency");//币别

app_modular/appworks/src/main/java/com/uas/appworks/adapter/B2bBusinessListAdapter.java

@@ -132,7 +132,8 @@ public class B2bBusinessListAdapter extends BaseMultiItemQuickAdapter<B2BBusines
         holder.setText(R.id.list_purchase_order_company_tv, b2BBusinessListBean.getCompanyName());
         holder.setText(R.id.list_purchase_order_bill_date_tv, b2BBusinessListBean.getBillDate());
         holder.setText(R.id.list_purchase_order_bill_num_tv, b2BBusinessListBean.getBillNum());
-        holder.setText(R.id.list_purchase_order_money_tv, "¥" + b2BBusinessListBean.getMoney());
+        holder.setText(R.id.list_purchase_order_currency_tv, b2BBusinessListBean.getCurrency());
+        holder.setText(R.id.list_purchase_order_money_tv, b2BBusinessListBean.getMoney());
 
         String billState = b2BBusinessListBean.getBillState();
         if (billState != null) {

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -299,7 +299,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
         if (b2BBusinessListBean != null) {
             if (requestCode == REQUEST_PURCHASE_DETAIL
                     && resultCode == Constants.FLAG.RESULT_PURCHASE_ORDER && data != null) {
-                String purchaseStatus = data.getStringExtra(Constants.FLAG.KEY_PURCHASE_STATUS);
+                String purchaseStatus = data.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE);
                 if (!TextUtils.isEmpty(mListState) && Constants.FLAG.STATE_PURCHASE_ORDER_TODO.equals(mListState)) {
                     if (!Constants.FLAG.STATE_PURCHASE_ORDER_TODO.equals(purchaseStatus)) {
                         mB2BBusinessListBeans.remove(mSelectPosition);
@@ -508,6 +508,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
                 }
                 b2BBusinessListBean.setBillNum(JSONUtil.getText(contentObject, "code"));
+                b2BBusinessListBean.setCurrency(JSONUtil.getText(contentObject, "currency"));
 
                 JSONArray orderItems = contentObject.getJSONArray("orderItems");
                 if (orderItems == null || orderItems.size() == 0) {

app_modular/appworks/src/main/java/com/uas/appworks/model/bean/B2BBusinessListBean.java

@@ -21,6 +21,7 @@ public class B2BBusinessListBean implements MultiItemEntity {
     private String mMaterialNum;//物料编号
     private String mMaterialName;//物料名称
     private String mMaterialSpec;//物料规格
+    private String mCurrency;//币种
     private String mMoney;//金额
     private String mBillState;//单据状态
     private String mExpiryDate;//截止日期
@@ -96,6 +97,14 @@ public class B2BBusinessListBean implements MultiItemEntity {
         mMaterialSpec = materialSpec;
     }
 
+    public String getCurrency() {
+        return mCurrency;
+    }
+
+    public void setCurrency(String currency) {
+        mCurrency = currency;
+    }
+
     public String getMoney() {
         return mMoney;
     }

app_modular/appworks/src/main/res/layout/layout_list_purchase_order.xml

@@ -61,6 +61,31 @@
                 tools:text="2018-01-21" />
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/str_currency"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/list_purchase_order_currency_tv"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:layout_weight="3"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                tools:text="2018-01-21" />
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -123,4 +123,5 @@
     <string name="str_material_name">物料名称：</string>
     <string name="str_material_spec">物料规格：</string>
     <string name="modify_quote_price">修改报价</string>
+    <string name="str_currency">币别：</string>
 </resources>

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

@@ -122,4 +122,5 @@
     <string name="str_material_name">物料名称：</string>
     <string name="str_material_spec">物料规格：</string>
     <string name="modify_quote_price">修改报价</string>
+    <string name="str_currency">币别：</string>
 </resources>

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

@@ -122,4 +122,5 @@
     <string name="str_material_name">物料名称</string>
     <string name="str_material_spec">物料规格</string>
     <string name="modify_quote_price">修改报价</string>
+    <string name="str_currency">币别：</string>
 </resources>

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

@@ -154,6 +154,7 @@
     <string name="str_material_name">物料名称：</string>
     <string name="str_material_spec">物料规格：</string>
     <string name="modify_quote_price">修改报价</string>
+    <string name="str_currency">币别：</string>
 
 
 </resources>