2024-08-27 修改

修改：
1. 地接费用录入 根据web端做出调整, 引入三公费用和超支费用参考

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyHeaderAdapter.kt

@@ -3,8 +3,10 @@ package com.pan_american.android.data.model.group_op.ground_convey_payment_inser
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
 import com.pan_american.android.OASystem
 import com.pan_american.android.R
@@ -15,13 +17,21 @@ class GroundConveyHeaderAdapter: RecyclerView.Adapter<GroundConveyHeaderAdapter.
 
     private var currencyCode = ""
 
+    private var overPayCurrencyCode = ""
+
+    private var overPayExchangeRate = ""
+
     private var canBeEdit = true
 
     lateinit var onItemClick: OnItemClick
 
+    lateinit var onItemTextChanged: OnItemTextChanged
+
     inner class HeaderViewHolder(view: View): RecyclerView.ViewHolder(view) {
-        private val groupName: TextView = view.findViewById(R.id.group_name)
+        val groupName: TextView = view.findViewById(R.id.group_name)
         val paymentCurrency: TextView = view.findViewById(R.id.payment_currency)
+        val overPayCurrency: TextView = view.findViewById(R.id.over_pay_currency)
+        val overPayExchangeRate: EditText = view.findViewById(R.id.over_pay_exchange_rate)
         val paymentType: LinearLayout = view.findViewById(R.id.payment_type)
 
         fun bindGroupName(groupName: String) {
@@ -31,6 +41,14 @@ class GroundConveyHeaderAdapter: RecyclerView.Adapter<GroundConveyHeaderAdapter.
         fun bindPaymentCurrencyCode(code: String) {
             this.paymentCurrency.text = code
         }
+
+        fun bindOverPayCurrencyCode(code: String) {
+            this.overPayCurrency.text = code
+        }
+
+        fun bindOverPayCurrencyRate(rate: String) {
+            this.overPayExchangeRate.setText(rate)
+        }
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -50,6 +68,27 @@ class GroundConveyHeaderAdapter: RecyclerView.Adapter<GroundConveyHeaderAdapter.
                 onItemClick.onCurrencyCodeClick()
             }
 
+            headerViewHolder.overPayCurrency.setOnClickListener {
+                onItemClick.onOverPayCurrencyClick()
+            }
+
+            headerViewHolder.overPayExchangeRate.setOnFocusChangeListener { _, flag ->
+
+                if (!flag) {
+                    if (headerViewHolder.overPayExchangeRate.text.isNullOrBlank() || headerViewHolder.overPayExchangeRate.text.toString().toDouble() == 0.0) {
+                        Toast.makeText(OASystem.context, "超支汇率不能为空！", Toast.LENGTH_SHORT).show()
+                        return@setOnFocusChangeListener
+                    }
+
+                    if (headerViewHolder.overPayExchangeRate.text.endsWith('.')) {
+                        return@setOnFocusChangeListener
+                    }
+
+                    overPayExchangeRate = headerViewHolder.overPayExchangeRate.text.toString()
+                    onItemTextChanged.onOverPayExchangeRateChanged()
+                }
+            }
+
             headerViewHolder.paymentType.setOnClickListener {
                 onItemClick.onPaymentTypeClick()
             }
@@ -63,6 +102,8 @@ class GroundConveyHeaderAdapter: RecyclerView.Adapter<GroundConveyHeaderAdapter.
     override fun onBindViewHolder(holder: HeaderViewHolder, position: Int) {
         holder.bindGroupName(groupNameStr)
         holder.bindPaymentCurrencyCode(currencyCode)
+        holder.bindOverPayCurrencyCode(overPayCurrencyCode)
+        holder.bindOverPayCurrencyRate(overPayExchangeRate)
     }
 
     fun setGroupName(str: String) {
@@ -79,12 +120,31 @@ class GroundConveyHeaderAdapter: RecyclerView.Adapter<GroundConveyHeaderAdapter.
         return currencyCode
     }
 
+    fun setOverPayCurrencyCode(str: String) {
+        overPayCurrencyCode = str
+        this.notifyItemChanged(0)
+    }
+
+    fun setOverPayExchangeRate(str: String) {
+        overPayExchangeRate = str
+        this.notifyItemChanged(0)
+    }
+
+    fun getOverPayExchangeRate(): String {
+        return overPayExchangeRate
+    }
+
     fun setCanBeEdit(flag: Boolean) {
         canBeEdit = flag
     }
 
     interface OnItemClick {
         fun onCurrencyCodeClick()
+        fun onOverPayCurrencyClick()
         fun onPaymentTypeClick()
     }
+
+    interface OnItemTextChanged {
+        fun onOverPayExchangeRateChanged()
+    }
 }

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/adapter/GroundConveyTableAdapter.kt

