3月26日修改bug-liubolan

RMA/app/src/main/AndroidManifest.xml

@@ -179,6 +179,8 @@
         <activity android:name=".view.base.future.orderDeatails.OrderDetail"/>
 
         <activity android:name="mtp.polymer.com.information_management.hnstocks.message.MessageDetailsActivity"/>
+
+        <activity android:name=".view.base.home.set.SettingActivity"/>
     </application>
 
 </manifest>

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

@@ -120,8 +120,8 @@ class ExposureViewModel : BaseViewModel(){
             val newRightData = arrayListOf<String>()
             newRightData.add(it.wrstandardname + "\n" + it.qty + it.enumdicname)
             newRightData.add(NumberUtils.roundNum(it.changeQty,2) + it.enumdicname)
-            newRightData.add(it.relateNo ?: "")
-            newRightData.add(NumberUtils.roundNum(it.convertfactor,2) + "\n" + NumberUtils.roundNum(it.convertratio,2))
+            newRightData.add(NumberUtils.roundNum(it.relateNo ?: "",2))
+            newRightData.add(NumberUtils.roundNum(it.convertfactor,2) + "\n" + it.convertratio)
             val newData = it.copy(rightData = newRightData)
             newList.add(newData)
         }

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

@@ -20,7 +20,6 @@ import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
 import cn.muchinfo.rma.global.data.futureOrders.FutureHoldData
 import cn.muchinfo.rma.global.database.AppDatabase
-import cn.muchinfo.rma.global.database.DataBase
 import cn.muchinfo.rma.global.room.Builder
 import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.lifecycle.bindOptional
@@ -39,7 +38,6 @@ import cn.muchinfo.rma.view.eventbus.MessageEvent
 import cn.muchinfo.rma.view.eventbus.QuoteMessageEvent
 import cn.muchinfo.rma.view.eventbus.TradeMessageEvent
 import com.blankj.utilcode.util.ConvertUtils
-import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.TimeUtils
 import com.blankj.utilcode.util.ToastUtils
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
@@ -432,10 +430,10 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
                                     numberEditText {
                                         priceInputEdittext = this
                                         setOnTextChangeListener { view, value ->
-//                                            if (value.isNotEmpty()){
-//                                                viewModel.priceOrderType.postValue(FutureConstent.eOrderPriceSelectType_BidPrice)
-//
-//                                            }
+                                            if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_BidPrice){
+                                                buy_more_text.setText(value)
+                                                sort_selling_text.setText(value)
+                                            }
                                         }
                                         //拿到商品信息后对输入框进行初始化
                                         goodsInfoData.bindOptional(context) {
@@ -768,7 +766,7 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
                                                 } else if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_Opposite) {//对手价/买多取卖一价
                                                     setText(it?.ask.toString())
                                                 } else if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_OppositeOne) {//超价1/买多取卖一价(参照ios)
-                                                    setText(it?.ask.toString())
+                                                    setText(setExceedPrice(it?.ask ?:0.0,0))
                                                 } else if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_BidPrice) {//指定价就是限价--限价只需要在选择限价时赋值，其他行情推送不赋值
 //                                                    setText(it?.last.toString())
                                                 }
@@ -781,7 +779,8 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
                                                 } else if (it == FutureConstent.eOrderPriceSelectType_Opposite) {//对手价/买多取卖一价
                                                     setText(quoteData?.ask.toString())
                                                 } else if (it == FutureConstent.eOrderPriceSelectType_OppositeOne) {//超价/买多取卖一价(参照ios)
-                                                    setText(quoteData?.ask.toString())
+//                                                    setText(quoteData?.ask.toString())
+                                                    setText(setExceedPrice(quoteData?.ask ?:0.0,0))
                                                 } else if (it == FutureConstent.eOrderPriceSelectType_BidPrice) {//指定价就是限价
                                                     setText(quoteData?.last.toString())
                                                 }
@@ -839,7 +838,7 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
                                                 } else if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_Opposite) {//对手价/卖多取买一价
                                                     setText(it?.ask.toString())
                                                 } else if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_OppositeOne) {//超价1/卖多取买一价(参照ios)
-                                                    setText(it?.ask.toString())
+                                                    setText(setExceedPrice(it?.bid ?: 0.0,1))
                                                 } else if (viewModel.priceOrderType.value == FutureConstent.eOrderPriceSelectType_BidPrice) {//指定价就是限价--限价只需要在选择限价时赋值，其他行情推送不赋值
 //                                                    setText(it?.last.toString())
                                                 }
@@ -852,7 +851,8 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
                                                 } else if (it == FutureConstent.eOrderPriceSelectType_Opposite) {//对手价/卖多取买一价
                                                     setText(quoteData?.bid.toString())
                                                 } else if (it == FutureConstent.eOrderPriceSelectType_OppositeOne) {//超价/卖多取买一价(参照ios)
-                                                    setText(quoteData?.bid.toString())
+                                                    setText(setExceedPrice(quoteData?.bid ?:0.0,1))
+
                                                 } else if (it == FutureConstent.eOrderPriceSelectType_BidPrice) {//指定价就是限价
                                                     setText(quoteData?.last.toString())
                                                 }
