Merge remote-tracking branch 'origin/master'

RMA/app/src/main/java/cn/muchinfo/rma/business/common/CommonManager.kt

@@ -1,9 +1,6 @@
 package cn.muchinfo.rma.business.common
 
-import cn.muchinfo.rma.global.data.ChangeLogData
-import cn.muchinfo.rma.global.data.CommonTableData
-import cn.muchinfo.rma.global.data.ContractData
-import cn.muchinfo.rma.global.data.NoticeData
+import cn.muchinfo.rma.global.data.*
 import cn.muchinfo.rma.netManage.base.ResponseCallback
 import cn.muchinfo.rma.netManage.utils.MyOkHttpUtils
 import cn.muchinfo.rma.view.base.app.BaseResult
@@ -120,4 +117,31 @@ class CommonManager {
         )
     }
 
+    /**
+     * 查询变更记录
+     * @param params Map<String, String> RelatedId 合同ID
+     * @param responseBack Function3<[@kotlin.ParameterName] Boolean, [@kotlin.ParameterName] List<NoticeData>?, [@kotlin.ParameterName] Error?, Unit>
+     */
+    fun queryMiddleGoodsChangeLog(
+        params: Map<String, String>,
+        responseBack: (isSuccess: Boolean, respData: List<MiddleGoodsChangeLogData>?, error: Error?) -> Unit
+    ){
+
+        MyOkHttpUtils().query(
+            URL = SPUtils.getInstance().getString(Constant.goCommonSearchUrl) + "/Ermcp/QueryMiddleGoodsChangeLog",
+            params = params,
+            type = "1",
+            callback = object : ResponseCallback<BaseResult<List<MiddleGoodsChangeLogData>>>(){
+                override fun onResponse(response: BaseResult<List<MiddleGoodsChangeLogData>>?, id: Int) {
+                    responseBack(true,response?.data,null)
+                }
+
+                override fun onError(call: Call?, e: Exception?, id: Int) {
+                    responseBack(false, null, Error(e?.message))
+                }
+
+            }
+        )
+    }
+
 }

RMA/app/src/main/java/cn/muchinfo/rma/global/data/MiddleGoodsChangeLogData.kt

@@ -0,0 +1,17 @@
+package cn.muchinfo.rma.global.data
+//查询套保品种变更记录(菜单:套保品种/商品详情/变更记录)
+data class MiddleGoodsChangeLogData(
+    val aftervalue: String = "",//变更后
+    val applyid: String = "",//操作人
+    val applyname: String = "",//操作人名称
+    val applysrc: String = "",//操作来源 - 1:管理端 2:终端
+    val beforevalue: String = "",//变更前
+    val changelogtype: String = "",//变更流水类型 - 1:套保比率变更
+    val handlestatus: String = "",//处理状态
+    val logdatetime: String = "",//流水日期
+    val logid: String = "",//流水ID
+    val logremark: String = "",//流水备注
+    val middlegoodsid: String = "",//套保品种ID
+    val tradedate: String = "",//交易日(yyyyMMdd)
+    val updatetime: String = ""//更新时间
+)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/AddSpotGoodsActivity.kt

