风险管理5月17日提交代码-liu.bolan

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

@@ -28,6 +28,7 @@ object SpotAdapter {
         WRStandardID : Long = 0,
         SpotGoodsBrandID : Long = 0,
         SpotGoodsPrice : Double = 0.0,
+        CurrencyID  : Long = 0,
         OperateType : Int
     ) : Packet50{
         val builder = ManageServiceMI2.ErmcpSpotGoodsPriceReq.newBuilder()
@@ -47,7 +48,7 @@ object SpotAdapter {
             builder.spotGoodsPrice = SpotGoodsPrice
         }
         builder.operateType = OperateType
-        builder.currencyID = 1
+        builder.currencyID = CurrencyID
         builder.tradeDate = TimeUtils.getNowString(SimpleDateFormat("yyyyMMdd"))
         builder.operateID = loginInfo.loginID
         builder.operateSrc = 2

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

@@ -87,6 +87,7 @@ class SpotManager {
         WRStandardID : Long = 0,
         SpotGoodsBrandID : Long = 0,
         SpotGoodsPrice : Double,
+        CurrencyID  : Long = 0,
         OperateType : Int,
         callback: (isCompleted: Boolean, err: Error?) -> Unit
     ){
@@ -96,7 +97,7 @@ class SpotManager {
         }
 
         val reqPacket = SpotAdapter.getErmcpSpotGoodsPriceReqInfo(
-            DeliveryGoodsID, WRStandardID, SpotGoodsBrandID, SpotGoodsPrice, OperateType
+            DeliveryGoodsID, WRStandardID, SpotGoodsBrandID, SpotGoodsPrice,CurrencyID, OperateType
         )
 
         tradeSocketManager.send(

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

@@ -132,16 +132,16 @@ fun String.inouttype() : String{
     }
     var str = ""
     when {
-        this == "1" -> {
+        this == "5" -> {
             str = "采购入库"
         }
-        this == "2" -> {
+        this == "6" -> {
             str = "销售出库"
         }
-        this == "3" -> {
+        this == "7" -> {
             str = "生产入库"
         }
-        this == "4" -> {
+        this == "8" -> {
             str = "生产出库"
         }
     }

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

@@ -9,9 +9,9 @@ object Constant {
 //    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
 //    const val baseurl = "http://192.168.30.125:8080/cfg?key=test_125"
 //    const val baseurl = "http://192.168.31.114:8080/cfg?key=test_114" // shenzhen01  123123
-//    const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩
+    const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩
 //      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐
-    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
+//    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"
 //    const val baseurl = "http://192.168.31.174:8080/cfg?key=test_174"// 邓工
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/holds/HoldViewModel.kt

@@ -20,6 +20,7 @@ import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.app.FutureConstent
+import cn.muchinfo.rma.view.base.chart.ChartActivity
 import cn.muchinfo.rma.view.base.future.costs.OrderDetailData
 import cn.muchinfo.rma.view.base.future.orderDeatails.OrderDetail
 import cn.muchinfo.rma.view.eventbus.EventConstent
@@ -297,7 +298,14 @@ class HoldViewModel : BaseViewModel() {
 
             /** 图表 **/
             holder.id_chart?.onThrottleFirstClick {
-
+                val intent = Intent()
+                intent.putExtra("outGoodsCode", list?.get(position)?.outgoodscode)
+                intent.putExtra("goodsCode", list?.get(position)?.goodscode)
+                intent.putExtra("goodsId", list?.get(position)?.goodsid)
+//                intent.putExtra("goodsGroupId", list?.get(position)?.goodsgroupid)
+                intent.putExtra("marketId", list?.get(position)?.marketid)
+                intent.setClass(context!!, ChartActivity::class.java)
+                ActivityUtils.startActivity(intent)
             }
 
             /** 详情 **/

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

@@ -65,7 +65,7 @@ class NewCommodityInformationActivity : BaseActivity<NewCommodityInformationView
             uiList.add(newSpotVarietiesUI.root)
         }
         if (GlobalDataCollection.instance?.getSecondLevelMenu(firstCode = "client_deliverygoods",secondCode = "client_deliverygoods_hedge") == true){
-            newTabsArray.add("现货品种")
+            newTabsArray.add("套保品种")
             uiList.add(newHedgeSpeciesUI.root)
         }
         newPagerAdapter = object : PagerAdapter() {
@@ -96,7 +96,6 @@ class NewCommodityInformationActivity : BaseActivity<NewCommodityInformationView
         super.onCreate(savedInstanceState)
         initMenuData()
         verticalLayout {
-
             linearLayout {
                 background = resources.getDrawable(R.color.main_title_bg_color)
                 gravity = Gravity.CENTER_VERTICAL

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

@@ -1647,7 +1647,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
     private fun getContractInfo(): SpotContractInfo {
         val contractInfo = SpotContractInfo()
         val userid = GlobalDataCollection.instance?.loginRsp?.userID ?: 0
-        if (contractNo.text.toString().isNotEmpty()) {
+        if (contractNo.text.toString().isNotEmpty()) {//合同编号
             contractInfo.ContractNo = contractNo.text.toString()
         }
         contractInfo.ContractType = contractType.value?.id?.toInt()!!

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventoryaudit/InventoryAuditActivity.kt

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

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventoryaudit/ProductionInventoryActivity.kt

@@ -144,7 +144,7 @@ class ProductionInventoryActivity : BaseActivity<InventoryAuditViewModel>(){
                                 linearLayout {
                                     emptyView()
                                     textView {
-                                        text = data.warehousename
+                                        text = data.deliverygoodsname
                                         textSizeAuto = 29
                                         textColorInt = R.color.rma_black_33
                                     }.lparams(wrapContent, wrapContent){
@@ -170,7 +170,7 @@ class ProductionInventoryActivity : BaseActivity<InventoryAuditViewModel>(){
                                 linearLayout {
                                     emptyView()
                                     textView {
-                                        text = data.modelname
+                                        text = data.wrstandardname
                                         textSizeAuto = 29
                                         textColorInt = R.color.rma_black_33
                                     }.lparams(wrapContent, wrapContent)
@@ -473,7 +473,7 @@ class ProductionInventoryActivity : BaseActivity<InventoryAuditViewModel>(){
                                 background = resources.getDrawable(R.drawable.rma_item_click_bg)
                                 editText {
                                     ramask_edittext = this
-                                    setPadding(0, 10, 0, 0)
+                                    setPadding(20, 10, 0, 0)
                                     hint = "请输入审核意见"
                                     gravity = Gravity.LEFT or Gravity.TOP
                                     background = null
@@ -484,8 +484,9 @@ class ProductionInventoryActivity : BaseActivity<InventoryAuditViewModel>(){
                                 }.lparams(matchParent, matchParent) {
 
                                 }
-                            }.lparams(autoSize(432), autoSize(220)) {
-                                marginStart = autoSize(138)
+                            }.lparams(matchParent, autoSize(220)) {
+                                marginEnd = autoSize(36)
+                                marginStart = autoSize(59)
                             }
                         }.lparams(matchParent, autoSize(220)){
                             topMargin = autoSize(50)

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

@@ -79,12 +79,15 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
      * 页面数据的初始化
      */
     fun init() {
-        roleTypeSelectData.postValue(
-            SelectData(
-                id = data1.roletype ?: "",
-                value = data1.rolename ?: ""
+        viewModel.queryAccMgrRole()
+        if (type != "1"){
+            roleTypeSelectData.postValue(
+                SelectData(
+                    id = data1.roletype ?: "",
+                    value = data1.rolename ?: ""
+                )
             )
-        )
+        }
     }
 
 
@@ -99,7 +102,7 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                 commonLeftButton()
                 commonTitle {
                     if (type == "1"){
-                        text = "新增角色"
+                        text = "新增管理员"
                     }else if (type == "2"){
                         text = "角色详情"
                     }else if (type == "3"){
@@ -117,7 +120,6 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                 gravity = Gravity.CENTER_VERTICAL
 
                 textView {
-                    visibility = View.INVISIBLE
                     text = "*"
                     textColorInt = R.color.rma_star_color
                     textSizeAuto = 31
@@ -133,7 +135,7 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                 }
 
                 editText {
-                    isEnabled = type == "1" || type == "3"
+                    isEnabled = type == "1"//登录账号只能在新增时修改
                     if (type != "1"){
                         setText(data1.rolename)
                     }
@@ -157,7 +159,6 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                 gravity = Gravity.CENTER_VERTICAL
 
                 textView {
-                    visibility = View.INVISIBLE
                     text = "*"
                     textColorInt = R.color.rma_star_color
                     textSizeAuto = 31
@@ -193,11 +194,15 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
             itemView()
 
             linearLayout {
+                if (type == "1"){
+                    visibility = View.VISIBLE
+                }else{
+                    visibility = View.GONE
+                }
                 background = resources.getDrawable(R.color.white)
                 gravity = Gravity.CENTER_VERTICAL
 
                 textView {
-                    visibility = View.INVISIBLE
                     text = "*"
                     textColorInt = R.color.rma_star_color
                     textSizeAuto = 31
@@ -239,7 +244,6 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                 gravity = Gravity.CENTER_VERTICAL
 
                 textView {
-                    visibility = View.INVISIBLE
                     text = "*"
                     textColorInt = R.color.rma_star_color
                     textSizeAuto = 31
@@ -262,7 +266,7 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                     }else{
                         setText(data1.mobile)
                     }
-                    hint = "非必填，用于找回密码"
+                    hint = "可用于找回密码"
                     background = null
                     inputType = EditorInfo.TYPE_CLASS_PHONE
 //                    setDecimalInputType()
@@ -283,12 +287,11 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                     if (type == "2"){
                         return@onThrottleFirstClick
                     }
-                    creatBottomSheetDialog("请选择合同类型", getSelectDataList()) {
+                    creatBottomSheetDialog("请选择账户权限", getSelectDataList()) {
                         roleTypeSelectData.postValue(this)
                     }
                 }
                 textView {
-                    visibility = View.INVISIBLE
                     text = "*"
                     textColorInt = R.color.rma_star_color
                     textSizeAuto = 31
@@ -297,7 +300,7 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                 }
 
                 textView {
-                    text = "账户角色"
+                    text = "账户权限"
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent) {
@@ -319,9 +322,9 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
 
                 imageView {
                     if (type == "1"){
-                        visibility = View.GONE
-                    }else{
                         visibility = View.VISIBLE
+                    }else{
+                        visibility = View.GONE
                     }
                     imageResource = R.mipmap.rma_more
                 }.lparams(autoSize(36), autoSize(36)) {
@@ -356,6 +359,8 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
                         }else if (type == "3"){//修改
                             viewModel.LoginaccountOperateReq(
                                 operatetype = 4,
+                                userid = data1.userid?.toLong() ?: 0,
+                                loginid = data1.loginid?.toLong() ?: 0,
                                 logincode = login_account.text.toString(),
                                 accountname = account_name.text.toString(),
                                 password = login_password.text.toString(),
@@ -384,12 +389,9 @@ class AddRoleActivity : BaseActivity<RoleSetViewModel>() {
      */
     fun getSelectDataList(): List<SelectData> {
         val selectList = arrayListOf<SelectData>()
-//        seletType.forEach {
-//            selectList.add(SelectData(id = it.roleid ?: "", value = it.rolename ?: ""))
-//        }
-        selectList.add(SelectData(id = "22",value = "业务员"))
-        selectList.add(SelectData(id = "23",value = "跟单员"))
-//        selectList.add(SelectData(id = "24",value = "交易员"))
+        viewModel.roleSetDataList.value?.forEach {
+            selectList.add(SelectData(id = it.autoid ?: "",value = it.rolename ?: ""))
+        }
         return selectList
     }
 

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

@@ -46,7 +46,7 @@ class RoleSetActivity : BaseActivity<RoleSetViewModel>() {
             topBar {
                 commonLeftButton()
                 commonTitle {
-                    text = "角色设置"
+                    text = "权限设置"
                 }
                 // 新增角色设置
                 commonMenuButton(R.mipmap.add_new) {

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

@@ -52,6 +52,9 @@ class AddSpotMarketPriceActivity : BaseActivity<SpotMarketPriceViewModel>(){
      */
     val selectBrand : MutableLiveData<SelectData> = MutableLiveData()
 
+    /** 选择的币种 ***/
+    val selelctCurreryId : MutableLiveData<SelectData> = MutableLiveData()
+
     /**
      * 输入的现货价格
      */
@@ -61,9 +64,11 @@ class AddSpotMarketPriceActivity : BaseActivity<SpotMarketPriceViewModel>(){
 
     fun initData(){
         if (type == "2"){
+            viewModel.queryDeliveryGoodsDetails(deliverygoodsid = data.deliverygoodsid ?: "")
             selectDeliveryGoods.postValue(SelectData(id = data.deliverygoodsid ?: "",value = data?.deliverygoodsname ?: ""))
             selectCategory.postValue(SelectData(id = data.wrstandardid ?: "",value = data.wrstandardname ?: ""))
             selectBrand.postValue(SelectData(id = data.spotgoodsbrandid ?: "",value = data.brandname ?: ""))
+            selelctCurreryId.postValue(SelectData(id = data.currencyid ?: "",value = ""))
         }
         viewModel.queryDeliveryGoods()
 //        viewModel.queryGoodsWrstandard()
@@ -258,6 +263,51 @@ class AddSpotMarketPriceActivity : BaseActivity<SpotMarketPriceViewModel>(){
             linearLayout {
                 background = resources.getDrawable(R.color.white)
                 gravity = Gravity.CENTER_VERTICAL
+                onThrottleFirstClick {
+                    creatBottomSheetDialog("请选择结算币种", viewModel.getSelectCurreryIdData()) {
+                        selelctCurreryId.postValue(this)
+                    }
+                }
+                textView {
+                    text = "*"
+                    textColorInt = R.color.rma_star_color
+                    textSizeAuto = 31
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(37)
+                }
+
+                textView {
+                    text = "结算币种"
+                    textSizeAuto = 31
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(10)
+                }
+
+                textView {
+                    selelctCurreryId.bindOptional(context) {
+                        text = it?.value
+                        textColorInt = R.color.rma_black_33
+                    }
+                    textSizeAuto = 31
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(80)
+                }
+
+                emptyView()
+
+                imageView {
+                    imageResource = R.mipmap.rma_more
+                }.lparams(autoSize(36), autoSize(36)) {
+                    marginEnd = autoSize(25)
+                }
+            }.lparams(matchParent, autoSize(132))
+
+            itemView()
+
+            linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
 
                 textView {
                     text = "*"
@@ -323,6 +373,7 @@ class AddSpotMarketPriceActivity : BaseActivity<SpotMarketPriceViewModel>(){
                             WRStandardID = selectCategory.value?.id?.toLong() ?: 0,
                             SpotGoodsBrandID = selectBrand.value?.id?.toLong() ?: 0,
                             SpotGoodsPrice = spot_price.text.toString().toDouble(),
+                            CurrencyID = selelctCurreryId.value?.id?.toLong() ?: 0,
                             OperateType = operateType
                         ){
                             finish()
@@ -356,6 +407,11 @@ class AddSpotMarketPriceActivity : BaseActivity<SpotMarketPriceViewModel>(){
                     return false
                 }
             }
+
+            if (selelctCurreryId.value?.id.isNullOrEmpty()){
+                ToastUtils.showLong("请选择结算币种")
+                return false
+            }
         }
 
         if (spot_price.text.toString().isNullOrEmpty()){

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

@@ -133,6 +133,7 @@ class SpotMarketPriceViewModel : BaseViewModel(){
         WRStandardID : Long = 0,
         SpotGoodsBrandID : Long = 0,
         SpotGoodsPrice : Double = 0.0,
+        CurrencyID : Long = 0,
         OperateType : Int,
         isSuccess: (isCompleted: Boolean) -> Unit
     ){
@@ -143,6 +144,7 @@ class SpotMarketPriceViewModel : BaseViewModel(){
                 WRStandardID = WRStandardID,
                 SpotGoodsBrandID = SpotGoodsBrandID,
                 SpotGoodsPrice = SpotGoodsPrice,
+                CurrencyID = CurrencyID,
                 OperateType = OperateType
             ) { isCompleted, err ->
                 if (isCompleted) {
@@ -269,4 +271,15 @@ class SpotMarketPriceViewModel : BaseViewModel(){
         return resultDataList
     }
 
+    /**
+     * 获取可供选择的币种信息
+     */
+    fun getSelectCurreryIdData() : List<SelectData>{
+        val selectDataList = arrayListOf<SelectData>()
+        GlobalDataCollection.instance?.getEnumList(enumCode = "paycurrency")?.forEach {
+            selectDataList.add(SelectData(id = it.enumdicid.toString(),value = it.enumdicname))
+        }
+        return selectDataList
+    }
+
 }

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

@@ -15,6 +15,7 @@ import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
+import cn.muchinfo.rma.view.base.chart.ChartActivity
 import cn.muchinfo.rma.view.base.future.entrusts.EntrustDetailsActivity
 import cn.muchinfo.rma.view.base.future.enums.CustomerEnums
 import cn.muchinfo.rma.view.base.home.contract.emptyView
@@ -172,6 +173,16 @@ class EntrustHistoryViewHolder(
                     }else{
                         visibility = View.GONE
                     }
+                    onThrottleFirstClick {
+                        val intent = Intent()
+//                        intent.putExtra("outGoodsCode", data.value?.outgoodscode)
+                        intent.putExtra("goodsCode", data.value?.goodscode)
+                        intent.putExtra("goodsId", data.value?.goodsid)
+//                intent.putExtra("goodsGroupId", list?.get(position)?.goodsgroupid)
+                        intent.putExtra("marketId", data.value?.marketid)
+                        intent.setClass(context!!, ChartActivity::class.java)
+                        ActivityUtils.startActivity(intent)
+                    }
                     backgroundResource = R.drawable.rma_item_click_bg
                     gravity = Gravity.CENTER
                     text = "图表"

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

@@ -14,6 +14,7 @@ import cn.muchinfo.rma.view.autoWidget.onThrottleFirstClick
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
+import cn.muchinfo.rma.view.base.chart.ChartActivity
 import cn.muchinfo.rma.view.base.future.deals.DealDetailsActivity
 import cn.muchinfo.rma.view.base.home.contract.emptyView
 import com.blankj.utilcode.util.ActivityUtils
@@ -145,6 +146,16 @@ class TradingHistoryViewHolder(
                     }else{
                         visibility = View.GONE
                     }
+                    onThrottleFirstClick {
+                        val intent = Intent()
+//                        intent.putExtra("outGoodsCode", data.value?.outgoodscode)
+                        intent.putExtra("goodsCode", data.value?.goodscode)
+                        intent.putExtra("goodsId", data.value?.goodsid)
+//                intent.putExtra("goodsGroupId", list?.get(position)?.goodsgroupid)
+                        intent.putExtra("marketId", data.value?.marketid)
+                        intent.setClass(context!!, ChartActivity::class.java)
+                        ActivityUtils.startActivity(intent)
+                    }
                     backgroundResource = R.drawable.rma_item_click_bg
                     gravity = Gravity.CENTER
                     text = "图表"