@@ -36,13 +36,13 @@ class GroundConveyTableAdapter(private val itemList: ArrayList<GroundConveyTable
     inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         val listItem: LinearLayout = view.findViewById(R.id.list_item)
         val paymentItemName: TextView = view.findViewById(R.id.payment_item_name)
+        val hint: TextView = view.findViewById(R.id.hint)
         val price: EditText = view.findViewById(R.id.price)
         val priceUnit: TextView = view.findViewById(R.id.price_unit)
         val count: EditText = view.findViewById(R.id.count)
         val unit: TextView = view.findViewById(R.id.unit)
         val date: TextView = view.findViewById(R.id.date)
         val detail: ScrollEditText = view.findViewById(R.id.cost_detail)
-
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -147,6 +147,14 @@ class GroundConveyTableAdapter(private val itemList: ArrayList<GroundConveyTable
 
         holder.listItem.visibility = View.VISIBLE
         holder.paymentItemName.text = item.sidName
+
+        if (item.sId == 988 || item.sId == 93 || item.sId == 989){
+            holder.hint.apply {
+                visibility = View.VISIBLE
+                text = item.hint
+            }
+        }
+
         holder.price.setText(item.price.toString())
         holder.priceUnit.text = item.currencyStr
         holder.count.setText(item.count.toString())

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/entity/GroundConveyTableItem.kt

@@ -14,4 +14,6 @@ class GroundConveyTableItem {
     var units = 0
 
     var isNew = false
+
+    var hint = ""
 }

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/network/GroundConveyPaymentResponse.kt

@@ -9,7 +9,7 @@ class GroundConveyPaymentResponse(val data: Data): BaseResponse() {
 
     inner class Data(val payment: ArrayList<Selector>, val tableInitialization: ArrayList<SiftListItem>,
                      val carTouristGuides: ArrayList<GroundConveyTableItem>, val ssdv: ArrayList<Selector>,
-                     val checkedItemId: ArrayList<Int>, val creditCardPayment: GroundConveyDetailPayment)
+                     val checkedItemId: ArrayList<Int>, val creditCardPayment: GroundConveyDetailPayment, val nationalTravelFee: NationalTravelFee, val rate: Rate)
 
     inner class GroundConveyDetailPayment {
         var payDId = 0
@@ -20,4 +20,16 @@ class GroundConveyPaymentResponse(val data: Data): BaseResponse() {
         var payMoney = 0.0
         var payPercentage = 0.0
     }
+
+    inner class NationalTravelFee {
+        val id = 0
+        val currency = 0
+        val currencyStr = ""
+        val foodCost = ""
+    }
+
+    inner class Rate {
+        var rate = 0.0
+        var toCurr = 0
+    }
 }

app/src/main/java/com/pan_american/android/data/model/group_op/ground_convey_payment_insert/network/UpdateGroundConveyDetailRequest.kt

@@ -15,4 +15,6 @@ class UpdateGroundConveyDetailRequest {
     var opContentList =  ArrayList<GroundConveyTableItem>()
     val createUserId = OASystem.userInfo.userId
     var selectCheck = ArrayList<String>()
+    var toCurr = 0
+    var rate = 0.0
 }

app/src/main/java/com/pan_american/android/ui/customer_resource/company_customer/AddNewCustomerActivity.kt

@@ -744,8 +744,20 @@ class AddNewCustomerActivity : BaseActivity<ActivityAddNewCustomerBinding>() {
                 finlishedDele = binding.customerFinished.text.toString().toInt()
             }
 
-            ascribedUser = customerManagerList
-            ascribedDepartment = customerServiceClassList
+            if (customerManagerList.size == 0) {
+                showMessage(resources.getString(R.string.director_select_hint))
+                return
+            } else {
+                ascribedUser = customerManagerList
+            }
+
+            if (customerServiceClassList.size == 0) {
+                showMessage(resources.getString(R.string.business_ownership_select_hint))
+                return
+            } else {
+                ascribedDepartment = customerServiceClassList
+            }
+
             remark = binding.notes.getText()
 
             status = type

app/src/main/java/com/pan_american/android/ui/group_common/commission_confirm/CommissionConfirmActivity.kt

@@ -24,8 +24,6 @@ class CommissionConfirmActivity : BaseActivity<ActivityCommissionConfirmBinding>
         binding.department.text = OASystem.userInfo.depName
         binding.staff.text = OASystem.userInfo.cnName
         binding.commit.setText(resources.getString(R.string.search))
-
-
     }
 
     override fun initEvents() {
@@ -54,4 +52,8 @@ class CommissionConfirmActivity : BaseActivity<ActivityCommissionConfirmBinding>
 
         }
     }