@@ -267,8 +267,14 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
 
                             textView {
                                 selectUnitType.bindOptional(context) {
-                                    text = it?.value
-                                    textColorInt = R.color.rma_black_33
+                                    if (it?.value.isNullOrEmpty()){
+                                        text = data.enumdicname
+                                        textColorInt = R.color.rma_black_33
+                                    }else{
+                                        text = it?.value
+                                        textColorInt = R.color.rma_black_33
+                                    }
+
                                 }
                                 text = "请选择单位"
                                 textSizeAuto = 31

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/CommodityInformationViewModel.kt

@@ -107,6 +107,12 @@ class CommodityInformationViewModel : BaseViewModel() {
      */
     val showGgConvertConfigDataList : MutableLiveData<List<GGConvertConfigData>> = MutableLiveData()
 
+    /**
+     * 变更记录列表
+     */
+    val middleChangeLogDataList : MutableLiveData<List<MiddleGoodsChangeLogData>> = MutableLiveData()
+
+
 
 
     /**
@@ -813,4 +819,22 @@ class CommodityInformationViewModel : BaseViewModel() {
         }
     }
 
+    /**
+     * 查询套保变更记录
+     * @param RelatedId String
+     */
+    fun queryMiddleGoodsChangeLog(middlegoodsid : String){
+
+        val params = mutableMapOf<String, String>().apply {
+            put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
+            put("middlegoodsid", middlegoodsid)
+        }
+
+        MyApplication.getInstance()?.commonManager?.queryMiddleGoodsChangeLog(params = params){isSuccess, respData, error ->
+            if (isSuccess){
+                middleChangeLogDataList.postValue(respData)
+            }
+        }
+    }
+
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/HedgeSpeciesDetailsActivity.kt

@@ -9,6 +9,7 @@ import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.ChangeLogData
+import cn.muchinfo.rma.global.data.MiddleGoodsChangeLogData
 import cn.muchinfo.rma.global.data.MiddleGoodsData
 import cn.muchinfo.rma.global.data.WrStandardData
 import cn.muchinfo.rma.global.isBlankString
@@ -195,7 +196,7 @@ class GoodsDetailsUI(
             viewItemUI()
             contentItem(itemTile = "单位",itemContent = data.enumdicname ?: "")
             viewItemUI()
-            contentItem(itemTile = "套保比例",itemContent = data.needhedgeratio?.toPercentage() ?: "")
+            contentItem(itemTile = "套保比例",itemContent = data.needhedgeratio ?: "")
             viewModel.avalidGoodsDetailsData.bindOptional(context){list ->
                 list?.forEach {
                     viewItemUI()
@@ -205,32 +206,7 @@ class GoodsDetailsUI(
             }
             viewItemUI()
 
-//            if (data.remark?.isNotEmpty() == true){
-//                linearLayout {
-//                    gravity = Gravity.CENTER_VERTICAL
-//                    background = resources.getDrawable(R.color.white)
-//                    linearLayout {
-//                        gravity = Gravity.CENTER_VERTICAL
-//                        textView {
-//                            text = "备注"
-//                            textSizeAuto = 31
-//                            textColorInt = R.color.rma_gray_color
-//                        }.lparams(wrapContent, wrapContent){
-//                            marginStart = autoSize(35)
-//                        }
-//                    }.lparams(autoSize(250), autoSize(120))
-//
-//                    textView {
-//                        text = data.remark
-//                        textSizeAuto = 31
-//                        textColorInt = R.color.rma_black_33
-//                    }.lparams(wrapContent, wrapContent){
-//                        marginStart = autoSize(35)
-//                        marginEnd = autoSize(35)
-//                    }
-//
-//                }.lparams(matchParent, autoSize(240))
-//            }
+//            contentItem(itemTile = "备注",itemContent = data.relatedgoodsid?.toPercentage() ?: "")
 
         }
     }
@@ -253,10 +229,10 @@ class ChangeRecordUI(
     private lateinit var swipeToLayout: SwipeToLoadLayout
     private lateinit var statusLayout: StatusLayout
 
-    private val spotVarietiesNormalAdapter: BaseAdapter<ChangeLogData, ChangeLogViewHolder> = BaseAdapter { _, _ -> ChangeLogViewHolder(activity) }
+    private val spotVarietiesNormalAdapter: BaseAdapter<MiddleGoodsChangeLogData, ChangeLogViewHolder> = BaseAdapter { _, _ -> ChangeLogViewHolder(activity) }
 
     init {
-//        viewModel.queryChangeLog(RelatedId = )
+        viewModel.queryMiddleGoodsChangeLog(middlegoodsid = data.middlegoodsid ?: "")
     }
 
     val root = _FrameLayout(activity).apply {
@@ -297,7 +273,7 @@ class ChangeRecordUI(
                     setEnableRefresh(true)
                     setEnableLoadMore(false)
                     setOnRefreshListener {
-                        viewModel.queryChangeLog(RelatedId = "")
+                        viewModel.queryMiddleGoodsChangeLog(middlegoodsid = data.middlegoodsid ?: "")
                     }
                     setEnableScrollContentWhenLoaded(false)
                     setEnableLoadMoreWhenContentNotFull(false)
@@ -310,7 +286,7 @@ class ChangeRecordUI(
                 emptyView(hint = resources.getString(R.string.now_no_data))
             }).lparams(matchParent, matchParent)
 
-            viewModel.changeLogDataList.bindOptional(context){
+            viewModel.middleChangeLogDataList.bindOptional(context){
                 if (it?.isEmpty() == true || it?.size == 0){
                     statusLayout.showEmpty()
                 }else {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/SpotVarietiesDetailsActivity.kt

@@ -56,11 +56,13 @@ class SpotVarietiesDetailsActivity : BaseActivity<CommodityInformationViewModel>
                         textView {
                             if (data.isvalid == "1"){
                                 text = "正常"
+                                textColorInt = R.color.rma_green_color
                             }else{
                                 text = "停用"
+                                textColorInt = R.color.rma_yellow_text_color
                             }
                             textSizeAuto = 31
-                            textColorInt = R.color.rma_yellow_text_color
+
                         }.lparams(wrapContent, wrapContent) {
                             marginStart = autoSize(20)
                         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/viewholder/ChangeLogViewHolder.kt

@@ -4,6 +4,7 @@ import android.view.Gravity
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.ChangeLogData
+import cn.muchinfo.rma.global.data.MiddleGoodsChangeLogData
 import cn.muchinfo.rma.global.isBlankString
 import cn.muchinfo.rma.global.isShowTimeString
 import cn.muchinfo.rma.global.toPercentage
@@ -16,7 +17,7 @@ import mtp.polymer.com.autowidget.adapter.BaseViewHolder
 import org.jetbrains.anko.*
 
 class ChangeLogViewHolder(private val activity: AppCompatActivity) :
-    BaseViewHolder<ChangeLogData>(activity) {
+    BaseViewHolder<MiddleGoodsChangeLogData>(activity) {
     override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
 
     override fun _FrameLayout.createContentView() {
@@ -43,7 +44,7 @@ class ChangeLogViewHolder(private val activity: AppCompatActivity) :
             textView {
                 gravity = Gravity.CENTER
                 data.bindOptional(context) {
-                    text = it?.logvalue?.toPercentage()
+                    text = it?.aftervalue?.toPercentage()
                 }
                 textColorInt = R.color.hint_text_color
                 textSizeAuto = 31