风险管理11月3日提交代码-liu.bolan- 企业风管6期bug修复

RMA/app/src/main/assets/errormessage.json

@@ -10176,6 +10176,54 @@
     "rownumber": "AAI+HaABDAAABx0AAA"
   },
   {
+    "errorid": 12101,
+    "errorcode": "12101",
+    "modulecode": "12",
+    "operatecode": "ERR_CHANNEL_HEDGING_NO_SPOTCONTRACTID",
+    "description": "套期保值无现货合同ID",
+    "rownumber": "AABG+sAAoAAABfOACS"
+  },
+  {
+    "errorid": 12102,
+    "errorcode": "12102",
+    "modulecode": "12",
+    "operatecode": "ERR_CHANNEL_OUTTRADEDETAIL_TRADEID_NOT_FIND",
+    "description": "不存在的外部成交单号",
+    "rownumber": "AABG+sAAoAAABfOACT"
+  },
+  {
+    "errorid": 12103,
+    "errorcode": "12103",
+    "modulecode": "12",
+    "operatecode": "ERR_CHANNEL_INNERORDER_REPEAT_AMEND_ADD",
+    "description": "外部成交单不能重复关联内部单",
+    "rownumber": "AABG+sAAoAAABfOACU"
+  },
+  {
+    "errorid": 12104,
+    "errorcode": "12104",
+    "modulecode": "12",
+    "operatecode": "ERR_CHANNEL_INNERTRADE_RELATEDOUTTRADEID_NOT_FIND",
+    "description": "解绑的内部成交单关联外部单据不存在",
+    "rownumber": "AABG+sAAoAAABfOACV"
+  },
+  {
+    "errorid": 12105,
+    "errorcode": "12105",
+    "modulecode": "12",
+    "operatecode": "ERR_CHANNEL_INNERORDER_HASINNERORDER_NO",
+    "description": "解绑的外部成交单未绑定",
+    "rownumber": "AABG+sAAoAAABfOACW"
+  },
+  {
+    "errorid": 12106,
+    "errorcode": "12106",
+    "modulecode": "12",
+    "operatecode": "ERR_CHANNEL_INNERTRADE_TRADEID_NOT_FIND",
+    "description": "解绑的内部成交单据不存在",
+    "rownumber": "AABG+sAAoAAABfOACX"
+  },
+  {
     "errorid": 13001,
     "errorcode": "13001",
     "modulecode": "13",

RMA/app/src/main/java/cn/muchinfo/rma/business/commodity/adapter/CommodityAdapter.kt

@@ -109,13 +109,13 @@ object CommodityAdapter {
             builder.wrstandardid = wrstandardid
         }
         if (paramchangetype != 0){
-            builder.paramchangetype
+            builder.paramchangetype = paramchangetype
         }
         if (operatetype != 0){
             builder.operatetype = operatetype
         }
         builder.applysrc = 2
-        builder.applyid = loginInfo.userID.toLong()
+        builder.applyid = loginInfo.loginID
         if (beforevalue != 0.0){
             builder.beforevalue = beforevalue
         }

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

@@ -127,6 +127,8 @@ data class MiddleGoodsDetail(
     val enumdicname : String? = "",//单位名称
     @SerializedName("middlegoodscode")
     val middlegoodscode : String? = "",//套保品种代码
+    @SerializedName("goodsunitid")
+    val goodsunitid : String? = "",
     @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
     @SerializedName("middlegoodsname")
@@ -150,6 +152,7 @@ data class MiddleGoodsDetail(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
         parcel.createTypedArrayList(TBWrstandard)
     ) {
     }
@@ -162,6 +165,7 @@ data class MiddleGoodsDetail(
         parcel.writeString(areauserid)
         parcel.writeString(enumdicname)
         parcel.writeString(middlegoodscode)
+        parcel.writeString(goodsunitid)
         parcel.writeString(middlegoodsid)
         parcel.writeString(middlegoodsname)
         parcel.writeString(needarbitrageratio)
@@ -183,7 +187,6 @@ data class MiddleGoodsDetail(
         }
     }
 
-
 }
 
 //商品信息列表(现货品类)

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/dialog/Dialog.kt

@@ -307,8 +307,8 @@ fun AppCompatActivity.creatHnstSpotDetailSheetDialog(
  */
 fun AppCompatActivity.creatGoodsHedgeBottomSheetDialog(
     titleStr: String,
-    selectList: List<GoodsGroupData>,
-    select: (GoodsGroupData.() -> Unit)? = null
+    selectList: List<MiddleGoodsDetail>,
+    select: (MiddleGoodsDetail.() -> Unit)? = null
 ) {
     val builder: QMUIBottomSheet.BottomListSheetBuilder =
         QMUIBottomSheet.BottomListSheetBuilder(this)
@@ -316,7 +316,7 @@ fun AppCompatActivity.creatGoodsHedgeBottomSheetDialog(
         .setTitle(titleStr)
         .setAddCancelBtn(true)
     selectList.forEach {
-        builder.addItem(it.goodsgroupname)
+        builder.addItem(it.middlegoodsname)
     }
     builder.setOnSheetItemClickListener { dialog, itemView, position, tag ->
         select?.invoke(selectList.get(position))

RMA/app/src/main/java/cn/muchinfo/rma/view/base/chart/ChartActivity.kt

@@ -13,6 +13,7 @@ import android.widget.TextView
 import androidx.lifecycle.Observer
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.data.ContractData
 import cn.muchinfo.rma.global.isBlankString
 import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
@@ -222,6 +223,7 @@ class ChartActivity : BaseActivity<ChartViewModel>() , View.OnClickListener {
                 val intent = Intent()
                 intent.putExtra("goodsId", viewModel.goodsId.toString())
                 intent.putExtra("outGoodsCode", viewModel.outGoodsCode.toString())
+                intent.putExtra("contractData", ContractData())
                 intent.setClass(this, GoodsTradeActivity::class.java)
                 ActivityUtils.startActivity(intent)
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/exposure/ExposureViewModel.kt

@@ -180,6 +180,7 @@ class ExposureViewModel : BaseViewModel(){
                 intent.putExtra("goodsId", "")
                 intent.putExtra("outGoodsCode", "")
             }
+            intent.putExtra("contractData", ContractData())
             intent.setClass(context!!, GoodsTradeActivity::class.java)
             ActivityUtils.startActivity(intent)
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/SearchActivity.java

@@ -25,6 +25,7 @@ import java.util.Optional;
 
 import cn.muchinfo.rma.R;
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo;
+import cn.muchinfo.rma.global.database.DataBase;
 import cn.muchinfo.rma.global.room.Builder;
 import cn.muchinfo.rma.view.autoWidget.utils.WordUtil;
 import io.reactivex.Observer;
@@ -166,7 +167,7 @@ public class SearchActivity extends AppCompatActivity {
         } else {
             sb.append("%" + findStr + "%");
         }
-        Disposable subscribe = Builder.getDatabase().getGoodsInfoDao().findGoodsInfo(sb.toString()).
+        Disposable subscribe = DataBase.Companion.getInstance().goodsInfoDao().findGoodsInfo(sb.toString()).
                 subscribeOn(Schedulers.io()).
                 observeOn(AndroidSchedulers.mainThread()).
                 subscribe((goodsInfoData) -> {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/trade/GoodsTradeActivity.kt

@@ -1411,7 +1411,8 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
                             commitDealData(
                                 buyOrSell = buyOrSell,
                                 isClose = isClose,
-                                orderPrice = orderPrice
+                                orderPrice = orderPrice,
+                                biztype = contractData.biztype ?: ""
                             )
                             dialog.dismiss()
                         }

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

@@ -381,14 +381,15 @@ class AddHedgeGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
 //                                    finish()
 //                                }
                             } else if (type == "2") {
-                                viewModel.requestErmsMiddelGoodsEditReq(
+                                viewModel.ermcpParamchangeappReq(
                                     middlegoodsid = data.middlegoodsid?.toLong() ?: 0,
-                                    needhedgeratio = hedge_ratio_edtittext.text.toString()
+                                    aftervalue = hedge_ratio_edtittext.text.toString()
                                         .toDouble().div(100),
-                                    modifierid = GlobalDataCollection.instance?.loginRsp?.userID?.toLong()
-                                        ?: 0,
-                                    areauserid = GlobalDataCollection.instance?.loginRsp?.userID?.toLong()
-                                        ?: 0,
+                                    beforevalue = data.needhedgeratio?.toDouble() ?: 0.0 ,
+                                    areauserid = data.areauserid?.toLong() ?: 0,
+                                    paramchangetype = 4,
+                                    operatetype = 2,
+                                    applystatus = 1,
                                     remark = remask_edittext.text.toString()
                                 ) {
                                     finish()

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

@@ -40,7 +40,7 @@ class CommodityInformationViewModel : BaseViewModel() {
     /**
      * 套保品种正常列表
      */
-    val middleGoodsNormalList: MutableLiveData<List<GoodsGroupData>> = MutableLiveData()
+    val middleGoodsNormalList: MutableLiveData<List<MiddleGoodsDetail>> = MutableLiveData()
 
     /**
      * 现货品种详情
@@ -203,9 +203,8 @@ class CommodityInformationViewModel : BaseViewModel() {
         val params = mutableMapOf<String, String>().apply {
             put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
             put("usertype",GlobalDataCollection.instance?.userAccountData?.usertype?.toString() ?: "")
-//            put("deliverygoodsid", deliverygoodsid)
         }
-        MyApplication.getInstance()?.futureManager?.queryGoodsGroup(params = params) { isSuccess, respData, _ ->
+        MyApplication.getInstance()?.commodityManager?.queryMiddleGoodsDetail(params = params) { isSuccess, respData, error ->
             if (isSuccess) {
                 middleGoodsNormalList.postValue(respData)
             }
@@ -216,7 +215,7 @@ class CommodityInformationViewModel : BaseViewModel() {
      * 获取剩下可选择的套保品种
      * @return List<MiddleGoodsData>
      */
-    fun getRemainingMiddleGoodsList(): List<GoodsGroupData> {
+    fun getRemainingMiddleGoodsList(): List<MiddleGoodsDetail> {
         val allSelectDataList = middleGoodsNormalList.value//所有可选择套保品种
         val middlegoodList = middlegoodList.value//列表数据已显示的套保品种
         val newSelectDataList = arrayListOf<GoodsGroupData>()//剩下的可选择套保品种
@@ -224,7 +223,7 @@ class CommodityInformationViewModel : BaseViewModel() {
 
         }
         middlegoodList?.forEach { data ->
-            allSelectDataList?.remove { it.goodsgroupid == data.middleGoodsId }
+            allSelectDataList?.remove { it.middlegoodsid == data.middleGoodsId }
         }
 
         return allSelectDataList ?: arrayListOf()
@@ -878,6 +877,48 @@ class CommodityInformationViewModel : BaseViewModel() {
     }
 
     /**
+     * 套保比例修改
+     */
+    fun ermcpParamchangeappReq(
+        areauserid : Long = 0,//所属机构用户ID
+        middlegoodsid : Long = 0,//套保品种ID [ParamChangeType = 2,3,4]
+        paramchangetype : Int = 0,//参数变更类型 - 1:增值税率变更(现货商品) 2:折算系数变更(现货商品) 3:成本权重(现货商品) 4:套保比率变更(套保品种)
+        operatetype : Int = 0,//操作类型 - 1:新增 2:修改
+        beforevalue : Double = 0.0,//变更前
+        aftervalue : Double = 0.0,//变更后
+        applystatus : Int = 0,//申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
+        remark : String = "",//备注
+        isSuccess: (isCompleted: Boolean) -> Unit
+    ){
+        loadingDialogStatus.value = TaskUiModel.inFlight()
+        GlobalScope.launch {
+            MyApplication.getInstance()?.commodityManager?.ermcpParamchangeappReq(
+                areauserid = areauserid,
+                middlegoodsid = middlegoodsid,
+                paramchangetype = paramchangetype,
+                operatetype = operatetype,
+                beforevalue = beforevalue,
+                aftervalue = aftervalue,
+                applystatus = applystatus,
+                remark = remark
+            ) { isCompleted, err ->
+                if (isCompleted) {
+                    loadingDialogStatus.postValue(TaskUiModel.success(msg = "请求成功"))
+                    isSuccess(true)
+                } else {
+                    loadingDialogStatus.postValue(
+                        TaskUiModel.failed(
+                            InteractiveException(
+                                errorMessage = err?.message!!
+                            )
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    /**
      * 现货品种申请请求
      * @param deliverygoodscode String 交割商品代码(新增时有值)
      * @param deliverygoodsname String 交割商品名称(新增时有值)

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

@@ -6,6 +6,7 @@ import cn.muchinfo.rma.global.data.ColumnsData
 import cn.muchinfo.rma.global.data.ParamChangeAppData
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.autoWidget.toArrayList
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.app.Constant
 import com.blankj.utilcode.util.TimeUtils
@@ -202,8 +203,8 @@ class CommodityModificationFlowViewModel : BaseViewModel(){
         val newList = arrayListOf<ParamChangeAppData>()
         list.forEach {
             val newRightData = arrayListOf<String>()
-            newRightData.add(it.applytime ?: "--" + "\n" + it.audittime)//'申请时间/\n审核时间
-            newRightData.add(it.beforevalue + "\n" + it.aftervalue)//修改前值%/\n修改后值%
+            newRightData.add(it.applytime?.toShowTime3("MM-dd HH:mm")  + "\n" + it.audittime?.toShowTime3("MM-dd HH:mm"))//'申请时间/\n审核时间
+            newRightData.add(NumberUtils.roundNum(it.beforevalue?.toDouble()?.times(100) ?: 0.0,2) + "\n" + NumberUtils.roundNum(it.aftervalue?.toDouble()?.times(100) ?: 0.0,2))//修改前值%/\n修改后值%
             newRightData.add(it.applyname +"\n" +it.auditname)//申请人/\n审核人
             newRightData.add(it.applystatus?.applyFlowstatus() ?: "--")//状态
             newRightData.add(it.auditremark ?: "--")//审核备注

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

@@ -8,6 +8,7 @@ import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.DeliveryGoodsDetailData
 import cn.muchinfo.rma.global.data.XhWrstandard
 import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.contract.verticalEmptyView
@@ -106,7 +107,7 @@ class ChangeRateActivity : BaseActivity<ModifyViewModel>(){
                 }
 
                 editText {
-                    setText(data.vatrate)
+                    setText(NumberUtils.roundNum(data.vatrate?.toDouble()?.times(100) ?: 0.0,2))
                     rate_input_edittext = this
                     hint = "请输入增值税税率"
                     background = null

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

@@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.GoodsGroupData
 import cn.muchinfo.rma.global.data.MiddleGoodsData
+import cn.muchinfo.rma.global.data.MiddleGoodsDetail
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI3
 import cn.muchinfo.rma.view.MyApplication
@@ -257,7 +258,7 @@ class ModifyViewModel : BaseViewModel(){
     /**
      * 套保品种正常列表
      */
-    val middleGoodsNormalList: MutableLiveData<List<GoodsGroupData>> = MutableLiveData()
+    val middleGoodsNormalList: MutableLiveData<List<MiddleGoodsDetail>> = MutableLiveData()
 
     /**
      * 新增现货品种时的型号列表数据（三期为品类）
@@ -275,10 +276,9 @@ class ModifyViewModel : BaseViewModel(){
     fun queryGoodsGroup() {
         val params = mutableMapOf<String, String>().apply {
             put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
-            put("usertype", GlobalDataCollection.instance?.userAccountData?.usertype?.toString() ?: "")
-//            put("deliverygoodsid", deliverygoodsid)
+            put("usertype",GlobalDataCollection.instance?.userAccountData?.usertype?.toString() ?: "")
         }
-        MyApplication.getInstance()?.futureManager?.queryGoodsGroup(params = params) { isSuccess, respData, _ ->
+        MyApplication.getInstance()?.commodityManager?.queryMiddleGoodsDetail(params = params) { isSuccess, respData, error ->
             if (isSuccess) {
                 middleGoodsNormalList.postValue(respData)
             }
@@ -598,7 +598,7 @@ class ModifyViewModel : BaseViewModel(){
      * 获取剩下可选择的套保品种
      * @return List<MiddleGoodsData>
      */
-    fun getRemainingMiddleGoodsList(): List<GoodsGroupData> {
+    fun getRemainingMiddleGoodsList(): List<MiddleGoodsDetail> {
         val allSelectDataList = middleGoodsNormalList.value//所有可选择套保品种
 //        val middlegoodList = middlegoodList.value//列表数据已显示的套保品种
 //        val newSelectDataList = arrayListOf<GoodsGroupData>()//剩下的可选择套保品种

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

@@ -56,7 +56,7 @@ class SixInsuredVarietyViewHolder(
                     }
 
                     activity.creatGoodsHedgeBottomSheetDialog("请选择套保品种", viewModel.getRemainingMiddleGoodsList()) {
-                        viewModel.changeMiddleGoodsList(wrstandId = wrstandId,type = "4",id = data.value?.id.toString(),ano = "",middlegoodsId = this.goodsgroupid ?: "",enumdicnameid = this.goodunitid ?: "",enumdicname = this.enumdicname ?: "" ?: "",middleGoodsName = this.goodsgroupname ?: "")
+                        viewModel.changeMiddleGoodsList(wrstandId = wrstandId,type = "4",id = data.value?.id.toString(),ano = "",middlegoodsId = this.middlegoodsid ?: "",enumdicnameid = this.goodsunitid ?:  "",enumdicname = this.enumdicname ?: "" ?: "",middleGoodsName = this.middlegoodsname ?: "")
                         hedge_coefficient.setText("")
                     }
                 }
@@ -128,8 +128,8 @@ class SixInsuredVarietyViewHolder(
                         text = data?.enumdicname
                         textColorInt = R.color.rma_black_33
                         viewModel.middleGoodsNormalList.value?.forEach {
-                            if (data?.middleGoodsId == it.goodsgroupid){
-                                text = it.goodunitid ?: ""
+                            if (data?.middleGoodsId == it.middlegoodsid){
+                                text = it.enumdicname ?: ""
                                 textColorInt = R.color.rma_black_33
                             }else{
                                 text = data?.enumdicname

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

@@ -112,6 +112,12 @@ class NewCommodityInformationActivity : BaseActivity<NewCommodityInformationView
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        newSpotVarietiesUI.refresh()
+        newHedgeSpeciesUI.refresh()
+    }
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -325,6 +331,10 @@ class NewSpotVarietiesUI(
     private val spotVarietiesNormalAdapter: BaseAdapter<DeliveryGoodsDetailData, DemoViewHolder> =
         BaseAdapter { _, _ -> DemoViewHolder(activity, viewModel) }
 
+    fun refresh(){
+        viewModel.queryDeliveryGoodsDetailList()
+    }
+
     init {
         viewModel.queryDeliveryGoodsDetailList()
     }
@@ -384,6 +394,10 @@ class NewHedgeSpeciesUI(
     private val hedgeSpeciesAdapter: BaseAdapter<MiddleGoodsDetail, NewHedgeSpeciesViewHolder> =
         BaseAdapter { _, _ -> NewHedgeSpeciesViewHolder(activity, viewModel) }
 
+    fun refresh(){
+        viewModel.queryMiddleGoodsDetailList()
+    }
+
     init {
         viewModel.queryMiddleGoodsDetailList()
     }

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

@@ -432,7 +432,7 @@ class NewAddSpotGoodsActivity : BaseActivity<NewAddSpotGoodsViewModel>() {
                             }
                             if (type == "1") {
                                 viewModel.deliveryGoodsApplyCloudReq(
-                                    version = "3.2",
+                                    version = "3.1",
                                     deliverygoodsname = spot_variety_name_edittext.text.toString(),
 //                                    unitid = selectUnitType.value?.id?.toLong()!!,
                                     type = 1,
@@ -496,7 +496,7 @@ class NewAddSpotGoodsActivity : BaseActivity<NewAddSpotGoodsViewModel>() {
             it.middleGoodsList.forEach {
                 val wrsconverdetails = ManageServiceMI3.WRSConvertDetailEx.newBuilder()
                 wrsconverdetails.middlegoodsid = it.middleGoodsId.toLong()
-                wrsconverdetails.unitid = it.enumdicnameid.toLong()
+//                wrsconverdetails.unitid = it.enumdicnameid.toLong()
                 wrsconverdetails.convertratio = it.value.toDouble()
                 wrsconverdetails.costratio = it.costWeight.toDouble()
                 wrsconverdetailsList.add(wrsconverdetails.build())

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

@@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.DeliveryGoodsDetailData
 import cn.muchinfo.rma.global.data.GoodsGroupData
+import cn.muchinfo.rma.global.data.MiddleGoodsDetail
 import cn.muchinfo.rma.global.data.XhMiddlergoods
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI3
@@ -50,7 +51,7 @@ class NewAddSpotGoodsViewModel : BaseViewModel(){
     /**
      * 套保品种正常列表
      */
-    val middleGoodsNormalList: MutableLiveData<List<GoodsGroupData>> = MutableLiveData()
+    val middleGoodsNormalList: MutableLiveData<List<MiddleGoodsDetail>> = MutableLiveData()
 
 
     fun deliveryGoodsApplyCloudReq(
@@ -164,10 +165,9 @@ class NewAddSpotGoodsViewModel : BaseViewModel(){
     fun queryGoodsGroup() {
         val params = mutableMapOf<String, String>().apply {
             put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
-            put("usertype", GlobalDataCollection.instance?.userAccountData?.usertype?.toString() ?: "")
-//            put("deliverygoodsid", deliverygoodsid)
+            put("usertype",GlobalDataCollection.instance?.userAccountData?.usertype?.toString() ?: "")
         }
-        MyApplication.getInstance()?.futureManager?.queryGoodsGroup(params = params) { isSuccess, respData, _ ->
+        MyApplication.getInstance()?.commodityManager?.queryMiddleGoodsDetail(params = params) { isSuccess, respData, error ->
             if (isSuccess) {
                 middleGoodsNormalList.postValue(respData)
             }
@@ -178,7 +178,7 @@ class NewAddSpotGoodsViewModel : BaseViewModel(){
      * 获取剩下可选择的套保品种
      * @return List<MiddleGoodsData>
      */
-    fun getRemainingMiddleGoodsList(): List<GoodsGroupData> {
+    fun getRemainingMiddleGoodsList(): List<MiddleGoodsDetail> {
         val allSelectDataList = middleGoodsNormalList.value//所有可选择套保品种
 //        val middlegoodList = middlegoodList.value//列表数据已显示的套保品种
 //        val newSelectDataList = arrayListOf<GoodsGroupData>()//剩下的可选择套保品种

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

@@ -55,7 +55,7 @@ class NewInsuredVarietyViewHolder(
                     }
 
                     activity.creatGoodsHedgeBottomSheetDialog("请选择套保品种", viewModel.getRemainingMiddleGoodsList()) {
-                        viewModel.changeMiddleGoodsList(wrstandId = wrstandId,type = "4",id = data.value?.id.toString(),ano = "",middlegoodsId = this.goodsgroupid ?: "",enumdicnameid = this.goodunitid ?: "",enumdicname = this.enumdicname ?: "" ?: "",middleGoodsName = this.goodsgroupname ?: "")
+                        viewModel.changeMiddleGoodsList(wrstandId = wrstandId,type = "4",id = data.value?.id.toString(),ano = "",middlegoodsId = this.middlegoodsid ?: "",enumdicnameid =  this.goodsunitid ?: "",enumdicname = this.enumdicname ?: "" ?: "",middleGoodsName = this.middlegoodsname ?: "")
                         hedge_coefficient.setText("")
                     }
                 }
@@ -127,8 +127,8 @@ class NewInsuredVarietyViewHolder(
                         text = data?.enumdicname
                         textColorInt = R.color.rma_black_33
                         viewModel.middleGoodsNormalList.value?.forEach {
-                            if (data?.middleGoodsId == it.goodsgroupid){
-                                text = it.goodunitid ?: ""
+                            if (data?.middleGoodsId == it.middlegoodsid){
+                                text = it.enumdicname ?: ""
                                 textColorInt = R.color.rma_black_33
                             }else{
                                 text = data?.enumdicname

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

@@ -50,7 +50,7 @@ class InsuredVarietyViewHolder(
                     }
 
                     activity.creatGoodsHedgeBottomSheetDialog("请选择套保品种", viewModel.getRemainingMiddleGoodsList()) {
-                        viewModel.changeMiddleGoodsList(type = "4",id = data.value?.id.toString(),ano = "",middlegoodsId = this.goodsgroupid ?: "",enumdicnameid = this.goodunitid ?: "",enumdicname = this.enumdicname ?: "" ?: "",middleGoodsName = this.goodsgroupname ?: "")
+                        viewModel.changeMiddleGoodsList(type = "4",id = data.value?.id.toString(),ano = "",middlegoodsId = this.middlegoodsid ?: "",enumdicnameid = this.goodsunitid ?:  "",enumdicname = this.enumdicname ?: "" ?: "",middleGoodsName = this.middlegoodsname ?: "")
                         hedge_coefficient.setText("")
                     }
                 }
@@ -121,8 +121,8 @@ class InsuredVarietyViewHolder(
                         text = data?.enumdicname
                         textColorInt = R.color.rma_black_33
                         viewModel.middleGoodsNormalList.value?.forEach {
-                            if (data?.middleGoodsId == it.goodsgroupid){
-                                text = it.goodunitid ?: ""
+                            if (data?.middleGoodsId == it.middlegoodsid){
+                                text = it.enumdicname ?: ""
                                 textColorInt = R.color.rma_black_33
                             }else{
                                 text = data?.enumdicname

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/DuctAuditActivity.kt

@@ -131,7 +131,7 @@ class DuctAuditActivity : BaseActivity<DuctAuditViewModel>(){
 //                        mode = QMUITabSegment.MODE_FIXED
 //                    }
 //                }
-                mode = QMUITabSegment.MODE_SCROLLABLE
+                mode = QMUITabSegment.MODE_FIXED
                 setIndicator(QMUITabIndicator(QMUIDisplayHelper.dp2px(context, 2), false, true))
                 setDefaultTextSize(ConvertUtils.sp2px(16f), ConvertUtils.sp2px(16f))
             }.lparams(matchParent, autoSize(100))

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/DuctAuditViewModel.kt

@@ -121,6 +121,7 @@ class DuctAuditViewModel : BaseViewModel(){
         val params = mutableMapOf<String,String>().apply {
             put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
             put("paramchangetype","4")
+            put("ftstatus","1")
         }
 
         MyApplication.getInstance()?.spotManager?.queryParamChangeApp(params = params){isSuccess, respData, error ->
@@ -142,6 +143,7 @@ class DuctAuditViewModel : BaseViewModel(){
         val params = mutableMapOf<String,String>().apply {
             put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
             put("paramchangetype","3")
+            put("ftstatus","1")
         }
 
         MyApplication.getInstance()?.spotManager?.queryParamChangeApp(params = params){isSuccess, respData, error ->
@@ -161,6 +163,7 @@ class DuctAuditViewModel : BaseViewModel(){
         val params = mutableMapOf<String,String>().apply {
             put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
             put("paramchangetype","2")
+            put("ftstatus","1")
         }
 
         MyApplication.getInstance()?.spotManager?.queryParamChangeApp(params = params){isSuccess, respData, error ->
@@ -180,6 +183,7 @@ class DuctAuditViewModel : BaseViewModel(){
         val params = mutableMapOf<String,String>().apply {
             put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
             put("paramchangetype","1")
+            put("ftstatus","1")
         }
 
         MyApplication.getInstance()?.spotManager?.queryParamChangeApp(params = params){isSuccess, respData, error ->

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/convertcoefficient/ConvertCoefficientAuditActivity.kt

@@ -7,7 +7,9 @@ import android.widget.EditText
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.ParamChangeAppData
+import cn.muchinfo.rma.global.isBlankString
 import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.contract.verticalEmptyView
@@ -134,7 +136,7 @@ class ConvertCoefficientAuditActivity : BaseActivity<ConvertCoefficientAuditView
                 }.lparams(autoSize(250), autoSize(132))
 
                 textView {
-                    text = data.middlegoodsname
+                    text = data.middlegoodsname?.isBlankString()
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent)
@@ -148,7 +150,7 @@ class ConvertCoefficientAuditActivity : BaseActivity<ConvertCoefficientAuditView
                 linearLayout {
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
-                        text = "原值"
+                        text = "原值%"
                         textSizeAuto = 31
                         textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent){
@@ -157,7 +159,7 @@ class ConvertCoefficientAuditActivity : BaseActivity<ConvertCoefficientAuditView
                 }.lparams(autoSize(250), autoSize(132))
 
                 textView {
-                    text = data.beforevalue
+                    text = NumberUtils.roundNum(data.beforevalue?.toDouble()?.times(100) ?: 0.0,2)
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent)
@@ -171,7 +173,7 @@ class ConvertCoefficientAuditActivity : BaseActivity<ConvertCoefficientAuditView
                 linearLayout {
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
-                        text = "新值"
+                        text = "新值%"
                         textSizeAuto = 31
                         textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent){
@@ -180,7 +182,7 @@ class ConvertCoefficientAuditActivity : BaseActivity<ConvertCoefficientAuditView
                 }.lparams(autoSize(250), autoSize(132))
 
                 textView {
-                    text = data.aftervalue
+                    text = NumberUtils.roundNum(data.aftervalue?.toDouble()?.times(100) ?: 0.0,2)
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/convertcoefficient/ConvertCoefficientUI.kt

@@ -39,14 +39,14 @@ class ConvertCoefficientUI(private val activity : AppCompatActivity,private val
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(32)
-                        topMargin = autoSize(20)
+
                     }
                     textView {
                         text = "套保品种"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER
@@ -55,23 +55,23 @@ class ConvertCoefficientUI(private val activity : AppCompatActivity,private val
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_HORIZONTAL
                     textView {
-                        text = "原值/"
+                        text = "原值%/"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent){
-                        topMargin = autoSize(20)
+
                     }
                     textView {
-                        text = "新值"
+                        text = "新值%"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
@@ -82,8 +82,8 @@ class ConvertCoefficientUI(private val activity : AppCompatActivity,private val
                     }.lparams(wrapContent, wrapContent){
                         marginEnd = autoSize(32)
                     }
-                }.lparams(0, autoSize(80),1f)
-            }.lparams(matchParent, autoSize(80))
+                }.lparams(0, autoSize(100),1f)
+            }.lparams(matchParent, autoSize(100))
 
             statusLayout(contentBlock = {
                 statusLayout = this

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/convertcoefficient/ConvertCoefficientViewHolder.kt

@@ -11,6 +11,7 @@ import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.ductaudit.DuctAuditViewModel
 import cn.muchinfo.rma.view.base.home.ductaudit.hedgeratio.HedgeRatioAuditActivity
@@ -47,7 +48,7 @@ class ConvertCoefficientViewHolder(private val activity : AppCompatActivity, pri
                             text = it?.wrstandardname
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(32)
                         topMargin = autoSize(20)
@@ -58,9 +59,9 @@ class ConvertCoefficientViewHolder(private val activity : AppCompatActivity, pri
                             text = it?.deliverygoodsname
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER
@@ -70,31 +71,31 @@ class ConvertCoefficientViewHolder(private val activity : AppCompatActivity, pri
                             text = it?.deliverygoodsname
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_HORIZONTAL
                     //原值
                     textView {
                         data.bindOptional(context){
-                            text = it?.beforevalue
+                            text = NumberUtils.roundNum(it?.beforevalue?.toDouble()?.times(100) ?: 0.0,2)
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent){
                         topMargin = autoSize(20)
                     }
                     //新值
                     textView {
                         data.bindOptional(context){
-                            text = it?.aftervalue
+                            text = NumberUtils.roundNum(it?.aftervalue?.toDouble()?.times(100) ?: 0.0,2)
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
@@ -104,11 +105,9 @@ class ConvertCoefficientViewHolder(private val activity : AppCompatActivity, pri
                             text = it?.applytime
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
-                    }.lparams(wrapContent, wrapContent){
-                        marginEnd = autoSize(32)
-                    }
-                }.lparams(0, autoSize(80),1f)
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(wrapContent, wrapContent)
+                }.lparams(0, autoSize(100),1f)
             }.lparams(matchParent, autoSize(100))
 
             linearLayout {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/costweight/CostWeightUI.kt

@@ -39,14 +39,14 @@ class CostWeightUI(private val activity : AppCompatActivity,private val viewMode
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(32)
-                        topMargin = autoSize(20)
+
                     }
                     textView {
                         text = "套保品种"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER
@@ -55,23 +55,23 @@ class CostWeightUI(private val activity : AppCompatActivity,private val viewMode
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_HORIZONTAL
                     textView {
-                        text = "原值/"
+                        text = "原值%/"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent){
-                        topMargin = autoSize(20)
+
                     }
                     textView {
-                        text = "新值"
+                        text = "新值%"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
@@ -82,8 +82,8 @@ class CostWeightUI(private val activity : AppCompatActivity,private val viewMode
                     }.lparams(wrapContent, wrapContent){
                         marginEnd = autoSize(32)
                     }
-                }.lparams(0, autoSize(80),1f)
-            }.lparams(matchParent, autoSize(80))
+                }.lparams(0, autoSize(100),1f)
+            }.lparams(matchParent, autoSize(100))
 
             statusLayout(contentBlock = {
                 statusLayout = this

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/hedgeratio/HedgeRatioAuditActivity.kt

@@ -8,6 +8,7 @@ import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.ParamChangeAppData
 import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.contract.verticalEmptyView
@@ -102,7 +103,7 @@ class HedgeRatioAuditActivity : BaseActivity<HedgeRatioAuditViewModel>(){
                 }.lparams(autoSize(250), autoSize(132))
 
                 textView {
-                    text = data.beforevalue
+                    text = NumberUtils.roundNum(data.beforevalue?.toDouble()?.times(100) ?: 0.0,2)
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent)
@@ -125,7 +126,7 @@ class HedgeRatioAuditActivity : BaseActivity<HedgeRatioAuditViewModel>(){
                 }.lparams(autoSize(250), autoSize(132))
 
                 textView {
-                    text = data.aftervalue
+                    text = NumberUtils.roundNum(data.aftervalue?.toDouble()?.times(100) ?: 0.0,2)
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/hedgeratio/HedgeRatioUI.kt

@@ -34,22 +34,22 @@ class HedgeRatioUI(private val activity : AppCompatActivity,private val viewMode
                 verticalLayout {
                     gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
                     textView {
-                        text = "现货品种"
+                        text = "套保品种"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(32)
                     }
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
-                verticalLayout {
-                    gravity = Gravity.CENTER
-                    textView {
-                        text = "商品"
-                        textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
-                    }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+//                verticalLayout {
+//                    gravity = Gravity.CENTER
+//                    textView {
+//                        text = "商品"
+//                        textSizeAuto = 29
+//                        textColorInt = R.color.rma_hint_text_color_ccc
+//                    }.lparams(wrapContent, wrapContent)
+//                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_HORIZONTAL
@@ -58,14 +58,14 @@ class HedgeRatioUI(private val activity : AppCompatActivity,private val viewMode
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent){
-                        topMargin = autoSize(20)
+
                     }
                     textView {
                         text = "新值%"
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
@@ -76,8 +76,8 @@ class HedgeRatioUI(private val activity : AppCompatActivity,private val viewMode
                     }.lparams(wrapContent, wrapContent){
                         marginEnd = autoSize(32)
                     }
-                }.lparams(0, autoSize(80),1f)
-            }.lparams(matchParent, autoSize(80))
+                }.lparams(0, autoSize(100),1f)
+            }.lparams(matchParent, autoSize(100))
 
             statusLayout(contentBlock = {
                 statusLayout = this
@@ -100,7 +100,7 @@ class HedgeRatioUI(private val activity : AppCompatActivity,private val viewMode
                 emptyView(hint = resources.getString(R.string.now_no_data))
             }).lparams(matchParent, matchParent)
 
-            viewModel.vatrateDataList.bindOptional(context){
+            viewModel.hedgeRatioDataList.bindOptional(context){
                 if (it?.isEmpty() == true || it?.size == 0){
                     statusLayout.showEmpty()
                 }else {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/vatrate/VarRateUI.kt

@@ -45,7 +45,7 @@ class VarRateUI(private val activity : AppCompatActivity,private val viewModel:
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(32)
                     }
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER
@@ -54,7 +54,7 @@ class VarRateUI(private val activity : AppCompatActivity,private val viewModel:
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_HORIZONTAL
@@ -70,7 +70,7 @@ class VarRateUI(private val activity : AppCompatActivity,private val viewModel:
                         textSizeAuto = 29
                         textColorInt = R.color.rma_hint_text_color_ccc
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
@@ -81,8 +81,8 @@ class VarRateUI(private val activity : AppCompatActivity,private val viewModel:
                     }.lparams(wrapContent, wrapContent){
                         marginEnd = autoSize(32)
                     }
-                }.lparams(0, autoSize(80),1f)
-            }.lparams(matchParent, autoSize(80))
+                }.lparams(0, autoSize(100),1f)
+            }.lparams(matchParent, autoSize(100))
 
             statusLayout(contentBlock = {
                 statusLayout = this

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/ductaudit/vatrate/VarRateViewHolder.kt

@@ -11,6 +11,7 @@ import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.ductaudit.DuctAuditViewModel
 import cn.muchinfo.rma.view.base.home.ductaudit.convertcoefficient.ConvertCoefficientAuditActivity
@@ -45,16 +46,25 @@ class VarRateViewHolder(private val activity : AppCompatActivity,private val vie
                     //现货品种
                     textView {
                         data.bindOptional(context){
-                            text = it?.deliverygoodsname
+                            if (type == "2"){
+                                text = it?.middlegoodsname
+                            }else{
+                                text = it?.deliverygoodsname
+                            }
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent){
                         marginStart = autoSize(32)
                     }
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
+                    if (type == "2"){
+                        visibility = View.GONE
+                    }else{
+                        visibility = View.VISIBLE
+                    }
                     gravity = Gravity.CENTER
                     //商品
                     textView {
@@ -62,31 +72,31 @@ class VarRateViewHolder(private val activity : AppCompatActivity,private val vie
                             text = it?.wrstandardname
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_HORIZONTAL
                     //原值
                     textView {
                         data.bindOptional(context){
-                            text = it?.beforevalue
+                            text = NumberUtils.roundNum(it?.beforevalue?.toDouble()?.times(100) ?: 0.0,2)
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent){
                         topMargin = autoSize(20)
                     }
                     //新值
                     textView {
                         data.bindOptional(context){
-                            text = it?.aftervalue
+                            text = NumberUtils.roundNum(it?.aftervalue?.toDouble()?.times(100) ?: 0.0,2)
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
+                        textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent)
-                }.lparams(0, autoSize(80),1f)
+                }.lparams(0, autoSize(100),1f)
 
                 verticalLayout {
                     gravity = Gravity.CENTER_VERTICAL or Gravity.RIGHT
@@ -96,11 +106,9 @@ class VarRateViewHolder(private val activity : AppCompatActivity,private val vie
                             text = it?.applytime
                         }
                         textSizeAuto = 29
-                        textColorInt = R.color.rma_hint_text_color_ccc
-                    }.lparams(wrapContent, wrapContent){
-                        marginEnd = autoSize(32)
-                    }
-                }.lparams(0, autoSize(80),1f)
+                        textColorInt = R.color.rma_black_33
+                    }.lparams(wrapContent, wrapContent)
+                }.lparams(0, autoSize(100),1f)
             }.lparams(matchParent, autoSize(100))
 
             linearLayout {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/PeriodAssociatedViewModel.kt

@@ -195,7 +195,7 @@ class PeriodAssociatedViewModel : BaseViewModel(){
 
 
     //----------------------------------------------------------------------------------------------------
-    //外部成交单关联列头数据
+    //关联记录
     val relationRecordTitleList : MutableLiveData<List<ColumnsData>> = MutableLiveData()
 
     //外部成交单内容数据

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/perioddocuments/BusinessAssociationsActivity.kt

@@ -203,6 +203,13 @@ class BusinessAssociationsActivity : BaseActivity<BusinessAssociationsViewModel>
                                 )
                                 creatBottomSheetDialog("请选择交易类型", selectDataList) {
                                     selectBusinessType.postValue(this)
+                                    viewModel.querySCMiddleGoods(
+                                        data = data,
+                                        contractno = spot_number_edittext.text.toString(),
+                                        customername = counterparty_edittext.text.toString(),
+                                        wrstandardname = spot_goods_edittext.text.toString(),
+                                        biztype = selectBusinessType.value?.id ?: ""
+                                    )
                                 }
                             }
                             textView {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/perioddocuments/FillSingleConnectionActivity.kt

@@ -470,6 +470,16 @@ class FillSingleConnectionActivity : BaseActivity<FillSingleConnectionViewModel>
                                 )
                                 creatBottomSheetDialog("请选择业务类型", selectDataList) {
                                     selectBusinessType.postValue(this)
+                                    if (selectBuyOrSell.value?.id.isNullOrEmpty().not() && selectGoodsGroup.value?.id.isNullOrEmpty().not()){
+                                        viewModel.querySCMiddleGoods(
+                                            buyorsell = selectBuyOrSell.value?.id ?: "0",
+                                            goodsgroupid = selectGoodsGroup.value?.id ?: "",
+                                            contractno = spot_number_edittext.text.toString(),
+                                            customername = counterparty_edittext.text.toString(),
+                                            wrstandardname = spot_goods_edittext.text.toString(),
+                                            biztype = selectBusinessType.value?.id ?: ""
+                                        )
+                                    }
                                 }
                             }
                             textView {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/chart/YrdzChartActivity.kt

@@ -18,6 +18,7 @@ import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.data.ContractData
 import cn.muchinfo.rma.global.data.WrTradeOrderDetailData
 import cn.muchinfo.rma.global.data.chart.HistoryTikData
 import cn.muchinfo.rma.global.isBlankString
@@ -369,6 +370,7 @@ class YrdzChartActivity : BaseActivity<YrdzChartViewModel>() , View.OnClickListe
                 val intent = Intent()
                 intent.putExtra("goodsId", viewModel.goodsId)
                 intent.putExtra("outGoodsCode", viewModel.outGoodsCode)
+                intent.putExtra("contractData", ContractData())
                 intent.setClass(this, GoodsTradeActivity::class.java)
                 ActivityUtils.startActivity(intent)
             }