风险管理11月9日提交代码-liu.bolan-风管bug

RMA/app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "cn.muchinfo.rma"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 50035
-        versionName "5.0.35"
+        versionCode 50036
+        versionName "5.0.36"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //指定room.schemaLocation生成的文件路径

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

@@ -15,9 +15,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.203:8080/cfg?key=test_203"//李倩云融 18611112222
+//    const val baseurl = "http://192.168.31.203:8080/cfg?key=test_203"//李倩云融 18611112222
 //
-//    const val baseurl = "http://192.168.31.204:8080/cfg?key=test_204"// 瑶姐 云融 190000000001 123456
+    const val baseurl = "http://192.168.31.204:8080/cfg?key=test_204"// 瑶姐 云融 190000000001 123456
 //    const val baseurl = "http://192.168.31.205:8080/cfg?key=test_205"// 瑶姐 云融 190000000001 123456
 
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123

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

@@ -160,7 +160,7 @@ class HnstcdysViewModel : BaseViewModel(){
                 if (respData.isNullOrEmpty().not()){
                     circleDataByListed.postValue(respData?.get(0))
                 }else{
-                    noWRFactorTypeIdDataForListed.postValue(ListedData(goodsCode = selectGoodsInfoData.value?.goodsCode,DeliveryGoodsID = getDeliveryGoodsIDByWRStandardID(wrstandardid),WrFtWrstandard = getWrFtWrstandardByWRStandardID(wrstandardid),FactoryItemsList = WrStandardFactoryItemDataList.value ?: arrayListOf()))
+                    noWRFactorTypeIdDataForListed.postValue(ListedData(goodsCode = selectGoodsInfoData.value?.goodsCode,DeliveryGoodsName = getDeliveryGoodsNameByWRStandardID(wrstandardid),DeliveryGoodsID = getDeliveryGoodsIDByWRStandardID(wrstandardid),WrFtWrstandard = getWrFtWrstandardByWRStandardID(wrstandardid),FactoryItemsList = WrStandardFactoryItemDataList.value ?: arrayListOf()))
                 }
             }
         }
@@ -546,6 +546,19 @@ class HnstcdysViewModel : BaseViewModel(){
         return deliverygoodsid
     }
 
+    //通过选择的wrstandardid查找相对应的DeliveryGoodsName
+    fun getDeliveryGoodsNameByWRStandardID(wrstandardid : String = "") : String{
+        var deliveryGoodsName = ""
+        ftDeliveryGoodsDataList.value?.forEach {
+            it.wdlst?.forEach { data ->
+                if (data.wrstandardid == wrstandardid){
+                    deliveryGoodsName = it.deliverygoodsname ?: ""
+                }
+            }
+        }
+        return deliveryGoodsName
+    }
+
     //通过选择的wrstandardid查找相对应的实体
     fun getWrFtWrstandardByWRStandardID(wrstandardid : String = "") : WrFtWrstandard{
         var WrFtWrstandard = WrFtWrstandard()

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

@@ -85,7 +85,7 @@ class CommodityModificationFlowViewModel : BaseViewModel(){
                 respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
                     (TimeUtils.string2Millis(t2.applytime) - TimeUtils.string2Millis(t1.applytime)).toInt()
                 })
-                costWeightContentDataList.postValue(resetRateDataList(respData ?: arrayListOf()))
+                costWeightContentDataList.postValue(resetCostWeightDataList(respData ?: arrayListOf()))
             }
         }
     }
@@ -128,7 +128,7 @@ class CommodityModificationFlowViewModel : BaseViewModel(){
                 respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
                     (TimeUtils.string2Millis(t2.applytime) - TimeUtils.string2Millis(t1.applytime)).toInt()
                 })
-                convertCoefficientContentDataList.postValue(resetRateDataList(respData ?: arrayListOf()))
+                convertCoefficientContentDataList.postValue(resetCostWeightDataList(respData ?: arrayListOf()))
             }
         }
     }