+
+    private fun getCommissionConfirmList() {
+
+    }
 }

app/src/main/java/com/pan_american/android/ui/group_op/ground_convey_payment_insert/GroundConveyPaymentDetailActivity.kt

@@ -71,6 +71,10 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 
     private var currencySelect = false
 
+    private var overPayCurrencyId = 0
+
+    private var overPayExchangeRate = 0.0
+
     private var paymentMarkId = 0
 
     private var paymentMarkSelect = false
@@ -99,6 +103,14 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 
     private var groundConveyCostList = ArrayList<GroundConveyCost>()
 
+    private var threeFoodCost = 0.0
+
+    private var threeCurrencyId = 0
+
+    private var threeCurrencyCode = ""
+
+    private var listInit = false
+
     override fun getViewBinding() = ActivityGroundConveyPaymentDetailBinding.inflate(layoutInflater)
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -114,7 +126,7 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 
         initTitle()
 
-        getGroundConveyDetailResource()
+        getGroupCurrency()
     }
 
     override fun initTitle() {
@@ -329,6 +341,34 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
                             headerAdapter.setCurrencyCode(resourceResponse.data.creditCardPayment.paymentCurrencyName)
                             currencyId = resourceResponse.data.creditCardPayment.paymentCurrency
 
+                            if (resourceResponse.data.rate.rate == 0.0 || resourceResponse.data.rate.toCurr == 0) {
+                                headerAdapter.setOverPayCurrencyCode(resourceResponse.data.nationalTravelFee.currencyStr)
+                                overPayCurrencyId = resourceResponse.data.nationalTravelFee.currency
+
+                                headerAdapter.setOverPayExchangeRate("1")
+                                overPayExchangeRate = 1.0
+
+                            } else {
+
+                                for (item in currencyList) {
+                                    if (resourceResponse.data.rate.toCurr == item.currencyId) {
+                                        headerAdapter.setOverPayCurrencyCode(item.currencyCode)
+                                        overPayCurrencyId = item.currencyId
+                                    }
+                                }
+
+                                headerAdapter.setOverPayExchangeRate(resourceResponse.data.rate.rate.toString())
+                                overPayExchangeRate = resourceResponse.data.rate.rate
+                            }
+
+                            threeCurrencyId = resourceResponse.data.nationalTravelFee.currency
+                            threeFoodCost = resourceResponse.data.nationalTravelFee.foodCost.toDouble() / 2
+                            threeCurrencyCode = resourceResponse.data.nationalTravelFee.currencyStr
+
+                            for (item in carTouristGuides) {
+                                item.hint = setHintText()
+                            }
+
                             if (resourceResponse.data.creditCardPayment.paymentCurrency != 0 && resourceResponse.data.creditCardPayment.paymentCurrencyName.isNotBlank()) {
                                 for (item in carTouristGuides) {
                                     item.currencyStr = resourceResponse.data.creditCardPayment.paymentCurrencyName
@@ -336,11 +376,7 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
                                 currencySelect = true
                             }
 
-                            binding.paymentTotal.text = String.format(
-                                resources.getString(R.string.price_and_currency_format),
-                                totalPrice,
-                                headerAdapter.getCurrencyCode()
-                            )
+                            binding.paymentTotal.text = String.format(resources.getString(R.string.price_and_currency_format), totalPrice, headerAdapter.getCurrencyCode())
 
                             footerAdapter.setPayee(resourceResponse.data.creditCardPayment.payee)
 
@@ -348,8 +384,7 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 
                             footerAdapter.setPaymentMark(OASystem.paymentMark[resourceResponse.data.creditCardPayment.orbitalPrivateTransfer].name)
 
-                            paymentMarkId =
-                                resourceResponse.data.creditCardPayment.orbitalPrivateTransfer
+                            paymentMarkId = resourceResponse.data.creditCardPayment.orbitalPrivateTransfer
 
                             paymentMarkSelect = true
 
@@ -366,7 +401,9 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
                                 }
                             }
 
