风险管理9月26日提交代码-liu.bolan-企业风管

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

@@ -473,7 +473,8 @@ class AccountManager {
                 it.code == "client_mobile_hnstwymh" ||
                 it.code == "client_mobile_hnstwyys" ||
                 it.code == "client_trademain" ||
-                it.code == "client_aduitsetting"
+                it.code == "client_aduitsetting" ||
+                it.code == "client_spotsaduit"
             ) {
                 newList.add(it)
             }

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

@@ -36,10 +36,10 @@ class GlobalDataCollection : BaseGlobalData() {
      * 获取三级菜单权限
      */
     fun getThreeLevelMenu(firstCode : String,secondCode : String,threeCode : String) : Boolean{
-        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
+//        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/DeliveryGoodsDetailData.kt

@@ -35,14 +35,6 @@ data class DeliveryGoodsDetailData(
     @SerializedName("wdlst")
     val wdlst : List<XhWrstandard>? = arrayListOf(),//品类(现货商品)列表
 
-    @SerializedName("data")
-    val data : ErmcpDeliveryGoods? = ErmcpDeliveryGoods(),
-    @SerializedName("gblist")
-    val gblist : List<Ermcp3Brand>? = arrayListOf(),//品牌列表
-    @SerializedName("gmlist")
-    val gmlist : List<Ermcp3Wrstandard>? = arrayListOf(),//品类列表(仓单标准)
-    @SerializedName("mgList")
-    val mgList : List<Ermcp3MiddleGoodsDetail>? = arrayListOf(),
     @SerializedName("hedgeIsSelect")
     var hedgeIsSelect : Int = 1//套保是否展开
 ) : Parcelable{
@@ -60,10 +52,6 @@ data class DeliveryGoodsDetailData(
         parcel.readString(),
         parcel.createTypedArrayList(Xhnrand),
         parcel.createTypedArrayList(XhWrstandard),
-        parcel.readParcelable(ErmcpDeliveryGoods::class.java.classLoader),
-        parcel.createTypedArrayList(Ermcp3Brand),
-        parcel.createTypedArrayList(Ermcp3Wrstandard),
-        parcel.createTypedArrayList(Ermcp3MiddleGoodsDetail),
         parcel.readInt()
     ) {
     }
@@ -82,10 +70,6 @@ data class DeliveryGoodsDetailData(
         parcel.writeString(unitid)
         parcel.writeTypedList(bdlst)
         parcel.writeTypedList(wdlst)
-        parcel.writeParcelable(data, flags)
-        parcel.writeTypedList(gblist)
-        parcel.writeTypedList(gmlist)
-        parcel.writeTypedList(mgList)
         parcel.writeInt(hedgeIsSelect)
     }
 
@@ -103,7 +87,6 @@ data class DeliveryGoodsDetailData(
         }
     }
 
-
 }
 
 

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

@@ -169,12 +169,12 @@ 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_spots") == true) {
+        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_po") == true) {
 //            newFragments.add(procurementFragment)

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

@@ -14,9 +14,9 @@ object Constant {
 
 
 //    const val baseurl = "http://192.168.31.93:8080/cfg?key=test_93"//李倩企业风管 18611112222
-//    const val baseurl = "http://192.168.31.104:8080/cfg?key=test_104"//李倩云融 18611112222
+    const val baseurl = "http://192.168.31.104:8080/cfg?key=test_104"//李倩云融 18611112222
 //
-    const val baseurl = "http://192.168.31.135:8080/cfg?key=test_135"// 瑶姐 云融 190000000001 123456
+//    const val baseurl = "http://192.168.31.135:8080/cfg?key=test_135"// 瑶姐 云融 190000000001 123456
 
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
 //    const val baseurl = "http://192.168.31.223:8080/cfg?key=test_223"
@@ -77,6 +77,18 @@ object Constant {
     /** 现货合同 **/
     const val table_mobile_spotcontract  = "table_mobile_spotcontract"
 
+    /** 现货-采购/销售-新增合同 ***/
+    const val table_mobile_spotcontract_new = "table_mobile_spotcontract_new"
+
+    /** 现货-采购/销售-已完成 ***/
+    const val table_mobile_spotcontract_complete = "table_mobile_spotcontract_complete"
+
+    /** 现货审核-合同审核-待审核 **/
+    const val table_mobile_spotadiit_contract_unaduit = "table_mobile_spotadiit_contract_unaduit"
+
+    /** 现货审核-合同审核-已审核 **/
+    const val table_mobile_spotadiit_contract_aduited = "table_mobile_spotadiit_contract_aduited"
+
     /** 采购_待点价 ***/
     const val table_mobile_purchase_pointprice = "table_mobile_purchase_pointprice"
 

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

@@ -60,6 +60,8 @@ fun String.getMenuIcon() : Int{
         returnString = R.mipmap.rma_trading_main_body
     }else if (this == "client_aduitsetting"){//审核设置
         returnString = R.mipmap.rma_review_settings
+    }else if (this == "client_spotsaduit"){//现货审核
+        returnString = R.mipmap.rma_spot_audit
     }
 
     return returnString

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

@@ -48,6 +48,7 @@ import cn.muchinfo.rma.view.base.home.reference.ReferenceActivity
 import cn.muchinfo.rma.view.base.home.reportquery.ReportQueryActivity
 import cn.muchinfo.rma.view.base.home.reviewset.ReviewSettingActivity
 import cn.muchinfo.rma.view.base.home.set.SettingActivity
+import cn.muchinfo.rma.view.base.home.spotaudit.SpotAuditActivity
 import cn.muchinfo.rma.view.base.home.spotmarket.SpotMarketPriceActivity
 import cn.muchinfo.rma.view.base.home.trademain.TradeMainActivity
 import cn.muchinfo.rma.view.base.home.tradingquery.TradingQueryActivity
@@ -730,7 +731,7 @@ fun jumpActivity(context : Context,code : String){
         intent.setClass(context, SpotMarketPriceActivity::class.java)
     }else if (code == "client_stock_manage"){//库存管理
         intent.setClass(context, InventoryManagerActivity::class.java)
-    }else if (code == "client_stock_aduit"){//库存审核
+    }else if (code == "client_stock"){//库存审核
         intent.setClass(context, InventoryAuditActivity::class.java)
     }else if (code == "client_warehouse"){//仓库信息
         intent.setClass(context, WarehouseInformationActivity::class.java)
@@ -744,7 +745,7 @@ fun jumpActivity(context : Context,code : String){
             context,
             TradingQueryActivity::class.java
         )
-    }else if (code == "client_finance"){//财务管理
+    }else if (code == "client_finance"){//财务审核
         intent.setClass(
             context,
             FinancialActivity::class.java
@@ -759,14 +760,14 @@ fun jumpActivity(context : Context,code : String){
             context,
             HedgePlanActivity::class.java
         )
-    }else if (code == "client_spotcontract"){//现货合同页面
+    }else if (code == "client_spotsaduit"){//现货合同页面
         intent.setClass(
             context,
-            ContractActivity::class.java
+            SpotAuditActivity::class.java
         )
     }else if (code == "client_accountmanage"){//账户管理页面
         intent.setClass(context, AccountManagerActivity::class.java)
-    }else if (code == "client_deliverygoods"){//现货品种
+    }else if (code == "client_deliverygoods"){//商品信息
         intent.setClass(
             context,
             NewCommodityInformationActivity::class.java

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

@@ -126,8 +126,8 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
             viewModel.initSpotGoodsActivity(data)
             selectUnitType.postValue(
                 SelectData(
-                    id = data.data?.goodsunitid ?: "",
-                    value = data.data?.enumdicname ?: ""
+                    id = data.unitid ?: "",
+                    value =  ""
                 )
             )
 //            viewModel.queryWrStandardDetails(data.data?.deliverygoodsid ?: "")
@@ -183,7 +183,7 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                             editText {
                                 if (type == "2" || type == "4" || type == "3" || type == "5") {
                                     isEnabled = false
-                                    setText(data.data?.deliverygoodsname)
+                                    setText(data.deliverygoodsname)
                                 } else {
                                     isEnabled = true
                                 }
@@ -218,7 +218,7 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                             editText {
                                 if (type == "2" || type == "4" || type == "3" || type == "5") {
                                     isEnabled = false
-                                    setText(data.data?.deliverygoodscode)
+                                    setText(data.deliverygoodscode)
                                 } else {
                                     isEnabled = true
                                 }
@@ -294,7 +294,7 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                             textView {
                                 selectUnitType.bindOptional(context) {
                                     if (it?.value.isNullOrEmpty()) {
-                                        text = data.data?.enumdicname
+//                                        text = data.enumdicname
                                         textColorInt = R.color.rma_black_33
                                     } else {
                                         text = it?.value
@@ -529,7 +529,7 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                                     deliverygoodscode = spot_variety_code_edittext.text.toString(),
                                     deliverygoodsname = spot_variety_name_edittext.text.toString(),
                                     unitid = selectUnitType.value?.id?.toLong()!!,
-                                    wrstandardid = data.data?.deliverygoodsid?.toLong() ?: 0,
+                                    wrstandardid = data.deliverygoodsid?.toLong() ?: 0,
                                     type = 2,
                                     remark = remask_edittext.text.toString(),
                                     spotgoodsmodels = getSpotModelList(isAdd = false),
@@ -540,14 +540,14 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                                 }
                             } else if (type == "3") {//停用
                                 viewModel.requestGoodsCancelReq(
-                                    wrstandardid = data.data?.deliverygoodsid?.toLong() ?: 0,
+                                    wrstandardid = data.deliverygoodsid?.toLong() ?: 0,
                                     isvalid = 0
                                 ) {
                                     finish()
                                 }
                             } else if (type == "5") {//恢复
                                 viewModel.requestGoodsCancelReq(
-                                    wrstandardid = data.data?.deliverygoodsid?.toLong() ?: 0,
+                                    wrstandardid = data.deliverygoodsid?.toLong() ?: 0,
                                     isvalid = 1
                                 ) {
                                     finish()

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

@@ -635,39 +635,39 @@ class CommodityInformationViewModel : BaseViewModel() {
         val newbrandModelList = arrayListOf<SpotInfoData>()//品牌列表
         val newspotModelList = arrayListOf<SpotInfoData>()//品类列表
         val newmiddlegoodList = arrayListOf<SpotInfoData>()//套保品种
-        respData.gmlist?.forEach {//品类列表
+        respData.wdlst?.forEach {//品类列表
             newspotModelList.add(
                 SpotInfoData(
-                    id = respData.gmlist.indexOf(it).plus(1).toString(),
+                    id = respData.wdlst.indexOf(it).plus(1).toString(),
                     value = it.wrstandardname ?: "",
                     enumdicname = it.enumdicname ?: "",
                     enumdicnameid = it.unitid ?: "",
-                    coefficientwarehouse = it.convertfactor ?: "",
+                    coefficientwarehouse = it.vatrate ?: "",
                     middleGoodsId = it.wrstandardid ?: ""
                 )
             )
         }
-        respData.gblist?.forEach {//品牌列表
+        respData.bdlst?.forEach {//品牌列表
             newbrandModelList.add(
                 SpotInfoData(
-                    id = respData.gblist.indexOf(it).plus(1).toString(),
+                    id = respData.bdlst.indexOf(it).plus(1).toString(),
                     value = it.brandname ?: "",
                     middleGoodsId = it.brandid ?: ""
                 )
             )
         }
-        respData.mgList?.forEach {//套保品种
-            newmiddlegoodList.add(
-                SpotInfoData(
-                    id = respData.mgList.indexOf(it).plus(1).toString(),
-                    value = it.convertratio ?: "",
-                    enumdicnameid = it.mg?.goodsunitid ?: "",
-                    middleGoodsId = it.mg?.goodsgroupid ?: "",
-                    middleGoodsName = it.mg?.middlegoodsname ?: "",
-                    enumdicname = it.mg?.enumdicname ?: ""
-                )
-            )
-        }
+//        respData.wdlst?.forEach {//套保品种
+//            newmiddlegoodList.add(
+//                SpotInfoData(
+//                    id = respData.wdlst.indexOf(it).plus(1).toString(),
+//                    value = it.convertratio ?: "",
+//                    enumdicnameid = it.mg?.goodsunitid ?: "",
+//                    middleGoodsId = it.mg?.goodsgroupid ?: "",
+//                    middleGoodsName = it.mg?.middlegoodsname ?: "",
+//                    enumdicname = it.mg?.enumdicname ?: ""
+//                )
+//            )
+//        }
         spotModelcacheList.postValue(newspotModelList)
         brandModelcacheList.postValue(newbrandModelList)
         middlegoodCacheList.postValue(newmiddlegoodList)

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

@@ -13,6 +13,7 @@ import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.home.commodity.AddHedgeGoodsActivity
 import cn.muchinfo.rma.view.base.home.commodity.AddSpotGoodsActivity
 import cn.muchinfo.rma.view.base.home.commodity.CommodityMiddleViewHolder
+import cn.muchinfo.rma.view.base.home.commodity.newspot.NewAddSpotGoodsActivity
 import cn.muchinfo.rma.view.base.home.contract.emptyView
 import com.blankj.utilcode.util.ActivityUtils
 import mtp.polymer.com.autowidget.adapter.BaseAdapter
@@ -60,12 +61,12 @@ class DemoViewHolder(
 
                 textView {
                     data.bindOptional(context){
-                        if (it?.data?.isvalid == "1"){
+                        if (it?.isvalid == "1"){
                             text = "正常"
                             textColorInt = R.color.rma_green_color
                         }else {
                             text = "停用"
-                            textColorInt = R.color.rma_blue_color
+                            textColorInt = R.color.rma_red_color
                         }
                     }
                     textSizeAuto = 36
@@ -99,7 +100,7 @@ class DemoViewHolder(
                     data.bindOptional(context){
                         //判断是否有相应权限显示该功能
                         if (GlobalDataCollection.instance?.getThreeLevelMenu(firstCode = "client_deliverygoods",secondCode = "client_deliverygoods_spot",threeCode = "client_deliverygoods_spot_modify") == true){
-                            if (it?.data?.isvalid == "1"){
+                            if (it?.isvalid == "1"){
                                 visibility = View.VISIBLE
                             }else {
                                 visibility = View.GONE
@@ -128,7 +129,7 @@ class DemoViewHolder(
                     data.bindOptional(context){
                         //判断是否有相应权限显示该功能
                         if (GlobalDataCollection.instance?.getThreeLevelMenu(firstCode = "client_deliverygoods",secondCode = "client_deliverygoods_spot",threeCode = "client_deliverygoods_spot_restore") == true){
-                            if (it?.data?.isvalid == "0"){
+                            if (it?.isvalid == "0"){
                                 visibility = View.VISIBLE
                             }else {
                                 visibility = View.GONE
@@ -158,7 +159,7 @@ class DemoViewHolder(
                     data.bindOptional(context){
                         //判断是否有相应权限显示该功能
                         if (GlobalDataCollection.instance?.getThreeLevelMenu(firstCode = "client_deliverygoods",secondCode = "client_deliverygoods_spot",threeCode = "client_deliverygoods_spot_disable") == true){
-                            if (it?.data?.isvalid == "1"){
+                            if (it?.isvalid == "1"){
                                 visibility = View.VISIBLE
                             }else {
                                 visibility = View.GONE
@@ -181,7 +182,7 @@ class DemoViewHolder(
                         val intent = Intent()
                         intent.putExtra("type","4")
                         intent.putExtra("data",data.value)
-                        intent.setClass(context, AddSpotGoodsActivity::class.java)
+                        intent.setClass(context, NewAddSpotGoodsActivity::class.java)
                         ActivityUtils.startActivity(intent)
                     }
                     backgroundResource = R.drawable.rma_item_click_bg
@@ -298,7 +299,7 @@ class DemoViewHolder(
                     }.lparams(autoSize(350), autoSize(108))
                 }.lparams(matchParent, autoSize(108))
 
-                //品类
+                //商品
                 recyclerView {
                     data.bindOptional(context) {
                         if (it?.categoryIsSelect == 0) {
@@ -312,8 +313,6 @@ class DemoViewHolder(
                 }.lparams(matchParent, wrapContent)
 
                 data.bindOptional(context) {
-
-
                     spotCategoryAdapter.setNewData(it?.wdlst)
                 }
             }.lparams(matchParent, wrapContent)

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

@@ -296,23 +296,23 @@ class NewCommodityInformationViewModel : BaseViewModel() {
         val datanewlist = arrayListOf<DeliveryGoodsDetailData>()
         val oldList = deliveryGoodsDetailList.value
         deliveryGoodsDetailList.value?.forEach {
-            if (index == oldList?.indexOf(it)) {
-                val newHedgeList = arrayListOf<Ermcp3MiddleGoodsDetail>()
-                oldList.get(index).mgList?.forEach { data ->
-                    if (sonIndex == oldList.get(index).mgList?.indexOf(data)) {
-                        if (data.isSelect == 0) {
-                            newHedgeList.add(data.copy(isSelect = 1))
-                        } else {
-                            newHedgeList.add(data.copy(isSelect = 0))
-                        }
-                    } else {
-                        newHedgeList.add(data)
-                    }
-                }
-                datanewlist.add(it.copy(mgList = newHedgeList))
-            } else {
-                datanewlist.add(it)
-            }
+//            if (index == oldList?.indexOf(it)) {
+//                val newHedgeList = arrayListOf<Ermcp3MiddleGoodsDetail>()
+//                oldList.get(index).mgList?.forEach { data ->
+//                    if (sonIndex == oldList.get(index).mgList?.indexOf(data)) {
+//                        if (data.isSelect == 0) {
+//                            newHedgeList.add(data.copy(isSelect = 1))
+//                        } else {
+//                            newHedgeList.add(data.copy(isSelect = 0))
+//                        }
+//                    } else {
+//                        newHedgeList.add(data)
+//                    }
+//                }
+//                datanewlist.add(it.copy(mgList = newHedgeList))
+//            } else {
+//                datanewlist.add(it)
+//            }
         }
         deliveryGoodsDetailList.postValue(datanewlist)
     }

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

@@ -10,6 +10,7 @@ import cn.muchinfo.rma.global.data.XhMiddlergoods
 import cn.muchinfo.rma.global.data.XhWrstandard
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.home.contract.emptyView
 import mtp.polymer.com.autowidget.adapter.BaseAdapter
 import mtp.polymer.com.autowidget.adapter.BaseViewHolder
@@ -55,7 +56,7 @@ class SpotCategoryViewHolder(private val activity : AppCompatActivity,private va
                 //增值税税率
                 textView {
                     data.bindOptional(context){
-                        text = it?.vatrate
+                        text = NumberUtils.roundNum(it?.vatrate?.toDouble()?.times(100).toString(),2)
                     }
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33

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

@@ -93,6 +93,9 @@ class HedgeFutureViewHolder(
                     }.lparams(autoSize(43), autoSize(43))
 
                     textView {
+                        data.bindOptional(context){
+                            text = "期货合约（" + it?.glist?.size + ")"
+                        }
                         text = "期货合约"
                         textSizeAuto = 31
                         textColorInt = R.color.rma_black_33

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

@@ -41,7 +41,7 @@ class HedgeSpotViewHolder(
                 gravity = Gravity.CENTER_VERTICAL
                 textView {
                     data.bindOptional(context){
-                        text = it?.deliverygoodsname
+                        text = it?.wrstandardname + "(" + it?.enumdicname + ")"
                     }
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
@@ -53,11 +53,22 @@ class HedgeSpotViewHolder(
 
                 textView {
                     data.bindOptional(context){
-                        text = it?.enumdicname
+                        text = it?.vatrate
+                    }
+                    textColorInt = R.color.rma_black_33
+                    textSizeAuto = 31
+                }.lparams(wrapContent, wrapContent)
+
+                emptyView()
+
+                textView {
+                    data.bindOptional(context){
+                        text = it?.deliverygoodsname
                     }
                     textColorInt = R.color.rma_black_33
                     textSizeAuto = 31
                 }.lparams(wrapContent, wrapContent)
+
                 emptyView()
                 textView {
                     data.bindOptional(context){

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

@@ -93,7 +93,7 @@ class NewHedgeSpeciesViewHolder(
                     }
                     textView {
                         data.bindOptional(context){
-                            text = "套利比例100%"
+                            text = "套利比例" + it?.needarbitrageratio?.toPercentage()
                         }
                         textSizeAuto = 25
                         textColorInt = R.color.rma_green_color
@@ -187,6 +187,9 @@ class NewHedgeSpeciesViewHolder(
                         }
 
                         textView {
+                            data.bindOptional(context){
+                                text = "期货品种(" + it?.gplist?.size + ")"
+                            }
                             text = "期货品种"
                             textSizeAuto = autoSize(31)
                             textColorInt = R.color.rma_black_33
@@ -253,7 +256,10 @@ class NewHedgeSpeciesViewHolder(
                         }
 
                         textView {
-                            text = "现货品种"
+                            data.bindOptional(context){
+                                text = "商品信息(" + it?.wdlst?.size + ")"
+                            }
+                            text = "商品信息"
                             textSizeAuto = autoSize(31)
                             textColorInt = R.color.rma_black_33
                         }.lparams(wrapContent, wrapContent) {
@@ -281,6 +287,47 @@ class NewHedgeSpeciesViewHolder(
                     }.lparams(autoSize(350), autoSize(108))
                 }.lparams(matchParent, autoSize(108))
 
+                linearLayout {
+                    linearLayout {
+                        gravity = Gravity.LEFT or Gravity.CENTER_VERTICAL
+                        textView {
+                            text = "商品"
+                            textSizeAuto = 31
+                            textColorInt = R.color.rma_hint_text_color_ccc
+                        }.lparams(wrapContent, wrapContent)
+                    }.lparams(0, autoSize(80),1f)
+
+                    linearLayout {
+                        gravity = Gravity.CENTER
+                        textView {
+                            text = "增值税税率%"
+                            textSizeAuto = 31
+                            textColorInt = R.color.rma_hint_text_color_ccc
+                        }.lparams(wrapContent, wrapContent)
+                    }.lparams(0, autoSize(80),1f)
+
+                    linearLayout {
+                        gravity = Gravity.CENTER
+                        textView {
+                            text = "现货品种"
+                            textSizeAuto = 31
+                            textColorInt = R.color.rma_hint_text_color_ccc
+                        }.lparams(wrapContent, wrapContent)
+                    }.lparams(0, autoSize(80),1f)
+
+                    linearLayout {
+                        gravity = Gravity.RIGHT or Gravity.CENTER_VERTICAL
+                        textView {
+                            text = "折算系数"
+                            textSizeAuto = 31
+                            textColorInt = R.color.rma_hint_text_color_ccc
+                        }.lparams(wrapContent, wrapContent)
+                    }.lparams(0, autoSize(80),1f)
+                }.lparams(matchParent, autoSize(80)) {
+                    marginStart = autoSize(102)
+                    marginEnd = autoSize(78)
+                }
+
                 //套保品种-现货品种
                 recyclerView {
                     data.bindOptional(context){

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

@@ -78,7 +78,7 @@ class NewAddSpotCategoryViewHolder(
 
                 textView {
                     data.bindOptional(context) {
-                        text = "品类" + dataIndex.plus(1)
+                        text = "商品" + dataIndex.plus(1)
                     }
 
                     textSizeAuto = 31
@@ -91,7 +91,7 @@ class NewAddSpotCategoryViewHolder(
                     category_edittext = this
                     isEnabled =
                         !(operationType == "4" || operationType == "3" || operationType == "5")
-                    hint = "请输入品类"
+                    hint = "请输入商品名称"
                     textChangedListener {
                         afterTextChanged {
                             if (it.toString().isNotEmpty()) {//修改品类
@@ -123,7 +123,7 @@ class NewAddSpotCategoryViewHolder(
                         !(operationType == "4" || operationType == "3" || operationType == "5")
                     onThrottleFirstClick {
                         if (viewModel.spotModelList.value?.size.toString() == "1"){
-                            ToastUtils.showLong("最少输入一个品类")
+                            ToastUtils.showLong("最少输入一个商品")
                             return@onThrottleFirstClick
                         }
                         viewModel.changeSpotModelList("2",data.value?.id.toString(),value = "")

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

@@ -118,8 +118,8 @@ class NewAddSpotGoodsActivity : BaseActivity<NewAddSpotGoodsViewModel>() {
             viewModel.initSpotGoodsActivity(data)
             selectUnitType.postValue(
                 SelectData(
-                    id = data.data?.goodsunitid ?: "",
-                    value = data.data?.enumdicname ?: ""
+                    id = data.unitid ?: "",
+                    value =  ""
                 )
             )
 //            viewModel.queryWrStandardDetails(data.data?.deliverygoodsid ?: "")
@@ -175,7 +175,7 @@ class NewAddSpotGoodsActivity : BaseActivity<NewAddSpotGoodsViewModel>() {
                             editText {
                                 if (type == "2" || type == "4" || type == "3" || type == "5") {
                                     isEnabled = false
-                                    setText(data.data?.deliverygoodsname)
+                                    setText(data.deliverygoodsname)
                                 } else {
                                     isEnabled = true
                                 }
@@ -211,7 +211,7 @@ class NewAddSpotGoodsActivity : BaseActivity<NewAddSpotGoodsViewModel>() {
                             editText {
                                 if (type == "2" || type == "4" || type == "3" || type == "5") {
                                     isEnabled = false
-                                    setText(data.data?.deliverygoodscode)
+                                    setText(data.deliverygoodscode)
                                 } else {
                                     isEnabled = true
                                 }
@@ -289,7 +289,7 @@ class NewAddSpotGoodsActivity : BaseActivity<NewAddSpotGoodsViewModel>() {
                             textView {
                                 selectUnitType.bindOptional(context) {
                                     if (it?.value.isNullOrEmpty()) {
-                                        text = data.data?.enumdicname
+//                                        text = data.enumdicname
                                         textColorInt = R.color.rma_black_33
                                     } else {
                                         text = it?.value
@@ -490,7 +490,7 @@ class NewAddSpotGoodsActivity : BaseActivity<NewAddSpotGoodsViewModel>() {
                 spotGoodsData.wrstandardid = it.middleGoodsId.toLong()//修改时才加
             }
             spotGoodsData.unitid = it.enumdicnameid.toLong()
-            spotGoodsData.vatrate = it.coefficientwarehouse.toDouble()
+            spotGoodsData.vatrate = it.coefficientwarehouse.toDouble().div(100)
 //            LogUtils.eTag("asdhahsdkjahdjka",spotGoodsData.modelid)
             val wrsconverdetailsList = arrayListOf<ManageServiceMI3.WRSConvertDetailEx>()
             it.middleGoodsList.forEach {

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.XhMiddlergoods
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI3
 import cn.muchinfo.rma.view.MyApplication
@@ -101,39 +102,52 @@ class NewAddSpotGoodsViewModel : BaseViewModel(){
         val newbrandModelList = arrayListOf<NewSpotInfoData>()//品牌列表
         val newspotModelList = arrayListOf<NewSpotInfoData>()//品类列表
         val newmiddlegoodList = arrayListOf<NewSpotInfoData>()//套保品种
-        respData.gmlist?.forEach {//品类列表
+        respData.wdlst?.forEach { data ->//品类列表
+            val newMiddleGoodsList = arrayListOf<NewSpotInfoData>()
+            data.mglst?.forEach {
+                newMiddleGoodsList.add(
+                    NewSpotInfoData(
+                        id =  data.mglst.indexOf(it).plus(1).toString(),
+                        middleGoodsName = it.middlegoodsname ?: "",
+                        value = it.convertratio ?: "",
+                        enumdicname = it.enumdicname ?: "",
+                        enumdicnameid = it.unitid ?: ""
+                    )
+                )
+            }
             newspotModelList.add(
                 NewSpotInfoData(
-                    id = respData.gmlist.indexOf(it).plus(1).toString(),
-                    value = it.wrstandardname ?: "",
-                    enumdicname = it.enumdicname ?: "",
-                    enumdicnameid = it.unitid ?: "",
-                    coefficientwarehouse = it.convertfactor ?: "",
-                    middleGoodsId = it.wrstandardid ?: ""
+                    id = respData.wdlst.indexOf(data).plus(1).toString(),
+                    value = data.wrstandardname ?: "",
+                    enumdicname = data.enumdicname ?: "",
+                    enumdicnameid = data.unitid ?: "",
+                    coefficientwarehouse = data.vatrate ?: "",
+                    middleGoodsId = data.wrstandardid ?: "",
+                    middleGoodsList = newMiddleGoodsList
                 )
             )
         }
-        respData.gblist?.forEach {//品牌列表
+        respData.bdlst?.forEach {data -> //品牌列表
             newbrandModelList.add(
                 NewSpotInfoData(
-                    id = respData.gblist.indexOf(it).plus(1).toString(),
-                    value = it.brandname ?: "",
-                    middleGoodsId = it.brandid ?: ""
-                )
-            )
-        }
-        respData.mgList?.forEach {//套保品种
-            newmiddlegoodList.add(
-                NewSpotInfoData(
-                    id = respData.mgList.indexOf(it).plus(1).toString(),
-                    value = it.convertratio ?: "",
-                    enumdicnameid = it.mg?.goodsunitid ?: "",
-                    middleGoodsId = it.mg?.goodsgroupid ?: "",
-                    middleGoodsName = it.mg?.middlegoodsname ?: "",
-                    enumdicname = it.mg?.enumdicname ?: ""
+                    id = respData.bdlst.indexOf(data).plus(1).toString(),
+                    value = data.brandname ?: "",
+                    middleGoodsId = data.brandid ?: ""
                 )
             )
         }
+//        respData.mgList?.forEach {//套保品种
+//            newmiddlegoodList.add(
+//                NewSpotInfoData(
+//                    id = respData.mgList.indexOf(it).plus(1).toString(),
+//                    value = it.convertratio ?: "",
+//                    enumdicnameid = it.mg?.goodsunitid ?: "",
+//                    middleGoodsId = it.mg?.goodsgroupid ?: "",
+//                    middleGoodsName = it.mg?.middlegoodsname ?: "",
+//                    enumdicname = it.mg?.enumdicname ?: ""
+//                )
+//            )
+//        }
         spotModelcacheList.postValue(newspotModelList)
         brandModelcacheList.postValue(newbrandModelList)
 

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

@@ -181,7 +181,7 @@ class NewInsuredVarietyViewHolder(
                             textColorInt = R.color.rma_black_33
                         }
                     }
-                    hint = "请输入套保系数"
+                    hint = "请输入折算系数"
                     textChangedListener {
                         afterTextChanged {
                             if (it.toString().isNotEmpty()) {

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

@@ -425,7 +425,7 @@ class ToAuditUI(
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(activity).apply {
         verticalLayout {
-            viewModel.queryTitle(Constant.table_mobile_spotcontract,"2")
+            viewModel.queryTitle(Constant.table_mobile_spotadiit_contract_unaduit,"2")
             contractAdapter.setOnContentScrollListener(this@ToAuditUI)
             linearLayout {
                 linearLayout {
@@ -569,7 +569,7 @@ class PerformanceUI(
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(activity).apply {
         verticalLayout {
-            viewModel.queryTitle(Constant.table_mobile_spotcontract,"3")
+            viewModel.queryTitle(Constant.table_mobile_spotadiit_contract_aduited,"3")
             contractAdapter.setOnContentScrollListener(this@PerformanceUI)
             linearLayout {
                 linearLayout {

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

@@ -170,6 +170,28 @@ fun _LinearLayout.contractDetailOneView(data: ContractData) {
             }
         }.lparams(matchParent, autoSize(132))
 
+
+        viewItemUI()
+
+        linearLayout {
+            gravity = Gravity.CENTER_VERTICAL
+            textView {
+                text = "交易主体"
+                textSizeAuto = 31
+                textColorInt = R.color.p_normal_summary_txt_color
+            }.lparams(wrapContent, wrapContent) {
+                marginStart = autoSize(59)
+            }
+
+            textView {
+                text = data.subjectname
+                textColorInt = R.color.rma_black_33
+                textSizeAuto = 31
+            }.lparams(wrapContent, wrapContent) {
+                marginStart = autoSize(80)
+            }
+        }.lparams(matchParent, autoSize(132))
+
         viewItemUI()
 
         linearLayout {
@@ -249,7 +271,7 @@ fun _LinearLayout.contractDetailTwoView(data: ContractData) {
         linearLayout {
             gravity = Gravity.CENTER_VERTICAL
             textView {
-                text = "品        类"
+                text = "商        品"
                 textSizeAuto = 31
                 textColorInt = R.color.p_normal_summary_txt_color
             }.lparams(wrapContent, wrapContent) {
@@ -266,26 +288,6 @@ fun _LinearLayout.contractDetailTwoView(data: ContractData) {
         }.lparams(matchParent, autoSize(132))
 
 
-        viewItemUI()
-
-        linearLayout {
-            gravity = Gravity.CENTER_VERTICAL
-            textView {
-                text = "交易主体"
-                textSizeAuto = 31
-                textColorInt = R.color.p_normal_summary_txt_color
-            }.lparams(wrapContent, wrapContent) {
-                marginStart = autoSize(59)
-            }
-
-            textView {
-                text = data.subjectname
-                textColorInt = R.color.rma_black_33
-                textSizeAuto = 31
-            }.lparams(wrapContent, wrapContent) {
-                marginStart = autoSize(80)
-            }
-        }.lparams(matchParent, autoSize(132))
 
 //        viewItemUI()
 //

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

@@ -438,21 +438,21 @@ class ContractViewModel : BaseViewModel() {
                     "1" -> {
                         val newList = respData?.toArrayList()
                         newList?.sortWith(Comparator { t1, t2 ->
-                            (TimeUtils.string2Millis(t1.updatetime) - TimeUtils.string2Millis(t2.updatetime)).toInt()
+                            (TimeUtils.string2Millis(t2.updatetime) - TimeUtils.string2Millis(t1.updatetime)).toInt()
                         })
                         unSubmitList.postValue(resetContraData(newList ?: arrayListOf()))
                     }
                     "2" -> {
                         val newList = respData?.toArrayList()
                         newList?.sortWith(Comparator { t1, t2 ->
-                            (TimeUtils.string2Millis(t1.audittime) - TimeUtils.string2Millis(t2.audittime)).toInt()
+                            (TimeUtils.string2Millis(t2.updatetime) - TimeUtils.string2Millis(t1.updatetime)).toInt()
                         })
                         toAuditList.postValue(resetContraData(newList ?: arrayListOf()))
                     }
                     "3" -> {
                         val newList = respData?.toArrayList()
                         newList?.sortWith(Comparator { t1, t2 ->
-                            (TimeUtils.string2Millis(t1.updatetime) - TimeUtils.string2Millis(t2.updatetime)).toInt()
+                            (TimeUtils.string2Millis(t2.updatetime) - TimeUtils.string2Millis(t1.updatetime)).toInt()
                         })
                         performanceList.postValue(resetContraData(newList ?: arrayListOf()))
                     }
@@ -541,15 +541,15 @@ class ContractViewModel : BaseViewModel() {
      * @return ArrayList<SelectData>
      */
     fun setSelectGoodsList(): ArrayList<SelectData> {
-        val goodsList = deliveryGoodsDetailsData.value?.mgList
+        val goodsList = deliveryGoodsDetailsData.value?.wdlst
         val newCustomerList = arrayListOf<SelectData>()
-        goodsList?.forEach {
-            it.gplist?.forEach { data ->
-                data.glist?.forEach { res ->
-                    newCustomerList.add(SelectData(id = res.goodsid.toString(), value = res.goodsname ?: ""))
-                }
-            }
-        }
+//        goodsList?.forEach {
+//            it.gplist?.forEach { data ->
+//                data.glist?.forEach { res ->
+//                    newCustomerList.add(SelectData(id = res.goodsid.toString(), value = res.goodsname ?: ""))
+//                }
+//            }
+//        }
         return newCustomerList
     }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/hedge/HedgePlanViewModel.kt

@@ -248,8 +248,8 @@ class HedgePlanViewModel : BaseViewModel() {
      */
     fun selectWrStandardModel(data: DeliveryGoodsDetailData): ArrayList<SelectData> {
         val wrstandardModel = arrayListOf<SelectData>()
-        data.gmlist?.forEach {
-            wrstandardModel.add(SelectData(id = it.wrstandardid ?: "", value = it.wrstandardname ?: "",convertfactor = it.convertfactor ?: "",enumdicname = it.enumdicname ?: ""))
+        data.wdlst?.forEach {
+            wrstandardModel.add(SelectData(id = it.wrstandardid ?: "", value = it.wrstandardname ?: "",convertfactor = it.vatrate ?: "",enumdicname = it.enumdicname ?: ""))
         }
         return wrstandardModel
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventorymanager/InventoryManagerViewModel.kt

@@ -392,12 +392,12 @@ class InventoryManagerViewModel : BaseViewModel() {
      * @param data DeliveryGoodsDetailData
      */
     fun setWrStandardAndBrand(data: DeliveryGoodsDetailData){
-        data.gmlist?.let {
+        data.wdlst?.let {
             if (it.size == 1){
                 selectWrStandModel.postValue(SelectData(id = it.get(0).wrstandardid ?: "",value = it.get(0).wrstandardname ?: "",enumdicname = it.get(0).enumdicname ?: ""))
             }
         }
-        data.gblist?.let {
+        data.bdlst?.let {
             if (it.size == 1){
                 selectWrStandBrand.postValue(SelectData(id = it.get(0).brandid ?: "",value = it.get(0).brandname ?: ""))
             }
@@ -412,7 +412,7 @@ class InventoryManagerViewModel : BaseViewModel() {
      */
     fun selectWrStandardModel(data: DeliveryGoodsDetailData): ArrayList<SelectData> {
         val wrstandardModel = arrayListOf<SelectData>()
-        data.gmlist?.forEach {
+        data.wdlst?.forEach {
             wrstandardModel.add(SelectData(id = it.wrstandardid ?: "", value = it.wrstandardname ?: "",enumdicname = it.enumdicname ?: ""))
         }
         return wrstandardModel
@@ -425,7 +425,7 @@ class InventoryManagerViewModel : BaseViewModel() {
      */
     fun selectWrStandardBrand(data: DeliveryGoodsDetailData): ArrayList<SelectData> {
         val wrstandardBrand = arrayListOf<SelectData>()
-        data.gblist?.forEach {
+        data.bdlst?.forEach {
             wrstandardBrand.add(SelectData(id = it.brandid ?: "", value = it.brandname ?: ""))
         }
         return wrstandardBrand

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/registration/RegistrationViewModel.kt

@@ -163,7 +163,7 @@ class RegistrationViewModel : BaseViewModel(){
      */
     fun selectWrStandardModel(data: DeliveryGoodsDetailData): ArrayList<SelectData> {
         val wrstandardModel = arrayListOf<SelectData>()
-        data.gmlist?.forEach {
+        data.wdlst?.forEach {
             wrstandardModel.add(SelectData(id = it.wrstandardid ?: "", value = it.wrstandardname ?: ""))
         }
         return wrstandardModel
@@ -176,7 +176,7 @@ class RegistrationViewModel : BaseViewModel(){
      */
     fun selectWrStandardBrand(data: DeliveryGoodsDetailData): ArrayList<SelectData> {
         val wrstandardBrand = arrayListOf<SelectData>()
-        data.gblist?.forEach {
+        data.bdlst?.forEach {
             wrstandardBrand.add(SelectData(id = it.brandid ?: "", value = it.brandname ?: ""))
         }
         return wrstandardBrand

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/registration/WarehouseRegistrationActivity.kt

@@ -54,6 +54,12 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
 
     lateinit var inventory_quantity: EditText
 
+
+    fun initData(){
+        selectWrStandModel.postValue(SelectData(id = data.wrstandardid ?: "",value = data.wrstandardname ?: ""))
+        selectWrStandBrand.postValue(SelectData(id = data.spotgoodsbrandid ?: "",value = data.brandname ?: ""))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
@@ -65,6 +71,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
             )//查询当前合同已登记信息
             viewModel.queryWarehouseInfo()//查询可选择的仓库信息
             viewModel.queryWrStandardDetail(data.deliverygoodsid ?: "")
+
             topBar {
                 commonLeftButton()
                 commonTitle {
@@ -590,7 +597,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                 textColorInt = R.color.rma_black_33
                 textSizeAuto = 29
                 text =
-                    data.modelname + "+" + data.brandname + "(" + data.totalqty + enumdicname + ")"
+                    data.wrstandardname + "+" + data.brandname + "(" + data.totalqty + enumdicname + ")"
             }.lparams(wrapContent, wrapContent) {
                 marginEnd = autoSize(47)
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/rolemanagement/AddRoleSetActivity.kt

@@ -11,6 +11,7 @@ import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.AccMgrRoleData
 import cn.muchinfo.rma.global.data.AccMgrRoleMenuData
 import cn.muchinfo.rma.lifecycle.bindOptional
+import cn.muchinfo.rma.protobuf.protoclasses.ManageServiceMI2
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.autoWidget.treeview.TreeNode
 import cn.muchinfo.rma.view.autoWidget.treeview.TreeView
@@ -200,19 +201,19 @@ class AddRoleSetActivity : BaseActivity<RoleSetViewModel>() {
                     textView {
                         onThrottleFirstClick {
                             getSelectedNodes()
-//                            if (check().not()){
-//                                return@onThrottleFirstClick
-//                            }
-//
-//                            if (type == "1"){
-//                                viewModel.ManagerRoleOperateReq(operatetype = 1,rolename = role_name_edittext.text.toString(),memberfuncmenus = viewModel.getUpdateMenuDataList()){
-//                                    finish()
-//                                }
-//                            }else if (type == "2"){
-//                                viewModel.ManagerRoleOperateReq(autoid = data.autoid?.toLong() ?: 0,operatetype = 2,rolename = role_name_edittext.text.toString(),memberfuncmenus = viewModel.getUpdateMenuDataList()){
-//                                    finish()
-//                                }
-//                            }
+                            if (check().not()){
+                                return@onThrottleFirstClick
+                            }
+
+                            if (type == "1"){
+                                viewModel.ManagerRoleOperateReq(operatetype = 1,rolename = role_name_edittext.text.toString(),memberfuncmenus = getSelectedNodes()){
+                                    finish()
+                                }
+                            }else if (type == "2"){
+                                viewModel.ManagerRoleOperateReq(autoid = data.autoid?.toLong() ?: 0,operatetype = 2,rolename = role_name_edittext.text.toString(),memberfuncmenus = getSelectedNodes()){
+                                    finish()
+                                }
+                            }
                         }
                         gravity = Gravity.CENTER
                         backgroundResource = R.mipmap.rma_submit_bg
@@ -230,14 +231,21 @@ class AddRoleSetActivity : BaseActivity<RoleSetViewModel>() {
         }
     }
 
-    private fun getSelectedNodes(): String? {
-        val stringBuilder = StringBuilder("You have selected: ")
+    private fun getSelectedNodes(): List<ManageServiceMI2.MemberFuncMenu> {
+        val updateMenuList = arrayListOf<ManageServiceMI2.MemberFuncMenu>()
+
+        val stringBuilder = StringBuilder("")
         val selectedNodes = treeView!!.selectedNodes
         for (i in selectedNodes.indices) {
             stringBuilder.append(selectedNodes[i].code.toString() + ",")
         }
-        LogUtils.eTag("selectcode",stringBuilder.toString())
-        return stringBuilder.toString()
+        stringBuilder.split(",").forEach {
+            val updataMenuData = ManageServiceMI2.MemberFuncMenu.newBuilder()
+            updataMenuData.resourcecode = it
+            updateMenuList.add(updataMenuData.build())
+        }
+
+        return updateMenuList
     }
 
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/spotaudit/SpotAuditActivity.kt

@@ -107,6 +107,7 @@ class SpotAuditActivity : BaseActivity<SpotAuditViewModel>(){
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        initMenuData()
         verticalLayout {
             topBar {
                 commonLeftButton()

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/spotmarket/SpotMarketPriceViewModel.kt

@@ -250,7 +250,7 @@ class SpotMarketPriceViewModel : BaseViewModel(){
      * @return List<SelectData>
      */
     fun getGoodsWrstandardSelectList() : List<SelectData>{
-        val oldList = deliveryGoodsDetailsData.value?.gmlist
+        val oldList = deliveryGoodsDetailsData.value?.wdlst
         val resultDataList = arrayListOf<SelectData>()
         oldList?.forEach {
             resultDataList.add(SelectData(id = it.wrstandardid ?: "",value = it.wrstandardname ?: ""))
@@ -263,7 +263,7 @@ class SpotMarketPriceViewModel : BaseViewModel(){
      * @return List<SelectData>
      */
     fun getGoodsBrandSelectList() : List<SelectData>{
-        val oldList = deliveryGoodsDetailsData.value?.gblist
+        val oldList = deliveryGoodsDetailsData.value?.bdlst
         val resultDataList = arrayListOf<SelectData>()
         oldList?.forEach {
             resultDataList.add(SelectData(id = it.brandid ?: "",value = it.brandname ?: ""))

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

@@ -53,7 +53,7 @@ class OperationTradeActivity : BaseActivity<TradeMainViewModel>(){
                 }
 
                 textView {
-                    text = "商品规格"
+                    text = "名称"
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent) {

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

@@ -42,7 +42,7 @@ class TradeNormalViewHolder(private val activity : AppCompatActivity,private val
                     gravity = Gravity.CENTER_VERTICAL
                     textView {
                         data.bindOptional(context){
-                            text = it?.subjectid
+                            text = dataIndex.plus(1).toString()
                         }
                         textSizeAuto = 31
                         textColorInt = R.color.rma_black_33
@@ -76,11 +76,18 @@ class TradeNormalViewHolder(private val activity : AppCompatActivity,private val
                 emptyView()
 
                 textView {
-                    if (type == "1"){
-                        visibility = View.VISIBLE
-                    }else{
-                        visibility = View.GONE
+                    data.bindOptional(context){
+                        if (it?.canmodify == "0"){//是否可修改 - 0:否 1:是
+                            visibility = View.GONE
+                        }else{
+                            if (type == "1"){
+                                visibility = View.VISIBLE
+                            }else{
+                                visibility = View.GONE
+                            }
+                        }
                     }
+
                     onThrottleFirstClick {
                         val intent = Intent()
                         intent.putExtra("type", "2")
@@ -106,7 +113,7 @@ class TradeNormalViewHolder(private val activity : AppCompatActivity,private val
                     onThrottleFirstClick {
                         activity.createWarningDialog {
                             setTitle("温馨提示")
-                            setMessage("是否确认停用交易主体" + "" + "？")
+                            setMessage("是否确认停用交易主体" + data.value?.subjectname + "？")
                             addAction("取消") { dialog, _ ->
                                 dialog.dismiss()
                             }
@@ -135,7 +142,7 @@ class TradeNormalViewHolder(private val activity : AppCompatActivity,private val
                     onThrottleFirstClick {
                         activity.createWarningDialog {
                             setTitle("温馨提示")
-                            setMessage("是否确认恢复交易主体" + "" + "？")
+                            setMessage("是否确认恢复交易主体" + data.value?.subjectname + "？")
                             addAction("取消") { dialog, _ ->
                                 dialog.dismiss()
                             }

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

@@ -37,7 +37,7 @@ class SpotBuyUnSubmitUI(
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(activity).apply {
         verticalLayout {
-            viewModel.queryContractTitle(Constant.table_mobile_spotcontract,"1")
+            viewModel.queryContractTitle(Constant.table_mobile_spotcontract_new,"1")
             contractAdapter.setOnContentScrollListener(this@SpotBuyUnSubmitUI)
             linearLayout {
                 linearLayout {
@@ -185,7 +185,7 @@ class SpotBuyFinishUI(
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(activity).apply {
         verticalLayout {
-            viewModel.queryContractTitle(Constant.table_mobile_spotcontract,"4")
+            viewModel.queryContractTitle(Constant.table_mobile_spotcontract_complete,"4")
             contractAdapter.setOnContentScrollListener(this@SpotBuyFinishUI)
             linearLayout {
                 linearLayout {

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

@@ -1,6 +1,7 @@
 package cn.muchinfo.rma.view.base.report
 
 import android.os.Bundle
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,6 +13,8 @@ import cn.muchinfo.rma.global.GlobalDataCollection
 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.home.reportquery.*
 import cn.muchinfo.rma.view.base.purchasesale.PurchaseSaleFragment
@@ -20,12 +23,9 @@ import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
 import com.qmuiteam.qmui.widget.tab.QMUITabSegment
 import mtp.polymer.com.autowidget.dialog.createLoadingDialog
-import org.jetbrains.anko._FrameLayout
-import org.jetbrains.anko.matchParent
+import org.jetbrains.anko.*
 import org.jetbrains.anko.support.v4.UI
 import org.jetbrains.anko.support.v4.viewPager
-import org.jetbrains.anko.verticalLayout
-import org.jetbrains.anko.view
 
 /**
  * 报表fragment
@@ -135,8 +135,34 @@ class ReportFragment : BaseFragment<ReportQueryViewModel>(){
         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.segtabment_bg_color)

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

@@ -39,7 +39,7 @@ class SpotSellUnSubmitUI(
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(activity).apply {
         verticalLayout {
-            viewModel.queryContractTitle(Constant.table_mobile_spotcontract,"1")
+            viewModel.queryContractTitle(Constant.table_mobile_spotcontract_new,"1")
             contractAdapter.setOnContentScrollListener(this@SpotSellUnSubmitUI)
             linearLayout {
                 linearLayout {
@@ -187,7 +187,7 @@ class SpotSellFinishUI(
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(activity).apply {
         verticalLayout {
-            viewModel.queryContractTitle(Constant.table_mobile_spotcontract,"4")
+            viewModel.queryContractTitle(Constant.table_mobile_spotcontract_complete,"4")
             contractAdapter.setOnContentScrollListener(this@SpotSellFinishUI)
             linearLayout {
                 linearLayout {

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

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.view.base.spot
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -12,14 +13,13 @@ 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.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseFragment
+import cn.muchinfo.rma.view.base.home.commodity.newspot.NewAddSpotGoodsActivity
 import cn.muchinfo.rma.view.base.procurement.ProcurementFragment
 import cn.muchinfo.rma.view.base.purchasesale.PurchaseSaleFragment
 import cn.muchinfo.rma.view.base.sale.SaleFragment
+import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.ConvertUtils
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.tab.QMUITabIndicator
@@ -119,7 +119,12 @@ class SpotFragment : BaseFragment<SpotViewModel>(){
                     }
 
                     imageView {
-                        visibility = View.GONE
+                         onThrottleFirstClick {
+                             val intent = Intent()
+                             intent.putExtra("type", "1")
+                             intent.setClass(context, NewAddSpotGoodsActivity::class.java)
+                             ActivityUtils.startActivity(intent)
+                         }
                         imageResource = R.mipmap.rma_account_add
                     }.lparams(autoSize(45), autoSize(45)) {
                         marginStart = autoSize(32)