@@ -214,4 +214,24 @@ class CommodityModificationFlowViewModel : BaseViewModel(){
         return newList
 
     }
+
+
+    /**
+     * 增值税税率数据组装
+     */
+    fun resetCostWeightDataList(list : List<ParamChangeAppData>) : List<ParamChangeAppData>{
+        val newList = arrayListOf<ParamChangeAppData>()
+        list.forEach {
+            val newRightData = arrayListOf<String>()
+            newRightData.add(it.applytime?.toShowTime3("MM-dd HH:mm")  + "\n" + it.audittime?.toShowTime3("MM-dd HH:mm"))//'申请时间/\n审核时间
+            newRightData.add(NumberUtils.roundNum(it.beforevalue,2) + "\n" + NumberUtils.roundNum(it.aftervalue,2))//修改前值%/\n修改后值%
+            newRightData.add(it.applyname +"\n" +it.auditname)//申请人/\n审核人
+            newRightData.add(it.applystatus?.applyFlowstatus() ?: "--")//状态
+            newRightData.add(it.auditremark ?: "--")//审核备注
+            val newData = it.copy(rightData = newRightData)
+            newList.add(newData)
+        }
+        return newList
+
+    }
 }

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

@@ -1466,7 +1466,7 @@ class SpotEarningReportUI(
                         }else if (dateType.value?.id == "2"){//月报表
                             viewModel.qrySummaryReport(tradedate = tradedate.replace("-", ""),querytype = "1",userid = viewModel.summarySelectTransactionUser.value?.id ?: GlobalDataCollection.instance?.loginRsp?.userID.toString(),cycletype = "1",isFrashByUser = true)
                         }else if (dateType.value?.id == "3"){//周报表
-                            viewModel.qrySummaryReport(tradedate = tradedate.replace("-", ""),querytype = "1",userid = viewModel.summarySelectTransactionUser.value?.id ?: GlobalDataCollection.instance?.loginRsp?.userID.toString(),cycletype = "0",isFrashByUser = true)
+                            viewModel.qrySummaryReport(tradedate = tradedate.replace("-", ""),querytype = "1",userid = viewModel.summarySelectTransactionUser.value?.id ?: GlobalDataCollection.instance?.loginRsp?.userID.toString(),cycletype = "4",isFrashByUser = true)
                         }
 
                     }
@@ -1549,7 +1549,7 @@ class SpotEarningReportUI(
                         }else if (dateType.value?.id == "2"){//月报表
                             viewModel.qrySummaryReport(tradedate = tradedate.replace("-", ""),querytype = "1",userid = viewModel.summarySelectTransactionUser.value?.id ?: GlobalDataCollection.instance?.loginRsp?.userID.toString(),cycletype = "1",isFrashByUser = true)
                         }else if (dateType.value?.id == "3"){//周报表
-                            viewModel.qrySummaryReport(tradedate = tradedate.replace("-", ""),querytype = "1",userid = viewModel.summarySelectTransactionUser.value?.id ?: GlobalDataCollection.instance?.loginRsp?.userID.toString(),cycletype = "0",isFrashByUser = true)
+                            viewModel.qrySummaryReport(tradedate = tradedate.replace("-", ""),querytype = "1",userid = viewModel.summarySelectTransactionUser.value?.id ?: GlobalDataCollection.instance?.loginRsp?.userID.toString(),cycletype = "4",isFrashByUser = true)
                         }
                     }
                     setEnableScrollContentWhenLoaded(false)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reportquery/adapter/SummaryReportContentAdapter.java