-                            getGroupCurrency()
+                            initViews()
+
+                            initEvents()
 
                         } else {
                             showMessage(resourceResponse.msg)
@@ -397,9 +434,7 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
                                 currencyList.add(item)
                             }
 
-                            initViews()
-
-                            initEvents()
+                            getGroundConveyDetailResource()
 
                         } else {
                             showMessage(currencyResponse.msg)
@@ -463,6 +498,44 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 
                                 for ((i, item) in carTouristGuides.withIndex()) {
                                     item.currencyStr = headerAdapter.getCurrencyCode()
+                                    item.hint = setHintText()
+                                    binding.paymentList.adapter!!.notifyItemChanged(i)
+                                }
+
+                                popupWindow.dismiss()
+                            }
+                        }
+                }
+            }
+
+            override fun onOverPayCurrencyClick() {
+                showSelector {
+                    val selectorAdapter = ListAdapter.Builder<Selector>().apply {
+                        setData(currencyList)
+                        setLayoutId(R.layout.item_selector)
+                        addBindView { itemView, data ->
+                            itemView.findViewById<TextView>(R.id.selector_item_name).apply {
+                                text = String.format(resources.getString(R.string.currency_name_code_format), data.currencyName, data.currencyCode)
+
+                                if (overPayCurrencyId == data.currencyId) {
+                                    setTextColor(ResourcesCompat.getColor(resources, R.color.text_color_blue, null))
+                                } else {
+                                    setTextColor(ResourcesCompat.getColor(resources, R.color.text_color, null))
+                                }
+                            }
+                        }
+                    }.create()
+
+                    selector.adapter = selectorAdapter
+
+                    selectorAdapter.onRecyclerViewItemClick =
+                        object : ListAdapter.OnRecyclerViewItemClick<Selector> {
+                            override fun onItemClick(position: Int) {
+                                headerAdapter.setOverPayCurrencyCode(currencyList[position].currencyCode)
+                                overPayCurrencyId = currencyList[position].currencyId
+
+                                for ((i, item) in carTouristGuides.withIndex()) {
+                                    item.hint = setHintText()
                                     binding.paymentList.adapter!!.notifyItemChanged(i)
                                 }
 
@@ -570,6 +643,28 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
             }
         }
 
+        headerAdapter.onItemTextChanged = object : GroundConveyHeaderAdapter.OnItemTextChanged {
+            override fun onOverPayExchangeRateChanged() {
+
+                if (listInit) {
+
+                    overPayExchangeRate = headerAdapter.getOverPayExchangeRate().toDouble()
+
+                    val costExchange = threeFoodCost / overPayExchangeRate
+
+                    val str = String.format(resources.getString(R.string.three_food_cost_hint), threeFoodCost, threeCurrencyCode, costExchange, headerAdapter.getCurrencyCode())
+
+
+                    for ((i, item) in carTouristGuides.withIndex()) {
+
+                        item.hint = str
+
+                        binding.paymentList.adapter!!.notifyItemChanged(i)
+                    }
+                }
+            }
+        }
+
         adapter = GroundConveyTableAdapter(showItemList)
         adapter.setCanBeEdit(canBeEdit())
         adapter.setHasStableIds(true)
@@ -717,6 +812,10 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
         val concatAdapter = ConcatAdapter(headerAdapter, adapter, footerAdapter)
 
         binding.paymentList.adapter = concatAdapter
+
+        binding.paymentList.post {
+            listInit = true
+        }
     }
 
     private fun updateGroundConveyDetail() {
@@ -749,6 +848,9 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 //        writer.flush()
 //        writer.close()
 
+        updateGroundConveyDetailRequest.toCurr = overPayCurrencyId
+        updateGroundConveyDetailRequest.rate = overPayExchangeRate
+
         apiService.updateGroundConveyDetail(updateGroundConveyDetailRequest)
             .enqueue(object : Callback<BaseResponse> {
                 override fun onResponse(
@@ -804,4 +906,9 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
         }
 
     }
+
+    private fun setHintText(): String{
+
+        return String.format(resources.getString(R.string.three_food_cost_hint), threeFoodCost, threeCurrencyCode, threeFoodCost / overPayExchangeRate, headerAdapter.getCurrencyCode())
+    }
 }

app/src/main/res/layout/header_ground_convey_payment_detail.xml

@@ -61,6 +61,76 @@
             android:textSize="@dimen/text_size_medium" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_margin="@dimen/common_padding"
+        android:background="@color/line_color" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:baselineAligned="false"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/common_padding"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/over_pay_currency"
+                android:textSize="@dimen/text_size_medium" />
+
+            <TextView
+                android:id="@+id/over_pay_currency"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/common_padding"
+                android:gravity="end"
+                android:hint="@string/please_select"
+                android:textColor="@color/text_color"
+                android:textColorHint="@color/hint_text_color"
+                android:textSize="@dimen/text_size_medium" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/common_padding"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/exchange_rate"
+                android:textSize="@dimen/text_size_medium" />
+
+            <EditText
+                android:id="@+id/over_pay_exchange_rate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/common_padding"
+                android:background="@color/white"
+                android:gravity="end"
+                android:hint="@string/please_input"
+                android:importantForAutofill="no"
+                android:inputType="numberDecimal"
+                android:selectAllOnFocus="true"
+                android:textColor="@color/text_color"
+                android:textColorHint="@color/hint_text_color"
+                android:textSize="@dimen/text_size_medium" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"

app/src/main/res/layout/item_ground_convey_table.xml

@@ -38,6 +38,20 @@
             android:layout_margin="@dimen/common_padding"
             android:background="@color/line_color" />
 
+        <TextView
+            android:id="@+id/hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/common_padding"
+            android:layout_marginEnd="@dimen/common_padding"
+            android:background="@color/white"
+            android:gravity="start"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:textColor="@color/color_caution"
+            android:textSize="@dimen/text_size_small"
+            android:visibility="gone"/>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/res/values/strings.xml

@@ -316,7 +316,7 @@
     <!-- 汇率换算，错误信息 -->
     <string name="currency_list_get_failed">币种汇率列表获取失败</string>
 
-    <!-- 市场客户资料 -->
+    <!-- 公司客户资料 -->
     <string name="customer_sift">客户筛选</string>
     <string name="customer_assign">客户指派</string>
     <string name="assign_cancel">取消指派</string>
@@ -359,6 +359,8 @@
     <string name="connector_job_input_hint">请输入联系人职务</string>
     <string name="connector_department_input_hint">请输入联系人所在单位</string>
     <string name="connector_city_input_hint">请输入联系人所在城市</string>
+    <string name="director_select_hint">请选择负责人</string>
+    <string name="business_ownership_select_hint">请选择业务归属</string>
 
     <!-- 市场客户资料详情，错误信息 -->
     <string name="market_customer_detail_get_failed">市场客户资料详情获取失败</string>
@@ -726,7 +728,10 @@
     <string name="cost_detail">费用明细</string>
     <string name="view_cost_detail">查看费用明细</string>
     <string name="payment_currency">费用币种</string>
+    <string name="over_pay_currency">超支币种</string>
     <string name="payment_percentage_input_hint">请输入正确的付款百分比</string>
+    
+    <string name="three_food_cost_hint">三公费用: 一人一顿费用 %.2f %s (%.2f %s)</string>
 
     <!-- OP费用款项详情，错误信息 -->
     <string name="op_payment_list_get_failed">地接费用条目列表获取失败</string>