风险管理9月17日提交代码-liu.bolan-天津掉期

RMA/app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "cn.muchinfo.rma"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 50027
-        versionName "5.0.27"
+        versionCode 50028
+        versionName "5.0.28"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //指定room.schemaLocation生成的文件路径
@@ -69,7 +69,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }

RMA/app/src/main/java/cn/muchinfo/rma/business/account/AccountManager.kt

@@ -1338,4 +1338,31 @@ class AccountManager {
     }
 
 
+    /**
+     * 查询审核设置
+     * @param params Map<String, String>
+     * @param responseBack Function3<[@kotlin.ParameterName] Boolean, [@kotlin.ParameterName] List<BankInfoData>?, [@kotlin.ParameterName] Error?, Unit>
+     */
+    fun queryPaAreaAuditCfg(
+        params: Map<String, String>,
+        responseBack: (isSuccess: Boolean, respData: List<PaAreaAuditCfgData>?, error: Error?) -> Unit
+    ) {
+        MyOkHttpUtils().query(
+            URL = SPUtils.getInstance()
+                .getString(Constant.goCommonSearchUrl) + "/Ermcp3/QueryPaAreaAuditCfg",
+            params = params,
+            type = "1",
+            callback = object : ResponseCallback<BaseResult<List<PaAreaAuditCfgData>>>() {
+                override fun onResponse(response: BaseResult<List<PaAreaAuditCfgData>>?, 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/business/spot/SpotAdapter.kt

@@ -37,11 +37,13 @@ object SpotAdapter {
             )
         )
 
-        builder.subjectID = SubjectID
+        if (SubjectID != 0L){
+            builder.subjectID = SubjectID
+        }
         builder.subjectName = SubjectName
-        builder.areaUserID = AreaUserID
+        builder.areaUserID = loginInfo.userID.toLong()
         builder.operateSrc = 2
-        builder.operateid = loginInfo.userID.toLong()
+        builder.operateid = loginInfo.loginID
         builder.operateType = OperateType
         val arrayOutputStream = ByteArrayOutputStream()
         builder.build().writeTo(arrayOutputStream)

RMA/app/src/main/java/cn/muchinfo/rma/business/spot/SpotManager.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.business.spot
 
 import cn.muchinfo.rma.business.account.adapter.AccountAdapter
 import cn.muchinfo.rma.global.data.AccMgrLoginUserData
+import cn.muchinfo.rma.global.data.PaAreaSubjectData
 import cn.muchinfo.rma.global.data.SpotGoodsPriceData
 import cn.muchinfo.rma.netManage.base.ResponseCallback
 import cn.muchinfo.rma.netManage.utils.MyOkHttpUtils
@@ -266,7 +267,31 @@ class SpotManager {
         )
     }
 
+    /**
+     * 查询交易主体
+     * @param params Map<String, String>
+     * @param responseBack Function3<[@kotlin.ParameterName] Boolean, [@kotlin.ParameterName] List<SpotGoodsPriceData>?, [@kotlin.ParameterName] Error?, Unit>
+     */
+    fun queryPaAreaSubject(
+        params: Map<String, String>,
+        responseBack: (isSuccess: Boolean, respData: List<PaAreaSubjectData>?, error: Error?) -> Unit
+    ){
+        MyOkHttpUtils().query(
+            URL = SPUtils.getInstance()
+                .getString(Constant.goCommonSearchUrl) + "/Ermcp3/QueryPaAreaSubject",
+            params = params,
+            type = "1",
+            callback = object : ResponseCallback<BaseResult<List<PaAreaSubjectData>>>() {
+                override fun onResponse(response: BaseResult<List<PaAreaSubjectData>>?, 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/GlobalDataCollection.kt

@@ -19,24 +19,27 @@ class GlobalDataCollection : BaseGlobalData() {
      * 获取一级菜单的权限
      */
     fun getFirstLevelMenu(code : String) : Boolean{
-        return ermcpRoleFuncMenuDataArrayList.find { code == it.code }?.isshow ?: false
+        return true
+//        return ermcpRoleFuncMenuDataArrayList.find { code == it.code }?.isshow ?: false
     }
 
     /**
      * 获取二级菜单的权限
      */
     fun getSecondLevelMenu(firstCode : String,secondCode : String) : Boolean{
-        val secondChildList = ermcpRoleFuncMenuDataArrayList.find { firstCode == it.code }?.children
-        return secondChildList?.find { secondCode == it.code }?.isshow ?: false
+        return true
+//        val secondChildList = ermcpRoleFuncMenuDataArrayList.find { firstCode == it.code }?.children
+//        return secondChildList?.find { secondCode == it.code }?.isshow ?: false
     }
 
     /**
      * 获取三级菜单权限
      */
     fun getThreeLevelMenu(firstCode : String,secondCode : String,threeCode : String) : Boolean{
-        val secondChildList = ermcpRoleFuncMenuDataArrayList.find { firstCode == it.code }?.children
-        val threeChildList = secondChildList?.find { secondCode == it.code }?.children
-        return threeChildList?.find { threeCode == it.code }?.isshow ?: false
+        return true
+//        val secondChildList = ermcpRoleFuncMenuDataArrayList.find { firstCode == it.code }?.children
+//        val threeChildList = secondChildList?.find { secondCode == it.code }?.children
+//        return threeChildList?.find { threeCode == it.code }?.isshow ?: false
     }
 
     /**

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

@@ -0,0 +1,89 @@
+package cn.muchinfo.rma.global.data
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+
+/**
+ * 审核设置
+ */
+data class PaAreaAuditCfgData(
+    @SerializedName("areauserid")
+    val areauserid : String? = "",//用户ID
+    @SerializedName("buyinauditflag")
+    val buyinauditflag : Int? = 0,//采购入库是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("customerauditflag")
+    val customerauditflag : Int? = 0,//客户资料是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("deliveryauditflag")
+    val deliveryauditflag : Int? = 0,//交收是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("invoiceauditflag")
+    val invoiceauditflag : Int? = 0,//发票是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("moneyauditflag")
+    val moneyauditflag : Int? = 0,//款项是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("operatorid")
+    val operatorid : String? = "",//操作人
+    @SerializedName("operatorsrc")
+    val operatorsrc : Int? = 0,//操作来源 - 1:管理端 2:终端
+    @SerializedName("pointpriceauditflag")
+    val pointpriceauditflag : Int? = 0,//点价是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("produceinauditflag")
+    val produceinauditflag : Int? = 0,//生产入库是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("produceoutauditflag")
+    val produceoutauditflag : Int? = 0,//生产出库是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("selloutauditflag")
+    val selloutauditflag : Int? = 0,//销售出库是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("spotcontractauditflag")
+    val spotcontractauditflag : Int? = 0,//现货合同是否需要审核 - 0:不需审核 1:需要审核
+    @SerializedName("updatetime")
+    val updatetime : String? = ""//更新时间
+) : Parcelable{
+    constructor(parcel: Parcel) : this(
+        parcel.readString(),
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readString(),
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readValue(Int::class.java.classLoader) as? Int,
+        parcel.readString()
+    ) {
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(areauserid)
+        parcel.writeValue(buyinauditflag)
+        parcel.writeValue(customerauditflag)
+        parcel.writeValue(deliveryauditflag)
+        parcel.writeValue(invoiceauditflag)
+        parcel.writeValue(moneyauditflag)
+        parcel.writeString(operatorid)
+        parcel.writeValue(operatorsrc)
+        parcel.writeValue(pointpriceauditflag)
+        parcel.writeValue(produceinauditflag)
+        parcel.writeValue(produceoutauditflag)
+        parcel.writeValue(selloutauditflag)
+        parcel.writeValue(spotcontractauditflag)
+        parcel.writeString(updatetime)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<PaAreaAuditCfgData> {
+        override fun createFromParcel(parcel: Parcel): PaAreaAuditCfgData {
+            return PaAreaAuditCfgData(parcel)
+        }
+
+        override fun newArray(size: Int): Array<PaAreaAuditCfgData?> {
+            return arrayOfNulls(size)
+        }
+    }
+
+}

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

@@ -0,0 +1,92 @@
+package cn.muchinfo.rma.global.data
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+
+/**
+ * 交易主体
+ */
+data class PaAreaSubjectData(
+    @SerializedName("areauserid")
+    val areauserid : String? = "",//所属机构
+    @SerializedName("canmodify")
+    val canmodify : String? = "",//是否可修改 - 0:否 1:是
+    @SerializedName("createtime")
+    val createtime : String? = "",//创建时间
+    @SerializedName("creatorid")
+    val creatorid : String? = "",//创建人ID
+    @SerializedName("creatorsrc")
+    val creatorsrc : String? = "",//创建人来源 - 1:管理端 2:终端 3:交易
+    @SerializedName("modifierid")
+    val modifierid : String? = "",//修改人
+    @SerializedName("modifiersrc")
+    val modifiersrc : String? = "",//修改人来源 - 1:管理端 2:终端
+    @SerializedName("modifytime")
+    val modifytime : String? = "",//修改时间
+    @SerializedName("parentsubjectid")
+    val parentsubjectid : String? = "",//上级主体ID
+    @SerializedName("remark")
+    val remark : String? = "",//备注
+    @SerializedName("subjectid")
+    val subjectid : String? = "",//主体ID(SEQ_ERMCP_PA_AREASUBJECT)
+    @SerializedName("subjectname")
+    val subjectname : String? = "",//主体名称
+    @SerializedName("subjectstatus")
+    val subjectstatus : String? = "",//主体状态 - 1:正常 2: 停用
+    var isClick :Int = 0,
+    @SerializedName("subjecttype")
+    val subjecttype:  String? = ""//主体类型 - 1:交易主体 2:业务部门
+) : Parcelable{
+    constructor(parcel: Parcel) : this(
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readInt(),
+        parcel.readString()
+    ) {
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(areauserid)
+        parcel.writeString(canmodify)
+        parcel.writeString(createtime)
+        parcel.writeString(creatorid)
+        parcel.writeString(creatorsrc)
+        parcel.writeString(modifierid)
+        parcel.writeString(modifiersrc)
+        parcel.writeString(modifytime)
+        parcel.writeString(parentsubjectid)
+        parcel.writeString(remark)
+        parcel.writeString(subjectid)
+        parcel.writeString(subjectname)
+        parcel.writeString(subjectstatus)
+        parcel.writeInt(isClick)
+        parcel.writeString(subjecttype)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<PaAreaSubjectData> {
+        override fun createFromParcel(parcel: Parcel): PaAreaSubjectData {
+            return PaAreaSubjectData(parcel)
+        }
+
+        override fun newArray(size: Int): Array<PaAreaSubjectData?> {
+            return arrayOfNulls(size)
+        }
+    }
+
+}

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

@@ -109,9 +109,9 @@ data class Infoc(
     //获取保证金数值
     fun getMargainValue(amout : Double = 0.0,number : Double = 0.0,goodsid: String) : String{
         var marginValue = ""
-        val goodsInfo = DataBase.getInstance().goodsInfoDao().getGoodsInfo(goodsid.toInt())
+
         marginValue = if (MarginAlgorithm == "1"){//比例
-            NumberUtils.roundNum(amout.times(MarketMarginValue?.toDouble() ?: 0.0).times(goodsInfo.agreeunit),2)
+            NumberUtils.roundNum(amout.times(MarketMarginValue?.toDouble() ?: 0.0),2)
         }else{//固定值
             NumberUtils.roundNum(number.times(MarketMarginValue?.toDouble() ?: 0.0),2)
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/MainActivity.kt

@@ -26,6 +26,7 @@ import cn.muchinfo.rma.view.base.platinumtreasure.PlatinumTreasureFragment
 import cn.muchinfo.rma.view.base.procurement.ProcurementFragment
 import cn.muchinfo.rma.view.base.recycling.RecyclingFragment
 import cn.muchinfo.rma.view.base.sale.SaleFragment
+import cn.muchinfo.rma.view.base.spot.SpotFragment
 import cn.muchinfo.rma.view.base.warehousereceipt.WarehouseReceiptFragment
 import cn.muchinfo.rma.view.base.yrdzpurchase.YrdzDdjyFragment
 import cn.muchinfo.rma.view.eventbus.EventConstent
@@ -61,6 +62,11 @@ class MainActivity : BaseActivity<MainViewModel>() {
         TjmdHomeFragment()
     }
 
+    /** 新版风管云平台的现货fragment **/
+    val spotFragment by lazy {
+        SpotFragment()
+    }
+
     /** 采购页面 **/
     val procurementFragment by lazy {//client_po
         ProcurementFragment()
@@ -157,18 +163,25 @@ class MainActivity : BaseActivity<MainViewModel>() {
         newNormalIcon.add(R.mipmap.main_tab_1)
         newSelectIcon.add(R.mipmap.rma_select_main_tab_1)
 
-        if (GlobalDataCollection.instance?.getFirstLevelMenu("client_po") == true) {
-            newFragments.add(procurementFragment)
-            newTabText.add("采购")
+//        if (GlobalDataCollection.instance?.getFirstLevelMenu("client_spots") == true) {
+            newFragments.add(spotFragment)
+            newTabText.add("现货")
             newNormalIcon.add(R.mipmap.main_tab_2)
             newSelectIcon.add(R.mipmap.rma_select_main_tab_2)
-        }
-        if (GlobalDataCollection.instance?.getFirstLevelMenu("client_so") == true) {
-            newFragments.add(saleFragment)
-            newTabText.add("销售")
-            newNormalIcon.add(R.mipmap.main_tab_3)
-            newSelectIcon.add(R.mipmap.rma_select_main_tab_3)
-        }
+//        }
+
+//        if (GlobalDataCollection.instance?.getFirstLevelMenu("client_po") == true) {
+//            newFragments.add(procurementFragment)
+//            newTabText.add("采购")
+//            newNormalIcon.add(R.mipmap.main_tab_2)
+//            newSelectIcon.add(R.mipmap.rma_select_main_tab_2)
+//        }
+//        if (GlobalDataCollection.instance?.getFirstLevelMenu("client_so") == true) {
+//            newFragments.add(saleFragment)
+//            newTabText.add("销售")
+//            newNormalIcon.add(R.mipmap.main_tab_3)
+//            newSelectIcon.add(R.mipmap.rma_select_main_tab_3)
+//        }
         if (GlobalDataCollection.instance?.getFirstLevelMenu("client_futures") == true) {
             newFragments.add(futureFragment)
             newTabText.add("期货")

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

@@ -6,7 +6,7 @@ object Constant {
     /**
      * 获取基础url的接口
      */
-    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿
+//    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿
 //    const val baseurl = "http://103.40.249.123:28280/cfg?key=mtp_20"//云融大宗
 //    const val baseurl = "http://103.40.249.123:8280/cfg?key=mtp_20"//千海金外盘
 //    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
@@ -30,6 +30,7 @@ object Constant {
 //    const val baseurl = "http://192.168.31.136:8080/cfg?key=test_136"//黄老板 华南顺通
 
 //    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176"//黄老板 天津麦顿调试
+    const val baseurl = "http://192.168.31.167:8080/cfg?key=test_167"//黄老板 平安云平台（企业风管）
 
     /**
      * 用sp存储基础url的key

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/contractorders/unwind/AgreementUnwindViewHolder.kt

@@ -113,7 +113,7 @@ class AgreementUnwindViewHolder(private val activity : AppCompatActivity, privat
                                 data?.refgoodscode == it?.outgoodscode
                             }?.quoteDayData
                             val goodsInfo = DataBase.getInstance().goodsInfoDao()
-                                .getGoodsInfo(data?.refgoodsid?.toInt() ?: 0)
+                                .getGoodsInfo(data?.goodsid?.toInt() ?: 0)
                             if (quoteDayData != null){
                                 val buysell = if (data?.buyorsell == "0") {
                                     1
@@ -121,7 +121,7 @@ class AgreementUnwindViewHolder(private val activity : AppCompatActivity, privat
                                     -1
                                 }
                                 val profit_loss =
-                                    quoteDayData.getPrice().minus(data?.holderprice?.toDouble() ?: 0.0)
+                                    (quoteDayData.getPrice().minus(data?.holderprice?.toDouble() ?: 0.0))
                                         .times(data?.holderqty?.toInt() ?: 0)
                                         .times(goodsInfo?.agreeunit ?: 0).times(buysell)
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/performancetemplate/AddPerformanceTempateActivity.kt

@@ -312,7 +312,11 @@ class AddPerformanceTempateActivity : BaseActivity<PerformanceTemplateViewModel>
                 tempateInfo.stepvalue = it.stepvalue?.toDouble()?.times(100.0) ?: 0.0
             }
             tempateInfo.isauto = 1
-            tempateInfo.stepdays = it.stepdays?.toInt() ?: 0
+            if (it.stepdays.isNullOrEmpty()){
+                tempateInfo.stepdays = 0
+            }else{
+                tempateInfo.stepdays = it.stepdays?.toInt() ?: 0
+            }
             tempateInfoList.add(tempateInfo.build())
         }
         return tempateInfoList

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/listed/ListedActivity.kt

@@ -1292,7 +1292,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                                     ) {
                                         finish()
                                     }
-                                } else {
+                                } else if (listedType.value?.id == "3"){//贸易圈
                                     var canBargain = 0
                                     if (can_be_negotiation.isChecked) {
                                         canBargain = 1
@@ -1388,7 +1388,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                                     ) {
                                         finish()
                                     }
-                                } else if (listedType.value?.id == "1") {//浮动价
+                                } else if (listedType.value?.id == "2") {//浮动价
                                     viewModel.requeryWRListingOrderReq(
                                         FactoryItems = arrayListOf<WarehouseTradeMI1.DGFactoryItems>(),
                                         LadingBillId = 0,
@@ -1420,7 +1420,7 @@ class ListedActivity : BaseActivity<ListedViewModel>() {
                                     ) {
                                         finish()
                                     }
-                                } else {
+                                } else if (listedType.value?.id == "3") {//贸易圈
                                     var canBargain = 0
                                     if (can_be_negotiation.isChecked) {
                                         canBargain = 1

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/ContractActivity.kt

@@ -67,7 +67,6 @@ class ContractActivity : BaseActivity<ContractViewModel>() {
     //已完成
     private val finishUI by lazy { FinishUI(this,viewModel) }
 
-
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         val orientation = newConfig.orientation

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reviewset/ReviewSettingActivity.kt

@@ -2,10 +2,13 @@ package cn.muchinfo.rma.view.base.home.reviewset
 
 import android.os.Bundle
 import android.view.Gravity
+import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.future.trade.itemView
+import cn.muchinfo.rma.view.base.home.contract.emptyView
 import com.blankj.utilcode.util.ToastUtils
 import mtp.polymer.com.autowidget.adapter.BaseAdapter
 import org.jetbrains.anko.*
@@ -15,22 +18,53 @@ import org.jetbrains.anko.*
  */
 class ReviewSettingActivity : BaseActivity<ReviewSettingViewModel>(){
 
-    // 下拉刷新
-    private lateinit var swipeToLayout: SwipeToLoadLayout
-    private lateinit var statusLayout: StatusLayout
+    /** 客户资料审核 **/
+    val literature_review : MutableLiveData<Int> = MutableLiveData()
 
-    private val tradeNormaladapter: BaseAdapter<String, ReviewSettingViewHolder> =
-        BaseAdapter { _, _ ->
-            ReviewSettingViewHolder(
-                this,
-                viewModel
-            )
-        }
+    /** 现货合同审核 **/
+    val spot_contract_review : MutableLiveData<Int> = MutableLiveData()
+
+    /** 点价审核 **/
+    val midpoints_audit_review : MutableLiveData<Int> = MutableLiveData()
+
+    /** 交收审核 ***/
+    val settlement_audit_review : MutableLiveData<Int> = MutableLiveData()
+
+    /** 发票审核 ***/
+    val audit_invoice_review : MutableLiveData<Int> = MutableLiveData()
+
+    /** 款项审核 **/
+    val payment_review : MutableLiveData<Int> = MutableLiveData()
+
+    /** 入库审核 ***/
+    val warehousing_audit_review : MutableLiveData<Int> = MutableLiveData()
+
+    /** 出库审核 **/
+    val outbound_review : MutableLiveData<Int> = MutableLiveData()
+
+    /** 生产入库审核 ***/
+    val production_inventory_audit : MutableLiveData<Int> = MutableLiveData()
+
+    /** 生产出库审核 ***/
+    val production_outgoing_audit : MutableLiveData<Int> = MutableLiveData()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
             viewModel.getSettingDataList()
+            viewModel.settingDataList.bindOptional(context){
+                literature_review.postValue(it?.customerauditflag)
+                spot_contract_review.postValue(it?.spotcontractauditflag)
+                midpoints_audit_review.postValue(it?.pointpriceauditflag)
+                settlement_audit_review.postValue(it?.deliveryauditflag)
+                audit_invoice_review.postValue(it?.invoiceauditflag)
+                payment_review.postValue(it?.moneyauditflag)
+                warehousing_audit_review.postValue(it?.buyinauditflag)
+                outbound_review.postValue(it?.selloutauditflag)
+                production_inventory_audit.postValue(it?.produceinauditflag)
+                production_outgoing_audit.postValue(it?.produceoutauditflag)
+
+            }
             topBar {
                 commonLeftButton()
                 commonTitle {
@@ -41,43 +75,323 @@ class ReviewSettingActivity : BaseActivity<ReviewSettingViewModel>(){
             frameLayout {
                 scrollView {
                     verticalLayout {
-                        statusLayout(contentBlock = {
-                            statusLayout = this
-//                bindTaskStatus(viewModule.status)
-                            setRetryAction {
-                                viewModel.getSettingDataList()
-                            }
-                            swipeToLoadLayout {
-                                swipeToLayout = this
-                                setEnableRefresh(true)
-                                setEnableLoadMore(false)
-                                setOnRefreshListener {
-                                    viewModel.getSettingDataList()
-                                }
-                                setEnableScrollContentWhenLoaded(false)
-                                setEnableLoadMoreWhenContentNotFull(false)
-
-                                // 未提交列表
-                                recyclerView {
-                                    background = resources.getDrawable(R.color.white)
-                                    adapter = tradeNormaladapter
-                                }.lparams(matchParent, matchParent)
-                            }
-                        }, emptyBlock = {
-                            emptyView(hint = resources.getString(R.string.now_no_data))
-                        }).lparams(matchParent, matchParent)
-
-                        viewModel.settingDataList.bindOptional(context) {
-                            if (it?.isEmpty() == true || it?.size == 0) {
-                                statusLayout.showEmpty()
-                            } else {
-                                if (swipeToLayout.getIsRefreshing()) {
-                                    swipeToLayout.finishRefresh()
-                                }
-                                statusLayout.showSuccess()
-                                tradeNormaladapter.setNewData(it)
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "客户资料审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
                             }
-                        }
+
+                            emptyView()
+
+                            checkBox {
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.customerauditflag != 0
+                                }
+                                buttonDrawable = null
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        literature_review.postValue(1)
+                                    }else{
+                                        literature_review.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "现货合同审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                buttonDrawable = null
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.spotcontractauditflag != 0
+                                }
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        spot_contract_review.postValue(1)
+                                    }else{
+                                        spot_contract_review.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "点价审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                buttonDrawable = null
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.pointpriceauditflag != 0
+                                }
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        midpoints_audit_review.postValue(1)
+                                    }else{
+                                        midpoints_audit_review.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "交收审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                buttonDrawable = null
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.deliveryauditflag != 0
+                                }
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        settlement_audit_review.postValue(1)
+                                    }else{
+                                        settlement_audit_review.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "发票审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.deliveryauditflag != 0
+                                }
+                                buttonDrawable = null
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        audit_invoice_review.postValue(1)
+                                    }else{
+                                        audit_invoice_review.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "款项审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.moneyauditflag != 0
+                                }
+                                buttonDrawable = null
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        payment_review.postValue(1)
+                                    }else{
+                                        payment_review.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "入库审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.buyinauditflag != 0
+                                }
+                                buttonDrawable = null
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        warehousing_audit_review.postValue(1)
+                                    }else{
+                                        warehousing_audit_review.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "出库审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.selloutauditflag != 0
+                                }
+                                buttonDrawable = null
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        outbound_review.postValue(1)
+                                    }else{
+                                        outbound_review.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "生产入库审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.produceinauditflag != 0
+                                }
+                                buttonDrawable = null
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        production_inventory_audit.postValue(1)
+                                    }else{
+                                        production_inventory_audit.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            textView {
+                                text = "生产出库审核"
+                                textSizeAuto = 31
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(36)
+                            }
+
+                            emptyView()
+
+                            checkBox {
+                                viewModel.settingDataList.bindOptional(context){
+                                    isChecked = it?.produceoutauditflag != 0
+                                }
+                                buttonDrawable = null
+                                background = resources.getDrawable(R.drawable.checkbox_switch_selector)
+                                setOnCheckedChangeListener { _, b ->
+                                    if (b){
+                                        production_outgoing_audit.postValue(1)
+                                    }else{
+                                        production_outgoing_audit.postValue(0)
+                                    }
+                                }
+                            }.lparams(autoSize(100), autoSize(100)) {
+                                marginStart = autoSize(36)
+                            }
+                        }.lparams(matchParent, autoSize(100))
                     }
                 }
 
@@ -99,7 +413,20 @@ class ReviewSettingActivity : BaseActivity<ReviewSettingViewModel>(){
 
                     textView {
                         onThrottleFirstClick {
-
+                            viewModel.areaAuditConfigOperateReq(
+                                CustomerAuditFlag = literature_review.value.toString(),
+                                SpotContractAuditFlag = spot_contract_review.value.toString(),
+                                PointPriceAuditFlag = midpoints_audit_review.value.toString(),
+                                DeliveryAuditFlag = settlement_audit_review.value.toString(),
+                                MoneyAuditFlag = payment_review.value.toString(),
+                                InvoiceAuditFlag = audit_invoice_review.value.toString(),
+                                BuyInAuditFlag = warehousing_audit_review.value.toString(),
+                                SellOutAuditFlag = outbound_review.value.toString(),
+                                ProduceInAuditFlag = production_inventory_audit.value.toString(),
+                                ProduceOutAuditFlag = production_outgoing_audit.value.toString()
+                            ){
+                                finish()
+                            }
                         }
                         gravity = Gravity.CENTER
                         backgroundResource = R.mipmap.rma_submit_bg

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reviewset/ReviewSettingViewModel.kt

@@ -1,20 +1,86 @@
 package cn.muchinfo.rma.view.base.home.reviewset
 
 import androidx.lifecycle.MutableLiveData
+import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.data.PaAreaAuditCfgData
+import cn.muchinfo.rma.netManage.base.InteractiveException
+import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.base.BaseViewModel
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import mtp.polymer.com.autowidget.utils.TaskUiModel
 
 /**
  * 审核设置viewmodel
  */
 class ReviewSettingViewModel : BaseViewModel(){
 
+    /**
+     * 加载状态控制
+     */
+    val loadingDialogStatus: MutableLiveData<TaskUiModel> = MutableLiveData()
+
     //审核设置页面的审核项
-    val settingDataList : MutableLiveData<List<String>> = MutableLiveData()
+    val settingDataList : MutableLiveData<PaAreaAuditCfgData> = MutableLiveData()
 
     //获取审核设置的页面的数据
     fun getSettingDataList(){
-        val newDataList = arrayListOf<String>("1","2","3","4")
-        settingDataList.postValue(newDataList)
+       val params = mutableMapOf<String,String>().apply {
+           put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
+       }
+        MyApplication.getInstance()?.accountManager?.queryPaAreaAuditCfg(params = params){isSuccess, respData, error ->
+            if (isSuccess){
+                if (respData?.size ?: 0 > 0){
+                    settingDataList.postValue(respData?.get(0))
+                }
+            }
+        }
+    }
+
+    /**
+     * 审核设置
+     */
+    fun areaAuditConfigOperateReq(
+        CustomerAuditFlag : String = "",//客户资料是否需要审核 - 0:不需审核 1:需要审核
+        SpotContractAuditFlag : String = "",//现货合同是否需要审核 - 0:不需审核 1:需要审核
+        PointPriceAuditFlag : String = "",//点价是否需要审核 - 0:不需审核 1:需要审核
+        DeliveryAuditFlag : String = "",//交收是否需要审核 - 0:不需审核 1:需要审核
+        MoneyAuditFlag : String = "",//款项是否需要审核 - 0:不需审核 1:需要审核
+        InvoiceAuditFlag : String = "",//发票是否需要审核 - 0:不需审核 1:需要审核
+        BuyInAuditFlag : String = "",//采购入库是否需要审核 - 0:不需审核 1:需要审核
+        SellOutAuditFlag : String = "",//销售出库是否需要审核 - 0:不需审核 1:需要审核
+        ProduceInAuditFlag : String = "",//生产入库是否需要审核 - 0:不需审核 1:需要审核
+        ProduceOutAuditFlag : String = "",//生产出库是否需要审核 - 0:不需审核 1:需要审核
+        isSuccess: (isCompleted: Boolean) -> Unit
+    ){
+        loadingDialogStatus.value = TaskUiModel.inFlight()
+        GlobalScope.launch {
+            MyApplication.getInstance()?.customerManage?.areaAuditConfigOperateReq(
+                CustomerAuditFlag = CustomerAuditFlag,
+                SpotContractAuditFlag = SpotContractAuditFlag,
+                PointPriceAuditFlag = PointPriceAuditFlag,
+                DeliveryAuditFlag = DeliveryAuditFlag,
+                MoneyAuditFlag = MoneyAuditFlag,
+                InvoiceAuditFlag = InvoiceAuditFlag,
+                BuyInAuditFlag = BuyInAuditFlag,
+                SellOutAuditFlag = SellOutAuditFlag,
+                ProduceInAuditFlag = ProduceInAuditFlag,
+                ProduceOutAuditFlag = ProduceOutAuditFlag
+            ) { isCompleted, err ->
+                if (isCompleted) {
+                    loadingDialogStatus.postValue(TaskUiModel.success(msg = "请求成功"))
+                    isSuccess(true)
+                } else {
+                    loadingDialogStatus.postValue(
+                        TaskUiModel.failed(
+                            InteractiveException(
+                                errorMessage = err?.message!!
+                            )
+                        )
+                    )
+                }
+            }
+        }
     }
 
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/trademain/OperationTradeActivity.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.PaAreaSubjectData
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.home.contract.verticalEmptyView
@@ -20,6 +21,9 @@ class OperationTradeActivity : BaseActivity<TradeMainViewModel>(){
     //页面操作类型 1 是新增 2是修改
     val type by lazy { intent.getStringExtra("type") }
 
+    //修改时传入的实体
+    val data by lazy { intent.getParcelableExtra<PaAreaSubjectData>("data") as PaAreaSubjectData }
+
     lateinit var input_trade_main_name : EditText
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -57,6 +61,9 @@ class OperationTradeActivity : BaseActivity<TradeMainViewModel>(){
                 }
 
                 editText {
+                    if (type == "2"){
+                        setText(data.subjectname)
+                    }
                     input_trade_main_name = this
                     hint = "请输入交易主体名称"
                     background = null
@@ -94,9 +101,13 @@ class OperationTradeActivity : BaseActivity<TradeMainViewModel>(){
                             return@onThrottleFirstClick
                         }
                         if (type == "1"){//新增
-                             ToastUtils.showLong("新增交易主体")
+                            viewModel.ermcpPaAreaSubjectReq(SubjectName = input_trade_main_name.text.toString(),OperateType = 1){
+                                finish()
+                            }
                         }else if (type == "2"){//修改
-                             ToastUtils.showLong("交易主体修改")
+                            viewModel.ermcpPaAreaSubjectReq(SubjectID = data.subjectid?.toLong() ?: 0,SubjectName = input_trade_main_name.text.toString(),OperateType = 1){
+                                finish()
+                            }
                         }
 
                     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/trademain/TradeMainActivity.kt

@@ -6,21 +6,32 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewpager.widget.PagerAdapter
+import androidx.viewpager.widget.ViewPager
 import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.PaAreaSubjectData
 import cn.muchinfo.rma.global.data.SpotGoodsPriceData
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.home.spotmarket.SpotMarketPriceViewHolder
+import com.blankj.utilcode.util.ConvertUtils
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
+import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 import io.reactivex.disposables.Disposable
 import mtp.polymer.com.autowidget.adapter.BaseAdapter
 import org.jetbrains.anko.*
+import org.jetbrains.anko.support.v4.viewPager
 
 /**
  * 交易主体页面
  */
 class TradeMainActivity : BaseActivity<TradeMainViewModel>(){
 
+    lateinit var segment: QMUITabSegment
+    var selectedTabIndex: Int = 0
+    private lateinit var viewPager: ViewPager
+
     /**
      * 正常的交易主体ui
      */
@@ -88,7 +99,42 @@ class TradeMainActivity : BaseActivity<TradeMainViewModel>(){
                 }
             }
 
-            
+            tabSegment {
+                segment = this
+                background = resources.getDrawable(R.color.segtabment_bg_color)
+                addOnTabSelectedListener(object :
+                    QMUITabSegment.OnTabSelectedListener {
+                    override fun onDoubleTap(index: Int) {}
+                    override fun onTabReselected(index: Int) {}
+                    override fun onTabUnselected(index: Int) {}
+                    override fun onTabSelected(index: Int) {
+                        selectedTabIndex = index
+                    }
+                })
+                setIndicator(
+                    QMUITabIndicator(
+                        QMUIDisplayHelper.dp2px(context, 2),
+                        false,
+                        true
+                    )
+                )
+                setDefaultTextSize(ConvertUtils.sp2px(16f), ConvertUtils.sp2px(16f))
+            }.lparams(matchParent, autoSize(100))
+
+            view {
+                background = resources.getDrawable(R.color.main_hit_bg_color)
+            }.lparams(matchParent, autoSize(1)) {
+                marginStart = autoSize(32)
+                marginEnd = autoSize(32)
+            }
+            viewPager {
+                background = resources.getDrawable(R.color.white)
+                viewPager = this
+                adapter = newPagerAdapter
+            }.lparams(matchParent, matchParent)
+
+            segment.setupWithViewPager(viewPager)
+            segment.selectTab(0)
 
         }
     }
@@ -106,7 +152,7 @@ class NormalTradeUI(private val activity : AppCompatActivity,private val viewMod
     private lateinit var swipeToLayout: SwipeToLoadLayout
     private lateinit var statusLayout: StatusLayout
 
-    private val tradeNormaladapter: BaseAdapter<String, TradeNormalViewHolder> =
+    private val tradeNormaladapter: BaseAdapter<PaAreaSubjectData, TradeNormalViewHolder> =
         BaseAdapter { _, _ ->
             TradeNormalViewHolder(
                 activity,
@@ -117,6 +163,7 @@ class NormalTradeUI(private val activity : AppCompatActivity,private val viewMod
 
     val root = _FrameLayout(activity).apply {
         verticalLayout {
+            viewModel.getNormalDataList()
             linearLayout {
                 gravity = Gravity.CENTER_VERTICAL
                 linearLayout {
@@ -190,7 +237,7 @@ class DisableTradeUI(private val activity : AppCompatActivity,private val viewMo
     private lateinit var swipeToLayout: SwipeToLoadLayout
     private lateinit var statusLayout: StatusLayout
 
-    private val tradeNormaladapter: BaseAdapter<String, TradeNormalViewHolder> =
+    private val tradeNormaladapter: BaseAdapter<PaAreaSubjectData, TradeNormalViewHolder> =
         BaseAdapter { _, _ ->
             TradeNormalViewHolder(
                 activity,
@@ -201,6 +248,7 @@ class DisableTradeUI(private val activity : AppCompatActivity,private val viewMo
 
     val root = _FrameLayout(activity).apply {
         verticalLayout {
+            viewModel.getDisableDataList()
             linearLayout {
                 gravity = Gravity.CENTER_VERTICAL
                 linearLayout {
@@ -225,14 +273,14 @@ class DisableTradeUI(private val activity : AppCompatActivity,private val viewMo
                 statusLayout = this
 //                bindTaskStatus(viewModule.status)
                 setRetryAction {
-                    viewModel.getNormalDataList()
+                    viewModel.getDisableDataList()
                 }
                 swipeToLoadLayout {
                     swipeToLayout = this
                     setEnableRefresh(true)
                     setEnableLoadMore(false)
                     setOnRefreshListener {
-                        viewModel.getNormalDataList()
+                        viewModel.getDisableDataList()
                     }
                     setEnableScrollContentWhenLoaded(false)
                     setEnableLoadMoreWhenContentNotFull(false)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/trademain/TradeMainViewModel.kt

@@ -1,28 +1,124 @@
 package cn.muchinfo.rma.view.base.home.trademain
 
 import androidx.lifecycle.MutableLiveData
+import cn.muchinfo.rma.global.GlobalDataCollection
+import cn.muchinfo.rma.global.data.PaAreaSubjectData
+import cn.muchinfo.rma.global.data.SpotGoodsPriceData
+import cn.muchinfo.rma.netManage.base.InteractiveException
+import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.base.BaseViewModel
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import mtp.polymer.com.autowidget.utils.TaskUiModel
 
 /**
  * 交易主题viewmodel
  */
 class TradeMainViewModel : BaseViewModel(){
 
+    /**
+     * 加载状态控制
+     */
+    val loadingDialogStatus: MutableLiveData<TaskUiModel> = MutableLiveData()
+
     //交易主体正常的列表
-    val normalTradeDataList : MutableLiveData<List<String>> = MutableLiveData()
+    val normalTradeDataList : MutableLiveData<List<PaAreaSubjectData>> = MutableLiveData()
 
     //交易主体停用的列表
-    val disableTradeDataList : MutableLiveData<List<String>> = MutableLiveData()
+    val disableTradeDataList : MutableLiveData<List<PaAreaSubjectData>> = MutableLiveData()
 
     //获取交易主体正常的列表
     fun getNormalDataList(){
-        val dataList = arrayListOf<String>("1","2","3","4")
-        normalTradeDataList.postValue(dataList)
+        val params = mutableMapOf<String,String>().apply {
+            put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
+            put("subjectstatus","1")
+        }
+        MyApplication.getInstance()?.spotManager?.queryPaAreaSubject(params = params){isSuccess, respData, error ->
+            if (isSuccess){
+                normalTradeDataList.postValue(respData)
+            }
+        }
     }
 
     //获取交易主体停用的列表
     fun getDisableDataList(){
-        val dataList = arrayListOf<String>("1","2","3","4")
-        disableTradeDataList.postValue(dataList)
+        val params = mutableMapOf<String,String>().apply {
+            put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
+            put("subjectstatus","2")
+        }
+        MyApplication.getInstance()?.spotManager?.queryPaAreaSubject(params = params){isSuccess, respData, error ->
+            if (isSuccess){
+                disableTradeDataList.postValue(respData)
+            }
+        }
+    }
+
+    //交易主体item点击
+    fun setOnItemClick(subjectid : String,subjectstatus : String){
+
+        val normalOldList = normalTradeDataList.value
+        val disableOldList = disableTradeDataList.value
+        val newDataList = arrayListOf<PaAreaSubjectData>()
+        if (subjectstatus == "1"){//正常
+            normalOldList?.forEach {
+                if (subjectid == it.subjectid){
+                    if (it.isClick == 0){
+                        newDataList.add(it.copy(isClick = 1))
+                    }else{
+                        newDataList.add(it.copy(isClick = 0))
+                    }
+                }else{
+                    newDataList.add(it.copy(isClick = 0))
+                }
+            }
+            normalTradeDataList.postValue(newDataList)
+        }else{//停用
+            disableOldList?.forEach {
+                if (subjectid == it.subjectid){
+                    if (it.isClick == 0){
+                        newDataList.add(it.copy(isClick = 1))
+                    }else{
+                        newDataList.add(it.copy(isClick = 0))
+                    }
+                }else{
+                    newDataList.add(it.copy(isClick = 0))
+                }
+            }
+            disableTradeDataList.postValue(newDataList)
+        }
+    }
+
+    /**
+     * 交易主体设置
+     */
+    fun ermcpPaAreaSubjectReq(
+        SubjectID : Long = 0,//主体ID
+        SubjectName : String = "",//主体名称
+        AreaUserID : Long = 0,//所属机构
+        OperateType : Int = 0,//操作类型-1:新增2:修改3：停用4：恢复
+        isSuccess: (isCompleted: Boolean) -> Unit
+    ){
+        loadingDialogStatus.value = TaskUiModel.inFlight()
+        GlobalScope.launch {
+            MyApplication.getInstance()?.spotManager?.ermcpPaAreaSubjectReq(
+                SubjectID = SubjectID,
+                SubjectName = SubjectName,
+                AreaUserID = AreaUserID,
+                OperateType = OperateType
+            ) { isCompleted, err ->
+                if (isCompleted) {
+                    loadingDialogStatus.postValue(TaskUiModel.success(msg = "请求成功"))
+                    isSuccess(true)
+                } else {
+                    loadingDialogStatus.postValue(
+                        TaskUiModel.failed(
+                            InteractiveException(
+                                errorMessage = err?.message!!
+                            )
+                        )
+                    )
+                }
+            }
+        }
     }
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/trademain/TradeNormalViewHolder.kt

@@ -3,6 +3,8 @@ package cn.muchinfo.rma.view.base.home.trademain
 import android.view.Gravity
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.PaAreaSubjectData
+import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
@@ -21,7 +23,7 @@ import org.jetbrains.anko.*
  * @property itemSize IntArray
  * @constructor
  */
-class TradeNormalViewHolder(private val activity : AppCompatActivity,private val viewModel: TradeMainViewModel,private val type : String) : BaseViewHolder<String>(activity){
+class TradeNormalViewHolder(private val activity : AppCompatActivity,private val viewModel: TradeMainViewModel,private val type : String) : BaseViewHolder<PaAreaSubjectData>(activity){
     override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
 
     override fun _FrameLayout.createContentView() {
@@ -31,7 +33,9 @@ class TradeNormalViewHolder(private val activity : AppCompatActivity,private val
                 linearLayout {
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
-                        text = "1"
+                        data.bindOptional(context){
+                            text = it?.subjectid
+                        }
                         textSizeAuto = 31
                         textColorInt = R.color.rma_black_33
                     }.lparams(wrapContent, wrapContent){
@@ -40,7 +44,9 @@ class TradeNormalViewHolder(private val activity : AppCompatActivity,private val
                 }.lparams(autoSize(200), autoSize(100))
 
                 textView {
-                    text = "无极天下"
+                     data.bindOptional(context){
+                            text = it?.subjectname
+                        }
                     textSizeAuto = 31
                     textColorInt = R.color.rma_gray_color
                 }.lparams(wrapContent, wrapContent)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/procurement/ProcurementFragment.kt

@@ -118,30 +118,6 @@ class ProcurementFragment : BaseFragment<ProcurementViewModel>() {
         initMenuData()
         return UI {
             verticalLayout {
-                linearLayout {
-                    background = resources.getDrawable(R.color.main_title_bg_color)
-                    verticalLayout {
-                        gravity = Gravity.CENTER_VERTICAL
-                        textView {
-                            text = "采购"
-                            textColorInt = R.color.white
-                            textSizeAuto = 36
-                        }.lparams(wrapContent, wrapContent) {
-                            gravity = Gravity.CENTER_HORIZONTAL
-                        }
-                    }.lparams(autoSize(620), autoSize(90)) {
-                        marginStart = autoSize(140)
-                    }
-
-                    imageView {
-                        visibility = View.GONE
-                        imageResource = R.mipmap.main_search
-                    }.lparams(autoSize(45), autoSize(45)) {
-                        marginStart = autoSize(32)
-                        topMargin = autoSize(20)
-                    }
-                }.lparams(matchParent, autoSize(100))
-
                 tabSegment {
                     segment = this
                     background = resources.getDrawable(R.color.segtabment_bg_color)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/sale/SaleFragment.kt

@@ -105,29 +105,6 @@ class SaleFragment : BaseFragment<SaleViewModel>() {
         EventBus.getDefault().register(this)
         return UI {
             verticalLayout {
-                linearLayout {
-                    background = resources.getDrawable(R.color.main_title_bg_color)
-                    verticalLayout {
-                        gravity = Gravity.CENTER_VERTICAL
-                        textView {
-                            text = "销售"
-                            textColorInt = R.color.white
-                            textSizeAuto = 36
-                        }.lparams(wrapContent, wrapContent) {
-                            gravity = Gravity.CENTER_HORIZONTAL
-                        }
-                    }.lparams(autoSize(620), autoSize(90)) {
-                        marginStart = autoSize(140)
-                    }
-
-                    imageView {
-                        visibility = View.GONE
-                        imageResource = R.mipmap.main_search
-                    }.lparams(autoSize(45), autoSize(45)) {
-                        marginStart = autoSize(32)
-                        topMargin = autoSize(20)
-                    }
-                }.lparams(matchParent, autoSize(100))
 
                 tabSegment {
                     segment = this

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

@@ -0,0 +1,171 @@
+package cn.muchinfo.rma.view.base.spot
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.annotation.Nullable
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.ViewPager
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.lifecycle.getAppCompatActivity
+import cn.muchinfo.rma.view.autoWidget.autoSize
+import cn.muchinfo.rma.view.autoWidget.tabSegment
+import cn.muchinfo.rma.view.autoWidget.textColorInt
+import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import cn.muchinfo.rma.view.base.BaseFragment
+import cn.muchinfo.rma.view.base.procurement.ProcurementFragment
+import cn.muchinfo.rma.view.base.sale.SaleFragment
+import com.blankj.utilcode.util.ConvertUtils
+import com.qmuiteam.qmui.util.QMUIDisplayHelper
+import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
+import com.qmuiteam.qmui.widget.tab.QMUITabSegment
+import org.jetbrains.anko.*
+import org.jetbrains.anko.support.v4.UI
+import org.jetbrains.anko.support.v4.viewPager
+
+/**
+ * 现货fragment
+ */
+class SpotFragment : BaseFragment<SpotViewModel>(){
+
+    companion object {
+        fun newInstance() = SpotFragment()
+    }
+
+    lateinit var segment: QMUITabSegment
+    var selectedTabIndex: Int = 0
+    private lateinit var viewPager: ViewPager
+
+    /** 采购页面 **/
+    val procurementFragment by lazy {//client_po
+        ProcurementFragment()
+    }
+
+    /** 销售页面 **/
+    val saleFragment by lazy {//client_so
+        SaleFragment()
+    }
+
+    //viewpager的适配器
+    private var newPagerAdapter: FragmentPagerAdapter? = null
+
+    //tabSegment标题
+    private val newTabsArray: ArrayList<String> = arrayListOf()
+
+    //viewpager绑定的页面集合
+    private val newTabFragment: ArrayList<Fragment> = arrayListOf()
+
+    fun initMenuData() {
+        newTabsArray.add("采购合同")
+        newTabFragment.add(procurementFragment)
+
+        newTabsArray.add("销售合同")
+        newTabFragment.add(saleFragment)
+
+//        newTabsArray.add("商品掉期")
+//        newTabFragment.add(swapsFragment)
+
+        newPagerAdapter = object : FragmentPagerAdapter(
+            getAppCompatActivity().supportFragmentManager,
+            BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT
+        ) {
+            @NonNull
+            override fun getItem(position: Int): Fragment {
+                return newTabFragment[position]
+            }
+
+            override fun getCount(): Int {
+                return newTabFragment.size
+            }
+
+            @Nullable
+            override fun getPageTitle(position: Int): CharSequence? {
+                return newTabsArray[position]
+            }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        initMenuData()
+        return UI {
+
+            verticalLayout {
+                linearLayout {
+                    background = resources.getDrawable(R.color.main_title_bg_color)
+                    verticalLayout {
+                        gravity = Gravity.CENTER_VERTICAL
+                        textView {
+                            text = "现货"
+                            textColorInt = R.color.white
+                            textSizeAuto = 36
+                        }.lparams(wrapContent, wrapContent) {
+                            gravity = Gravity.CENTER_HORIZONTAL
+                        }
+                    }.lparams(autoSize(620), autoSize(90)) {
+                        marginStart = autoSize(140)
+                    }
+
+                    imageView {
+                        visibility = View.GONE
+                        imageResource = R.mipmap.rma_account_add
+                    }.lparams(autoSize(45), autoSize(45)) {
+                        marginStart = autoSize(32)
+                        topMargin = autoSize(20)
+                    }
+                }.lparams(matchParent, autoSize(100))
+
+
+                tabSegment {
+                    // 设置
+                    segment = this
+                    background = resources.getDrawable(R.color.white)
+                    addOnTabSelectedListener(object :
+                        QMUITabSegment.OnTabSelectedListener {
+                        override fun onDoubleTap(index: Int) {}
+                        override fun onTabReselected(index: Int) {}
+                        override fun onTabUnselected(index: Int) {}
+                        override fun onTabSelected(index: Int) {
+                            selectedTabIndex = index
+                        }
+                    })
+                    setIndicator(
+                        QMUITabIndicator(
+                            QMUIDisplayHelper.dp2px(context, 2),
+                            false,
+                            true
+                        )
+                    )
+
+                    setDefaultTextSize(ConvertUtils.sp2px(16f), ConvertUtils.sp2px(19f))
+                }.lparams(matchParent, autoSize(80))
+
+                view {
+                    background = resources.getDrawable(R.color.main_hit_bg_color)
+                }.lparams(matchParent, autoSize(1)) {
+                    marginStart = autoSize(32)
+                    marginEnd = autoSize(32)
+                }
+                viewPager {
+                    id = R.id.view_spot
+                    background = resources.getDrawable(R.color.white)
+                    viewPager = this
+                    adapter = newPagerAdapter
+                }.lparams(matchParent, matchParent)
+                //真的是，不搞个id就不行
+//                findViewById<ViewPager>(R.id.view_pager).adapter = newPagerAdapter
+                segment.setupWithViewPager(viewPager)
+                segment.selectTab(0)
+            }
+        }.view
+
+    }
+
+}

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

@@ -0,0 +1,11 @@
+package cn.muchinfo.rma.view.base.spot
+
+import cn.muchinfo.rma.view.base.BaseViewModel
+
+/**
+ * 首页现货的viewmodel
+ */
+class SpotViewModel : BaseViewModel(){
+
+
+}

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

@@ -110,11 +110,7 @@ class YrdzDdjyFragment : BaseFragment<YrdzDdjyViewModel>() {
                     gravity = Gravity.CENTER
 
                     textView {
-                        if (SPUtils.getInstance().getString(Constant.oem) == "tjmd"){
-                            text = "掉期交易"
-                        }else{
-                            text = "订单交易"
-                        }
+                        text = "订单交易"
                         textColorInt = R.color.white
                         textSizeAuto = 43
                     }.lparams(wrapContent, wrapContent)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/delisting/SwapsDelistingActivity.kt

@@ -298,6 +298,7 @@ class SwapsDelistingActivity : BaseActivity<SwapsDelistingViewModel>(){
                         viewModel.quoteDayData.bindOptional(context){
                             text = NumberUtils.roundNum(it?.getPrice() ?: 0.0,2)
                         }
+                        decimal = 2
                         limit_price_edittext = this
                         setOnTextChangeListener { view, value ->
                             valueChange.postValue(valueChange.value)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/listed/SwapsListedActivity.kt

@@ -24,6 +24,7 @@ import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI2
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.autoWidget.view.MangeNumberEditText2
+import cn.muchinfo.rma.view.autoWidget.view.MangeNumberEditText3
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.future.trade.itemView
 import cn.muchinfo.rma.view.base.home.contract.emptyView
@@ -228,7 +229,7 @@ class SellListedUI(
     lateinit var onePriceInputNumberEdittext: MangeNumberEditText2
 
     /** 浮动价时的基差 **/
-    lateinit var basis_price_input: MangeNumberEditText2
+    lateinit var basis_price_input: MangeNumberEditText3
 
     /** 为浮动价挂牌时的估算价 **/
     lateinit var estimate_price: TextView
@@ -402,13 +403,13 @@ class SellListedUI(
                     }
                 }.lparams(autoSize(250), wrapContent)
 
-                numberEditText {
+                numberEditText3 {
                     basis_price_input = this
                     setOnTextChangeListener { view, value ->
                         valueChange.postValue(valueChange.value)
                     }
                     text = "0"
-                    setTextColor(R.color.buy_hall_color)
+
                 }.lparams(0, autoSize(72), 1f){
                     marginEnd = autoSize(110)
                 }
@@ -767,7 +768,7 @@ class BuyListedUI(
     lateinit var onePriceInputNumberEdittext: MangeNumberEditText2
 
     /** 浮动价时的基差 **/
-    lateinit var basis_price_input: MangeNumberEditText2
+    lateinit var basis_price_input: MangeNumberEditText3
 
     /** 为浮动价挂牌时的估算价 **/
     lateinit var estimate_price: TextView
@@ -936,13 +937,12 @@ class BuyListedUI(
                     }
                 }.lparams(autoSize(250), wrapContent)
 
-                numberEditText {
+                numberEditText3 {
                     basis_price_input = this
                     setOnTextChangeListener { view, value ->
                         valueChange.postValue(valueChange.value)
                     }
                     text = "0"
-                    setTextColor(R.color.buy_hall_color)
                 }.lparams(0, autoSize(72), 1f) {
                     marginEnd = autoSize(110)
                 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/listed/SwapsListedViewModel.kt

@@ -160,6 +160,7 @@ class SwapsListedViewModel : BaseViewModel(){
 
         val orderData = OrderData()
         orderData.accountID = accountId
+        orderData.marketMaxSub = marketMaxSub
         if (type == "1") {
             orderData.buildType = MTPEnums.BUILDTYPE_OPEN// 建仓
             orderData.buyOrSell = MTPEnums.DIRECTION_BUY// 买入

RMA/app/src/main/res/values/ids.xml

@@ -15,4 +15,7 @@
 
     <item name="view_pager1" type="id"/>
 
+    <!--  主页现货用的viewpagerid  -->
+    <item name="view_spot" type="id"/>
+
 </resources>

RMA/gradle.properties

@@ -19,4 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.enableR8=false
+android.enableD8=true