@@ -169,7 +169,11 @@ public class SummaryReportContentAdapter extends RecyclerView.Adapter<SummaryRep
             itemViewHolder.warehouse_register.setVisibility(View.VISIBLE);
         }else if (type.equals("5")){
             if (GlobalDataCollection.Companion.getInstance().getThreeLevelMenu("client_report","client_report_sumprofit","client_report_sumprofit_detail")){
-                itemViewHolder.summary_details.setVisibility(View.VISIBLE);
+                if (data.getCycletype().equals("0")){
+                    itemViewHolder.summary_details.setVisibility(View.GONE);
+                }else {
+                    itemViewHolder.summary_details.setVisibility(View.VISIBLE);
+                }
             }else {
                 itemViewHolder.summary_details.setVisibility(View.GONE);
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reportquery/reportdetail/ReportCommonDetailsViewModel.kt

@@ -219,7 +219,7 @@ class ReportCommonDetailsViewModel : BaseViewModel(){
                 put("userid", userid)
                 put("querytype","2")
                 put("cycletype",areaSumPLData.cycletype ?: "")
-                put("cycletime",areaSumPLData.cycletime ?: "")
+                put("cycletime",areaSumPLData.begindate ?: "")
                 put("currencyid",areaSumPLData.currencyid ?: "")
             }
             MyApplication.getInstance()?.reportManager?.qryAreaSumPL(params = params) { isSuccess, respData, error ->
@@ -460,9 +460,9 @@ class ReportCommonDetailsViewModel : BaseViewModel(){
             val data = ReportCommonDetailData()
             val newRightData = arrayListOf<String>()
             data.leftContent = it.middlegoodsname ?: "" + "\n" + if (it.changelogtype == "1"){"套保比率变更"}else{"套利比率变更"}//'套保品种/\n 参数类型 '
-            newRightData.add(it.parambeforevalue + "\n" +it.paramaftervalue) //'调整前参数值/\n 调整后参数值 '
-            newRightData.add(it.curvalue + "\n" + it.diffvalue)//'套保总量/\n 应套保总量变化量 '
-            newRightData.add(it.beforevalue + "\n" + it.aftervalue)//'调整前应套保总量/\n 调整后应套保总量 '
+            newRightData.add(it.parambeforevalue + "\n" + it.paramaftervalue) //'调整前参数值/\n 调整后参数值 '
+            newRightData.add(NumberUtils.roundNum(it.curvalue,2) + "\n" + it.diffvalue)//'套保总量/\n 应套保总量变化量 '
+            newRightData.add(NumberUtils.roundNum(it.beforevalue,2) + "\n" + NumberUtils.roundNum(it.aftervalue,2))//'调整前应套保总量/\n 调整后应套保总量 '
             data.rightData = newRightData
             newList.add(data)
         }

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

@@ -195,7 +195,6 @@ class YrdzHomeFragment : BaseFragment<YrdzHomeViewModel>() {
         return UI {
             initMessageMenuData()
             viewModel.getBanner()
-            viewModel.setDataList()
             viewModel.queryNotice()
             verticalLayout {
                 linearLayout {

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

@@ -121,7 +121,9 @@ class YrdzHomeViewModel : BaseViewModel(){
             if (isSuccess){
                 if (respData?.size ?: 0 > 0){
                     spotGroupTradeSumDataList.postValue(respData?.get(0))
-                    selectSpotGroupTradeSumData.postValue(respData?.get(0)?.lst?.get(0)?.copy(isOnClick = 1))
+                    if (respData?.get(0)?.lst?.size ?: 0 > 0){
+                        selectSpotGroupTradeSumData.postValue(respData?.get(0)?.lst?.get(0)?.copy(isOnClick = 1))
+                    }
                 }
             }
         }
@@ -158,21 +160,6 @@ class YrdzHomeViewModel : BaseViewModel(){
         }
     }
 
-    fun setDataList(){
-        val list = arrayListOf(
-            IndexData(name = "ABS",firstNumber = 18234.0,secondNumber = 18673.0),
-            IndexData(name = "PA6",firstNumber = 17134.0,secondNumber = 16993.0),
-            IndexData(name = "PA67",firstNumber = 18312.0,secondNumber = 18893.0),
-            IndexData(name = "PC",firstNumber = 19782.0,secondNumber = 17293.0),
-            IndexData(name = "PE",firstNumber = 16128.0,secondNumber = 16993.0),
-            IndexData(name = "PVC",firstNumber = 15123.0,secondNumber = 15193.0)
-        )
-
-        dataList.postValue(list)
-    }
-
-
-
     /**
      * 通知公告查询
      */

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

@@ -206,7 +206,7 @@ class OnePriceCircleSellUI(private val fragment : Fragment,private val viewModel
                             background = resources.getDrawable(R.color.white)
                             adapter = topAdapter
                         }
-                        topAdapter.setDatas(arrayListOf("挂牌方","价格","数量","议价","整单","挂牌有效期","履约保证金","履约方式","仓库"))
+                        topAdapter.setDatas(arrayListOf("履约方式","价格","数量","议价","整单","挂牌有效期","履约保证金","挂牌方","仓库"))
                     }
                 }.lparams(matchParent, matchParent)
             }.lparams(matchParent, autoSize(100))
@@ -340,7 +340,7 @@ class OnePriceCircleBuyUI(private val fragment : Fragment,private val viewModel:
                             background = resources.getDrawable(R.color.white)
                             adapter = topAdapter
                         }
-                        topAdapter.setDatas(arrayListOf("挂牌方","价格","数量","议价","整单","挂牌有效期","履约保证金","履约方式","仓库"))
+                        topAdapter.setDatas(arrayListOf("履约方式","价格","数量","议价","整单","挂牌有效期","履约保证金","挂牌方","仓库"))
                     }
                 }.lparams(matchParent, matchParent)
             }.lparams(matchParent, autoSize(100))

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