@@ -1036,6 +1036,32 @@ class GoodsTradeActivity : BaseActivity<GoodsTradeViewModel>() {
         }
     }
 
+    fun setExceedPrice(price : Double,buyorsell : Int) : String{
+        val quoteDayData = viewModel.quoteDayData.value
+        var LimitPrice = ""
+        var setp = 0.0
+        val overDot = GlobalDataCollection.instance?.loginQueryData?.systemParams?.find {
+            it.paramcode == "148"
+        }?.paramvalue
+        setp = if ("0" == overDot) { //如果没有拿到超价点数则按照原来的计算吧
+            goodsInfoData.value?.quoteminunit?.toDouble() ?:0.0 * Math.pow(
+                10.0,
+                -(goodsInfoData.value?.decimalplace?.toDouble() ?:0.0)
+            )
+        } else {
+            goodsInfoData.value?.quoteminunit?.toDouble() ?:0.0 * Math.pow(
+                10.0,
+                -(goodsInfoData.value?.decimalplace?.toDouble() ?:0.0)
+            ) * java.lang.Double.valueOf(overDot)
+        }
+        if (buyorsell == 0){//买
+            LimitPrice = NumberUtils.roundNum(quoteDayData?.ask?.plus(setp).toString(),goodsInfoData.value?.decimalplace ?:2)
+        }else {//卖
+            LimitPrice = NumberUtils.roundNum(quoteDayData?.ask?.minus(setp).toString(),goodsInfoData.value?.decimalplace ?:2)
+        }
+        return LimitPrice
+    }
+
     /**
      * 操作请求
      * @param buyOrSell Int 0买1卖

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

@@ -1200,8 +1200,9 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                 liter_discount_edittext = this
                                 hint = "请输入升贴水"
                                 background = null
-                                inputType = EditorInfo.TYPE_CLASS_TEXT
+                                inputType = EditorInfo.TYPE_CLASS_NUMBER
                                 hintColorStr = "#CCCCCC"
+                                setDecimalInputType()
                                 textSizeAuto = 31
                                 textColorStr = "#333333"
                             }.lparams(0, autoSize(132), 1f) {

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

@@ -515,6 +515,11 @@ class AddHedgePlanActivity : BaseActivity<HedgePlanViewModel>() {
             return false
         }
 
+        if (amountPlanning.text.toString() == "0"){
+            ToastUtils.showLong("计划量不能为0")
+            return false
+        }
+
         return true
     }
 

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

@@ -0,0 +1,81 @@
+package cn.muchinfo.rma.view.base.home.set
+
+import android.os.Bundle
+import android.view.Gravity
+import cn.muchinfo.rma.R
+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 org.jetbrains.anko.*
+
+class SettingActivity : BaseActivity<SettingViewModel>(){
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        verticalLayout {
+            background = resources.getDrawable(R.color.segtabment_bg_color)
+            //头部标题
+            topBar {
+                commonLeftButton()
+                commonTitle {
+                    text = "设置"
+                }
+            }
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                imageButton {
+                    imageResource = R.mipmap.rma_rechange_password
+                }.lparams(autoSize(54), autoSize(54)){
+                    marginStart = autoSize(30)
+                }
+                textView {
+                    text = "修改登录密码"
+                    textSizeAuto = 34
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent){
+                    marginStart = autoSize(30)
+                }
+
+                emptyView()
+
+                imageView {
+                    imageResource = R.mipmap.rma_reset_password
+                }.lparams(autoSize(50), autoSize(50)){
+                    marginEnd = autoSize(30)
+                }
+
+            }.lparams(matchParent, autoSize(110))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                imageButton {
+                    imageResource = R.mipmap.login_pwd
+                }.lparams(autoSize(54), autoSize(54)){
+                    marginStart = autoSize(30)
+                }
+                textView {
+                    text = "重置登录密码"
+                    textSizeAuto = 34
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent){
+                    marginStart = autoSize(30)
+                }
+
+                emptyView()
+
+                imageView {
+                    imageResource = R.mipmap.rma_more
+                }.lparams(autoSize(50), autoSize(50)){
+                    marginEnd = autoSize(30)
+                }
+
+            }.lparams(matchParent, autoSize(110))
+        }
+    }
+
+}

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

@@ -0,0 +1,9 @@
+package cn.muchinfo.rma.view.base.home.set
+
+import cn.muchinfo.rma.view.base.BaseViewModel
+
+class SettingViewModel : BaseViewModel(){
+
+
+
+}

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

@@ -210,22 +210,24 @@ class ProcurementViewModel : BaseViewModel() {
     fun getAllRightData(respData: List<ContractData>): List<ContractData> {
         val newList = arrayListOf<ContractData>()
         respData.forEach {
-            val newRightData = arrayListOf<String>()
-            newRightData.add(ViewEnumUtils.getContractStatus(it.contracctstatus ?: ""))
-            newRightData.add(it.deliverygoodsname + "\n" + it.spotgoodsdesc)
-            newRightData.add(it.goodsname + "\n" + it.pricemove)
-            newRightData.add(
-                it.convertfactor + "\n" + ViewEnumUtils.getContractStatus(
-                    it.contracctstatus ?: ""
+            if (it.contracctstatus == "2" || it?.contracctstatus == "3"){
+                val newRightData = arrayListOf<String>()
+                newRightData.add(ViewEnumUtils.getContractStatus(it.contracctstatus ?: ""))
+                newRightData.add(it.deliverygoodsname + "\n" + it.spotgoodsdesc)
+                newRightData.add(it.goodsname + "\n" + it.pricemove)
+                newRightData.add(
+                    it.convertfactor + "\n" + ViewEnumUtils.getContractStatus(
+                        it.contracctstatus ?: ""
+                    )
                 )
-            )
-            newRightData.add(it.qty+ it.enumdicname + "\n" + it.unpricedqty+ it.enumdicname)
-            newRightData.add(it.pricedqty+ it.enumdicname + "\n" + it.unsureqty+ it.enumdicname)
-            newRightData.add(it.payamount + "\n" + it.unpayamount)
-            newRightData.add(it.invoiceamount + "\n" + it.daikaiamount)
-            newRightData.add(getTimeString(it))
-            val newData = it.copy(rightData = newRightData)
-            newList.add(newData)
+                newRightData.add(it.qty+ it.enumdicname + "\n" + it.unpricedqty+ it.enumdicname)
+                newRightData.add(it.pricedqty+ it.enumdicname + "\n" + it.unsureqty+ it.enumdicname)
+                newRightData.add(it.payamount + "\n" + it.unpayamount)
+                newRightData.add(it.invoiceamount + "\n" + it.daikaiamount)
+                newRightData.add(getTimeString(it))
+                val newData = it.copy(rightData = newRightData)
+                newList.add(newData)
+            }
         }
         return newList
     }

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

@@ -182,22 +182,25 @@ class SaleViewModel : BaseViewModel(){
     fun getAllRightData(respData: List<ContractData>): List<ContractData> {
         val newList = arrayListOf<ContractData>()
         respData.forEach {
-            val newRightData = arrayListOf<String>()
-            newRightData.add(ViewEnumUtils.getContractStatus(it.contracctstatus ?: ""))
-            newRightData.add(it.deliverygoodsname + "\n" + it.spotgoodsdesc)
-            newRightData.add(it.goodsname + "\n" + it.pricemove)
-            newRightData.add(
-                it.convertfactor + "\n" + ViewEnumUtils.getContractStatus(
-                    it.contracctstatus ?: ""
+            //企业风管-Android】采购-->全部界面， 显示合同数据应该为执行中或者已完结的合同， 对于撤回， 审核拒绝等类型的合约， 不会产生点价登记等数据的 不应该将这些合同显示出来 错误 #93917
+            if (it.contracctstatus == "2" || it.contracctstatus == "3"){
+                val newRightData = arrayListOf<String>()
+                newRightData.add(ViewEnumUtils.getContractStatus(it.contracctstatus ?: ""))
+                newRightData.add(it.deliverygoodsname + "\n" + it.spotgoodsdesc)
+                newRightData.add(it.goodsname + "\n" + it.pricemove)
+                newRightData.add(
+                    it.convertfactor + "\n" + ViewEnumUtils.getContractStatus(
+                        it.contracctstatus ?: ""
+                    )
                 )
-            )
-            newRightData.add(it.qty+ it.enumdicname + "\n" + it.unpricedqty+ it.enumdicname)
-            newRightData.add(it.pricedqty+ it.enumdicname + "\n" + it.unsureqty+ it.enumdicname)
-            newRightData.add(NumberUtils.roundNum(it.payamount,2) + "\n" + NumberUtils.roundNum(it.unpayamount,2))
-            newRightData.add(it.invoiceamount + "\n" + it.daikaiamount)
-            newRightData.add(getTimeString(it))
-            val newData = it.copy(rightData = newRightData)
-            newList.add(newData)
+                newRightData.add(it.qty+ it.enumdicname + "\n" + it.unpricedqty+ it.enumdicname)
+                newRightData.add(it.pricedqty+ it.enumdicname + "\n" + it.unsureqty+ it.enumdicname)
+                newRightData.add(NumberUtils.roundNum(it.payamount,2) + "\n" + NumberUtils.roundNum(it.unpayamount,2))
+                newRightData.add(it.invoiceamount + "\n" + it.daikaiamount)
+                newRightData.add(getTimeString(it))
+                val newData = it.copy(rightData = newRightData)
+                newList.add(newData)
+            }
         }
         return newList
     }