@@ -193,8 +193,8 @@ class WarehouseReceiptViewModel : BaseViewModel(){
         val newList = arrayListOf<OrderQuoteMyqData>()
         respData.forEach {
             val newRightData = arrayListOf<String>()
-            //挂牌方
-            newRightData.add(it.userid + it.username ?: "-")
+            //履约方式
+            newRightData.add(it.templatename?.isBlankString() ?: "-")
             //价格
             newRightData.add(it.fixedprice ?: "-")
             //数量
@@ -207,8 +207,8 @@ class WarehouseReceiptViewModel : BaseViewModel(){
             newRightData.add(it.validtime?.toShowTime3() ?: "-")
             //履约保证金
             newRightData.add(it.marginvalue?.toPercentage() ?: "-")
-            //履约方式
-            newRightData.add(it.templatename?.isBlankString() ?: "-")
+            //挂牌方
+            newRightData.add(it.userid + it.username ?: "-")
             //仓库
             newRightData.add(it.warehousename ?: "-")
             val newData = it.copy(rightData = newRightData)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/dialog/ListedData.kt

@@ -11,15 +11,18 @@ data class ListedData(
     var goodsCode : String? = "",//浮动价选择的期货商品code
     var goodsId : String? = "",//浮动价选择的期货商品ID
     var DeliveryGoodsID : String? = "",
+    var DeliveryGoodsName : String? = "",
     var WrFtWrstandard : WrFtWrstandard? = WrFtWrstandard(),
     var DeliveryMonth : String? = "",//预售时填入的值，交收月
     var FactoryItemsList : List<FtDeliveryGoodsDataListData>? = arrayListOf()//要素类型明细集合(没有仓单要素ID填写)
 ) : Parcelable{
 
+
     constructor(parcel: Parcel) : this(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
         parcel.readParcelable(cn.muchinfo.rma.global.data.WrFtWrstandard::class.java.classLoader),
         parcel.readString(),
         parcel.createTypedArrayList(FtDeliveryGoodsDataListData)
@@ -77,6 +80,7 @@ data class ListedData(
         parcel.writeString(goodsCode)
         parcel.writeString(goodsId)
         parcel.writeString(DeliveryGoodsID)
+        parcel.writeString(DeliveryGoodsName)
         parcel.writeParcelable(WrFtWrstandard, flags)
         parcel.writeString(DeliveryMonth)
         parcel.writeTypedList(FactoryItemsList)
@@ -95,4 +99,6 @@ data class ListedData(
             return arrayOfNulls(size)
         }
     }
+
+
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/dialog/WarehouseFloatListedDialog.kt

@@ -1066,7 +1066,7 @@ class FloatBuyListedUI(
                     }
                     gravity = Gravity.CENTER
                     backgroundResource = R.drawable.qhj_main_blue_bg
-                    text = "卖出"
+                    text = "买入"
                     textSizeAuto = 38
                     textColorInt = R.color.white
                 }.lparams(autoSize(419), autoSize(119)) {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/dialog/WarehouseOneListedDialog.kt

@@ -809,6 +809,7 @@ class OneBuyListedUI(
                         gravity = Gravity.CENTER_VERTICAL
                         numberEditText {
                             text = data.WrFtWrstandard?.minivalue
+
                             changeValue = data.WrFtWrstandard?.minivalue?.toDouble() ?: 1.0
                             oneNumberInputEdittext = this
                             setOnTextChangeListener { view, value ->
@@ -960,7 +961,9 @@ class OneBuyListedUI(
                 }
 
                 textView {
-                    text = "--"
+                    //初始值
+                    text = data.WrFtWrstandard?.minivalue?.toDouble()?.times(1).toString()
+
                     one_delisting_amount = this
                     textSizeAuto = 29
                     textColorInt = R.color.rma_black_33

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleListedBuyUI.kt

@@ -20,6 +20,7 @@ import cn.muchinfo.rma.global.data.AccountData
 import cn.muchinfo.rma.global.data.OrderQuoteMyqData
 import cn.muchinfo.rma.global.data.PermancePlanTmpData
 import cn.muchinfo.rma.global.data.WrUserFriendData
+import cn.muchinfo.rma.global.toShowTime3
 import cn.muchinfo.rma.global.utils.TimeUtils
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
@@ -98,6 +99,9 @@ class TradeCircleListedBuyUI(
     //挂牌有效期
     lateinit var validity_of_listing: TextView
 
+    //交收月
+    lateinit var delivery_month : TextView
+
     //选择的履约模版数据
     val selectPerformanceStepData: MutableLiveData<PermancePlanTmpData> = MutableLiveData()
 
@@ -289,7 +293,12 @@ class TradeCircleListedBuyUI(
                         }
 
                         textView {
-                            text = data.enumdicname
+                            if (hasType == "1") {
+                                text = data.enumdicname
+                            }else{
+                                text = listedData.WrFtWrstandard?.enumdicname
+                            }
+
                             textSizeAuto = 34
                             textColorInt = R.color.rma_hint_text_color_ccc
                         }.lparams(wrapContent, wrapContent) {
@@ -360,7 +369,11 @@ class TradeCircleListedBuyUI(
                         }.lparams(0, autoSize(132), 1f)
 
                         textView {
-                            text = data.enumdicname
+                             if (hasType == "1") {
+                                text = data.enumdicname
+                            }else{
+                                text = listedData.WrFtWrstandard?.enumdicname
+                            }
                             textSizeAuto = 31
                             textColorInt = R.color.rma_black_33
                         }.lparams(wrapContent, wrapContent) {
@@ -436,6 +449,42 @@ class TradeCircleListedBuyUI(
 
             linearLayout {
                 onThrottleFirstClick {
+                    activity.showDataSelectDialog(type = "2") {
+                        delivery_month.text = this
+                    }
+                }
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    text = "交收月"
+                    textSizeAuto = 34
+                    textColorInt = R.color.rma_hint_text_color_ccc
+                }.lparams(autoSize(214), wrapContent) {
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+//                    viewModel.marketRunData.bindOptional(context){
+//                        text = it?.tradedate?.toShowTime3("yyyy-MM","yyyyMMdd")
+//                    }
+                    text = com.blankj.utilcode.util.TimeUtils.getNowString()?.toShowTime3("yyyy-MM")
+                    delivery_month = this
+                    textSizeAuto = 34
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+                emptyView()
+
+                imageView {
+                    imageResource = R.mipmap.rma_search_by_time
+                }.lparams(autoSize(38), autoSize(38)) {
+                    marginEnd = autoSize(36)
+                }
+            }.lparams(matchParent, autoSize(143))
+
+            itemView()
+
+            linearLayout {
+                onThrottleFirstClick {
                     activity.showDataSelectDialog(type = "1") {
                         validity_of_listing.text = this
                     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleListedingActivity.kt

@@ -558,6 +558,7 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             OrderQty = buyUI.listednumberEdittext.text.toString().toLong(),
                                             DeliveryGoodsID = data.deliverygoodsid?.toInt() ?: 0,
                                             WRPriceType = 1,
+                                            DeliveryMonth = buyUI.delivery_month.text.toString(),
                                             FixedPrice = buyUI.onePriceInputEdittext.text.toString().toDouble(),
                                             WRTradeGoods = WarehouseTradeMI1.WRGoodsInfo.newBuilder().build(),
                                             TimevalidType = 3,
@@ -591,6 +592,7 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             OrderQty = buyUI.listednumberEdittext.text.toString().toLong(),
                                             DeliveryGoodsID = listedData.DeliveryGoodsID?.toInt() ?: 0,
                                             WRPriceType = 1,
+                                            DeliveryMonth = buyUI.delivery_month.text.toString(),
                                             FixedPrice = buyUI.onePriceInputEdittext.text.toString().toDouble(),
                                             WRTradeGoods = WarehouseTradeMI1.WRGoodsInfo.newBuilder().build(),
                                             TimevalidType = 3,
@@ -627,6 +629,7 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             OrderQty = buyUI.listednumberEdittext.text.toString().toLong(),
                                             DeliveryGoodsID = data.deliverygoodsid?.toInt() ?: 0,
                                             WRPriceType = 1,
+                                            DeliveryMonth = buyUI.delivery_month.text.toString(),
                                             FixedPrice = buyUI.onePriceInputEdittext.text.toString().toDouble(),
                                             WRTradeGoods = WarehouseTradeMI1.WRGoodsInfo.newBuilder().build(),
                                             TimevalidType = 3,
@@ -660,6 +663,7 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             OrderQty = buyUI.listednumberEdittext.text.toString().toLong(),
                                             DeliveryGoodsID = listedData.DeliveryGoodsID?.toInt() ?: 0,
                                             WRPriceType = 1,
+                                            DeliveryMonth = buyUI.delivery_month.text.toString(),
                                             FixedPrice = buyUI.onePriceInputEdittext.text.toString().toDouble(),
                                             WRTradeGoods = WarehouseTradeMI1.WRGoodsInfo.newBuilder().build(),
                                             TimevalidType = 3,

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleListedingViewModel.kt

@@ -145,7 +145,8 @@ class TradeCircleListedingViewModel : BaseViewModel(){
     fun getWrGoodsInfo(data : ListedData){
 
         val lstitemList = arrayListOf<lstitem>()
-        lstitemList.add(lstitem(name = "品种",value = data.WrFtWrstandard?.wrstandardname))
+        lstitemList.add(lstitem(name = "品种",value = data.DeliveryGoodsName))
+        lstitemList.add(lstitem(name = "商品",value = data.WrFtWrstandard?.wrstandardname))
         data.FactoryItemsList?.forEach {
             val lstitemData = lstitem()
             lstitemData.name = it.itemtypename

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

@@ -473,8 +473,12 @@ class SellListedUI(
                     viewModel.goodsInfo.bindOptional(context) {
                         decimal = it?.decimalplace ?: 2
                     }
+
                     text = "0"
                     onePriceInputEdittext = this
+                    viewModel.tjmdTodayAccountMarginData.bindOptional(context){
+                        onePriceInputEdittext.text = onePriceInputEdittext.text.toString()
+                    }
                     setOnTextChangeListener { view, value ->
                         if (value.isNullOrEmpty().not() && value.toString().toDouble() != 0.0) {
                             valueChange.postValue(valueChange.value)